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} 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}