From 2b2e022c27316b8b0a9c863ceec8cb726c60ac96 Mon Sep 17 00:00:00 2001 From: zhaoxiaolin Date: Tue, 3 Sep 2024 15:38:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E8=AF=86=E5=8D=A1=E7=BB=86=E8=8A=82?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java | 2 +- .../src/main/resources/mapper/plan/ProOrderWorkorderMapper.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 a1aa6eb2e..143c71536 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 288edfc72..36abd8bd7 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}