From 9c458ac9e9a92b13cc4bfd99d017ba81853b883a Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 26 Aug 2021 18:50:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=B7=A5=E5=BA=8F=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml index 46014c8a..a6339028 100644 --- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml +++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml @@ -808,7 +808,7 @@ - SELECT FROM Z_SFC_DISPATCH WHERE SITE = #{site} AND SFC = #{sfc} AND TO_NUMBER(STEP_ID) >= #{stepId} From 32ee34c51aa82fbf927f98225c7aebe377cb6f48 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 26 Aug 2021 20:10:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E7=82=B9=E6=A3=80=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/common/dto/LabelPrintDto.java | 10 ++++++++++ .../resources/mapper/ResourceInspectTaskMapper.xml | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java index dc3b9043..d576e969 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/LabelPrintDto.java @@ -41,6 +41,8 @@ public class LabelPrintDto implements Serializable { private String sfc; //数量 private BigDecimal qty; + // 特定打印的数量 + private BigDecimal sfcQty; //下料尺寸 private String blankingSize; //下道工序 @@ -168,6 +170,14 @@ public class LabelPrintDto implements Serializable { this.qty = qty; } + public BigDecimal getSfcQty() { + return sfcQty; + } + + public void setSfcQty(BigDecimal sfcQty) { + this.sfcQty = sfcQty; + } + public String getBlankingSize() { return blankingSize; } diff --git a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml index e07337e6..cfebf0b7 100644 --- a/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml +++ b/equip/src/main/resources/mapper/ResourceInspectTaskMapper.xml @@ -660,7 +660,7 @@ WHERE (ZG.USER_GROUP_BO IS NULL OR (ZG.USER_GROUP_BO IS NOT NULL AND UGM.USER_OR_GROUP_GBO = #{currentUser})) AND RIK.SITE = #{site} - AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -4/24 FROM DUAL) + AND TASK_CREATE_DATE <= (SELECT TO_DATE(TO_CHAR(SYSDATE+1,'yyyy-mm-dd') || ' 00:00:00','yyyy-MM-dd hh24:mi-ss') -4/24 FROM DUAL) AND RIK.TASK_NO = #{taskNo} From 11ff341677f3320e7cad7124f03894e98eddc0d4 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Thu, 26 Aug 2021 20:14:28 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E6=8B=86=E5=88=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/production/dto/SplitSfcDto.java | 9 +++++++++ .../production/service/impl/SplitSfcServiceImpl.java | 6 +++--- production/src/main/resources/mapper/SplitSfcMapper.xml | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/production/src/main/java/com/foreverwin/mesnac/production/dto/SplitSfcDto.java b/production/src/main/java/com/foreverwin/mesnac/production/dto/SplitSfcDto.java index 404e152e..94c0a090 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/dto/SplitSfcDto.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/dto/SplitSfcDto.java @@ -7,6 +7,15 @@ public class SplitSfcDto extends SplitSfc { private String routerBo; private String ncQty; private String abnormalNo; + private String abnormalMethod; + + public String getAbnormalMethod() { + return abnormalMethod; + } + + public void setAbnormalMethod(String abnormalMethod) { + this.abnormalMethod = abnormalMethod; + } public String getAbnormalNo() { return abnormalNo; 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 b052b6ce..890b58ec 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 @@ -159,7 +159,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i splitSfc.setCreatedDateTime(LocalDateTime.now()); save(splitSfc); Router routerBySfcBo = routerService.getRouterBySfcBo(HandleEnum.SFC.getHandle(site, sfc)); - sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(), "N", sfcData.getShopOrder(), sfc, operation, sfcDto.getStepId(),newSfc, routerBySfcBo.getHandle()); + sfcDispatchCommonService.saveSplitSfcDispatch(site, CommonMethods.getUser(), "N", sfcData.getShopOrder(), sfc, operation, sfcData.getStepId(),newSfc, routerBySfcBo.getHandle()); return splitSfc; } catch (Exception e) { ExceptionUtil.throwException(e); @@ -195,6 +195,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i SplitSfcDto splitSfcDto=splitSfcMapper.getAbnormalQty(site,sfc,operation, abnormalNo); String routerBo = splitSfcDto.getRouterBo(); String ncCode = splitSfcDto.getNcCode(); + String abnormalMethod = splitSfcDto.getAbnormalMethod(); if (StringUtil.isBlank(ncCode)){ throw new BaseException("异常处置未选择不良代码"); } @@ -222,8 +223,7 @@ public class SplitSfcServiceImpl extends ServiceImpl i SplitSfcResponse splitSfcResponse = splitSfcResponses.iterator().next(); String newSfcRef = splitSfcResponse.getNewSfcRef(); String newSfc = StringUtil.trimHandle(newSfcRef); - - if(StringUtil.notBlank(routerBo)){ + if(abnormalMethod.equals("F")&&StringUtil.notBlank(routerBo)){ //记录不合格 CreateNCRequest createNCRequest=new CreateNCRequest(); createNCRequest.setQty(splitQty); diff --git a/production/src/main/resources/mapper/SplitSfcMapper.xml b/production/src/main/resources/mapper/SplitSfcMapper.xml index f41b6117..b2c99526 100644 --- a/production/src/main/resources/mapper/SplitSfcMapper.xml +++ b/production/src/main/resources/mapper/SplitSfcMapper.xml @@ -378,7 +378,7 @@ WHERE S.HANDLE=#{handle}