diff --git a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java index a1aa6eb2..143c7153 100644 --- a/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java +++ b/op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java @@ -1273,7 +1273,7 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService { ProOrderWorkorder oldVersion = proOrderWorkorderMapper.getOldVersionUsedInfo(proOrderWorkorder); //清除之前的非补打的 List dtos0 = null; - if(proOrderWorkorder.getPalletNo()==null&&proOrderWorkorder.getAddFlag().equals("0")&&oldVersion==null) { + if((proOrderWorkorder.getPalletNo()==null&&proOrderWorkorder.getAddFlag().equals("0"))||oldVersion==null) { //不是增打和补打且还没用于入库 proOrderWorkorderMapper.cleanCard(proOrderWorkorder); } diff --git a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml index 288edfc7..36abd8bd 100644 --- a/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml +++ b/op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml @@ -1029,7 +1029,7 @@ delete from pro_order_workorder_batch_pallet where workorder_code in( select workorder_code_sap from pro_order_workorder where workorder_code = #{workorderCode} - ) and add_flag = '0' and attr1 != '1' + ) and add_flag = '0' and attr1 = '0' update qc_check_task set income_batch_no = #{newIncomeBatchNo}