From f75e6a0df1752ca452b6ceaa438b6d770a469bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 17 Aug 2021 09:23:33 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E9=AA=8C=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=BE=85=E5=8A=9E=E4=BA=8B=E9=A1=B9=E6=89=B9=E9=87=8F=E5=90=88?= =?UTF-8?q?=E6=A0=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mapper/InspectionTaskManageMapper.xml | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml index 57339d7b..f0559043 100644 --- a/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml +++ b/quality/src/main/resources/mapper/InspectionTaskManageMapper.xml @@ -39,9 +39,14 @@ AND B.WORK_CENTER = #{workCenter} - - AND B.CATEGORY = #{category} - + + + AND B.CATEGORY = #{category} + + + AND (B.CATEGORY = 'S' OR B.CATEGORY = 'P') + + AND B.STATUS = #{status} From ba12736be3cd9f7eb2d3ccddbabbe28dc1205935 Mon Sep 17 00:00:00 2001 From: philip <244793088@qq.com> Date: Tue, 17 Aug 2021 10:23:25 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=BE=85=E6=96=99=E4=BD=BF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/foreverwin/mesnac/common/constant/Constants.java | 2 +- console/src/main/resources/application-qas.yml | 2 +- .../mesnac/production/service/impl/AccessoryLogServiceImpl.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java index 40ba9000..bb011eb4 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/constant/Constants.java @@ -8,7 +8,7 @@ package com.foreverwin.mesnac.common.constant; */ public interface Constants { - String OP_6106GX = "6106GX"; + String OP_6106GX = "WX_6106GX"; String STATUS_NEW = "NEW"; String STATE_CONFIRM ="CONF"; diff --git a/console/src/main/resources/application-qas.yml b/console/src/main/resources/application-qas.yml index 54b8bdcd..88e183c5 100644 --- a/console/src/main/resources/application-qas.yml +++ b/console/src/main/resources/application-qas.yml @@ -33,7 +33,7 @@ ftp: #打印服务器配置 print: - server: http://172.16.251.188:8022/print/mesnacprint + server: http://10.10.170.32:8022/print/mesnacprint activeMq: sendWeChatMessage: tcp://localhost:61616?wireFormat.maxInactivityDuration=0 diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java index db745c6d..147d9b13 100644 --- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java +++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java @@ -76,7 +76,7 @@ public class AccessoryLogServiceImpl extends ServiceImpl list = itemBatchService.list(queryWrapper); if (qty.compareTo(BigDecimal.ZERO)<=0){ - throw new BaseException("数量不能小于零"); + throw new BaseException("使用数量不能小于零"); } if (list.isEmpty()){ throw new BaseException("标签不存在"); From ca7ad15cff9fc942a40aa289db325ad616c73cd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Tue, 17 Aug 2021 10:35:27 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=BE=85=E5=8A=9E?= =?UTF-8?q?=E4=BA=8B=E9=A1=B9=E5=B7=A5=E4=BD=9C=E4=BB=A4=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java | 10 ++++++++++ .../src/main/resources/mapper/AbnormalBillMapper.xml | 10 ++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java index 27df7b40..3d214d2b 100644 --- a/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java +++ b/anomaly/src/main/java/com/foreverwin/mesnac/anomaly/dto/AbnormalBillDto.java @@ -44,6 +44,8 @@ public class AbnormalBillDto extends AbnormalBill { private String ncCodeDescription; + private String workOrder; + public String getSeq() { return seq; } @@ -133,4 +135,12 @@ public class AbnormalBillDto extends AbnormalBill { public void setNcCodeDescription(String ncCodeDescription) { this.ncCodeDescription = ncCodeDescription; } + + public String getWorkOrder() { + return workOrder; + } + + public void setWorkOrder(String workOrder) { + this.workOrder = workOrder; + } } diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 7e24585f..57d9454a 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -915,12 +915,15 @@ SELECT ROW_NUMBER() OVER(ORDER BY ZAB.ABNORMAL_NO ASC) SEQ,ZAB.ABNORMAL_NO ABNORMAL_NO, ZAB.STATUS STATUS, IT.DESCRIPTION ITEM_DESCRIPTION, ZAB.CREATED_DATE_TIME CREATED_DATE_TIME, ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME, - ZAB.CREATED_USER CREATED_USER, + ZNU.FULL_NAME CREATED_USER, ZAB.NC_CODE NC_CODE,ZAB.PB_DESCRIPTION PB_DESCRIPTION, SUBSTR(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO),0,LENGTH(LISTAGG(NCT.DESCRIPTION || ',') WITHIN GROUP(ORDER BY ZAB.ABNORMAL_NO))-1) NC_CODE_DESCRIPTION FROM Z_ABNORMAL_BILL ZAB LEFT JOIN ITEM I ON ZAB.ITEM_BO = I.HANDLE LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO AND IT.LOCALE = #{language} + LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE + LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZAB.SHOP_ORDER AND SO.SITE = ZAB.SITE + LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER' LEFT JOIN Z_ABNORMAL_NC_CODE ZANC ON ZANC.ABNORMAL_BILL_BO = ZAB.HANDLE LEFT JOIN NC_CODE_T NCT ON NCT.NC_CODE_BO = 'NCCodeBO:'|| ZAB.SITE || ',' || ZANC.NC_CODE AND NCT.LOCALE = #{language} @@ -955,10 +958,13 @@ AND zab.REPORT_FROM = #{abnormalBill.reportFrom} + + AND CF.VALUE = #{abnormalBill.workOrder} + GROUP BY zab.ABNORMAL_NO,zab.STATUS,it.DESCRIPTION,zab.CREATED_DATE_TIME,zab.RESPONSE_DATE_TIME, - zab.CREATED_USER,zab.NC_CODE,zab.PB_DESCRIPTION + ZNU.FULL_NAME,zab.NC_CODE,zab.PB_DESCRIPTION