feat(WmsMaterialCoil): 修改原料材质的匹配功能

- 新增 onlyEmptyPackingStatus 字段用于查询打包状态为空的钢卷
- 修改数据库查询逻辑增加打包状态非空条件
- 更新查询条件实现打包状态匹配优化
- 添加服务层业务逻辑支持打包状态筛选功能
This commit is contained in:
2026-04-27 11:03:04 +08:00
parent 8c0126d7f8
commit db18d4dc34
3 changed files with 21 additions and 6 deletions

View File

@@ -1041,6 +1041,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
FROM wms_material_coil mc
WHERE mc.del_flag = 0
AND mc.enter_coil_no IS NOT NULL
AND mc.packing_status IS NOT NULL
AND mc.enter_coil_no IN (
SELECT DISTINCT mci.enter_coil_no
FROM wms_material_coil mci
@@ -1049,18 +1050,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND mci.item_id IS NOT NULL
AND (mci.item_type = 'raw_material' AND rm.raw_material_name LIKE '%热轧卷板%')
)
AND (
mc.packing_status IS NULL
OR
EXISTS (
AND EXISTS (
SELECT 1
FROM wms_material_coil mci2
LEFT JOIN wms_raw_material rm2 ON mci2.item_type = 'raw_material' AND mci2.item_id = rm2.raw_material_id AND rm2.del_flag = 0
WHERE mci2.del_flag = 0
AND mci2.enter_coil_no = mc.enter_coil_no
AND (mci2.item_type = 'raw_material' AND rm2.raw_material_name LIKE '%热轧卷板%' AND (mc.packing_status != rm2.material OR rm2.material IS NULL))
AND mci2.item_type = 'raw_material'
AND rm2.raw_material_name LIKE '%热轧卷板%'
AND (
rm2.material IS NULL
OR (
mc.packing_status NOT LIKE CONCAT(rm2.material, '%')
AND rm2.material NOT LIKE CONCAT(mc.packing_status, '%')
)
)
)
)
</select>
</mapper>