Merge remote-tracking branch 'origin/master'

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<ProOrderWorkorder> 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);
         }

op-modules/op-plan/src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml

@@ -1029,7 +1029,7 @@
     <delete id="cleanCard">
         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'
     </delete>
     <update id="updateCheckTaskBatch" parameterType="com.op.plan.domain.dto.CheckTaskBatchDTO">
         update qc_check_task set income_batch_no = #{newIncomeBatchNo}