From f02a379a3e700f4249c4e319c96828966310cc3b Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Mon, 6 Sep 2021 18:13:04 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AbnormalBillServiceImpl.java | 9 ++--- .../impl/InspectionTaskServiceImpl.java | 33 +++++++++---------- meapi/src/main/resources/mapper/SfcMapper.xml | 2 +- 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index b39bb785..4fe6bb9b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -57,7 +57,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.math.BigDecimal; -import java.text.SimpleDateFormat; import java.time.LocalDateTime; import java.util.*; @@ -518,7 +517,7 @@ public class AbnormalBillServiceImpl extends ServiceImpl0 or SS.QTY_IN_WORK>0) - WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' AND ZSD.DISPATCH_STATUS='START') + WHERE S.SITE=#{ew.entity.site} AND ZSD.RESRCE=#{ew.entity.resrce} AND (ZSD.DISPATCH_STATUS='RELEASE' OR ZSD.DISPATCH_STATUS='START') AND S.STATUS_BO IN ('StatusBO:'||#{ew.entity.site}||',401','StatusBO:'||#{ew.entity.site}||',402','StatusBO:'||#{ew.entity.site}||',403','StatusBO:'||#{ew.entity.site}||',404') AND zprt.STATUS='FINISH' AND ZPRT."RESULT"='OK' From d0c0744530a44004ddf0d005d11a8a66b7a65ff7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Mon, 6 Sep 2021 18:26:21 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E6=96=B9=E6=A1=88?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../anomaly/service/impl/AbnormalBillServiceImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java index e9b00b42..b7d1bfdf 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/service/impl/AbnormalBillServiceImpl.java @@ -514,10 +514,12 @@ public class AbnormalBillServiceImpl extends ServiceImpl Date: Mon, 6 Sep 2021 18:30:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8A=A5=E5=BA=9F=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=B8=93=E6=A3=80=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SplitSfcServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java index ac8ef787..e322f3ad 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/SplitSfcServiceImpl.java @@ -257,18 +257,18 @@ public class SplitSfcServiceImpl extends ServiceImpl i throw new BaseException("处置工艺路线没有步骤"); } sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(),"R", sfcData.getShopOrder(), sfc, operation, sfcDispatchBySfc.getStepId(),newSfc, maxRevisionRouter.getHandle(), sfcData.getStepSequence()); - //创建专检任务 - Map paramMap=new HashMap<>(); - paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); - paramMap.put("SFC",sfc ); - paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); - paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); - paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId()); - paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); - paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); - paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); - inspectionTaskService.createNewTask(paramMap); } + //创建专检任务 + Map paramMap=new HashMap<>(); + paramMap.put("CATEGORY", Constants.INSPECTION_TYPE_P); + paramMap.put("SFC",sfc ); + paramMap.put("SHOP_ORDER",sfcDispatchBySfc.getShopOrder()); + paramMap.put("OPERATION",sfcDispatchBySfc.getOperation()); + paramMap.put("STEP_ID",sfcDispatchBySfc.getStepId()); + paramMap.put("WORK_CENTER",sfcDispatchBySfc.getWorkCenter()); + paramMap.put("RESRCE",sfcDispatchBySfc.getResrce()); + paramMap.put("SFC_DISPATCH_DETAIL_BO",sfcDispatchBySfc.getHandle()); + inspectionTaskService.createNewTask(paramMap); SplitSfc splitSfc=new SplitSfc(); splitSfc.setHandle(HandleEnum.SPLIT_SFC.getHandle(site,newSfc)); splitSfc.setSite(site);