DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 扩展钢卷待处理动作查询功能并完善分卷合卷业务逻辑

Browse Source 
- 在WmsCoilPendingActionMapper.xml中新增仓库名称、规格、材质、生产厂家等物料信息字段查询
- 为WmsCoilPendingActionVo添加specification、material、manufacturer等物料属性字段
- 完善分卷合卷业务逻辑，增加对历史卷的分卷限制验证
- 新增validateOriginalCoilsForMerge方法用于合卷前验证原始钢卷数据状态
- 优化实际库区ID更新条件，当状态为1时也清除实际库区绑定
- 移除分卷新卷继承母卷实际库区ID的逻辑
- 增强合卷操作前的原始钢卷数据校验机制
This commit is contained in:
Joshi
2026-01-14 17:34:58 +08:00
parent f8e15af0fe
commit 7a38091468
3 changed files with 111 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
klp-wms/src/main/resources/mapper/klp/WmsCoilPendingActionMapper.xml
View File

@@ -50,9 +50,40 @@
wmc.enter_coil_no as enterCoilNo,
wmc.supplier_coil_no as supplierCoilNo,
wmc.item_id as itemId,
wmc.item_type as itemType
wmc.item_type as itemType,
w.warehouse_name AS warehouseName,
aw.actual_warehouse_name AS actualWarehouseName,
CASE WHEN wmc.item_type = 'raw_material' THEN rm.specification
WHEN wmc.item_type = 'product' THEN p.specification
ELSE NULL END AS specification,
CASE WHEN wmc.item_type = 'raw_material' THEN rm.material
WHEN wmc.item_type = 'product' THEN p.material
ELSE NULL END AS material,
CASE WHEN wmc.item_type = 'raw_material' THEN rm.manufacturer
WHEN wmc.item_type = 'product' THEN p.manufacturer
ELSE NULL END AS manufacturer,
CASE WHEN wmc.item_type = 'raw_material' THEN rm.surface_treatment_desc
WHEN wmc.item_type = 'product' THEN p.surface_treatment_desc
ELSE NULL END AS surfaceTreatmentDesc,
CASE WHEN wmc.item_type = 'raw_material' THEN rm.zinc_layer
WHEN wmc.item_type = 'product' THEN p.zinc_layer
ELSE NULL END AS zincLayer,
CASE
WHEN wmc.item_type = 'raw_material' THEN rm.raw_material_name
WHEN wmc.item_type = 'product' THEN p.product_name
ELSE NULL
END as itemName,
CASE
WHEN wmc.item_type = 'raw_material' THEN rm.raw_material_code
WHEN wmc.item_type = 'product' THEN p.product_code
ELSE NULL
END as itemCode
from wms_coil_pending_action wcpa
inner join wms_material_coil wmc ON wcpa.coil_id = wmc.coil_id AND wmc.del_flag = 0
LEFT JOIN wms_warehouse w ON wmc.warehouse_id = w.warehouse_id
LEFT JOIN wms_actual_warehouse aw ON wmc.actual_warehouse_id = aw.actual_warehouse_id
LEFT JOIN wms_raw_material rm ON wmc.item_type = 'raw_material' AND wmc.item_id = rm.raw_material_id
LEFT JOIN wms_product p ON wmc.item_type = 'product' AND wmc.item_id = p.product_id
${ew.customSqlSegment}
</select>