diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java index b57c7ec2..7205ac1f 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialCoilServiceImpl.java @@ -745,7 +745,11 @@ public class WmsMaterialCoilServiceImpl implements IWmsMaterialCoilService { // 3. 插入钢卷数据 WmsMaterialCoil add = BeanUtil.toBean(bo, WmsMaterialCoil.class); - add.setDataType(1); // 新增的钢卷默认为当前数据 + if(bo.getDataType() == 10){ + add.setDataType(10); + }else { + add.setDataType(1); // 新增的钢卷默认为当前数据 + } validEntityBeforeSave(add); int rows = baseMapper.insert(add); if (rows <= 0) { diff --git a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml index 2d485c78..7e8bfeb6 100644 --- a/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml +++ b/klp-wms/src/main/resources/mapper/klp/WmsDeliveryPlanMapper.xml @@ -153,6 +153,7 @@ LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 WHERE wcpa.del_flag = 0 AND wcpa.action_type = 401 + AND wcpa.action_status = 2 AND wcpa.create_time >= #{startTime} @@ -185,6 +186,7 @@ LEFT JOIN wms_material_coil mc ON mc.coil_id = wcpa.coil_id AND mc.del_flag = 0 WHERE wcpa.del_flag = 0 AND wcpa.action_type = 401 + AND wcpa.action_status = 2 AND wcpa.create_time >= #{startTime}