From fe2004826413dbcddcf8de3155f13b5bda0ec9f1 Mon Sep 17 00:00:00 2001 From: Leon <3066758958@qq.com> Date: Tue, 17 Aug 2021 20:35:21 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E5=B7=A5=E4=BD=9C?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E6=9F=A5=E8=AF=A2=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mesnac/dispatch/model/CallItem.java | 18 ++++++++++++++++++ .../main/resources/mapper/CallItemMapper.xml | 8 +++++--- .../resources/mapper/SfcDispatchMapper.xml | 2 +- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java index 2102550d..aebe76ec 100644 --- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java +++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/model/CallItem.java @@ -168,6 +168,8 @@ public class CallItem extends Model { @TableField(exist = false) private String resourceType; @TableField(exist = false) + private String resourceDescription; + @TableField(exist = false) private String blankingSize; @TableField(exist = false) private String operationDescription; @@ -484,6 +486,22 @@ public class CallItem extends Model { this.resourceType = resourceType; } + public String getWorkCenterDescription() { + return workCenterDescription; + } + + public void setWorkCenterDescription(String workCenterDescription) { + this.workCenterDescription = workCenterDescription; + } + + public String getResourceDescription() { + return resourceDescription; + } + + public void setResourceDescription(String resourceDescription) { + this.resourceDescription = resourceDescription; + } + public String getBlankingSize() { return blankingSize; } diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml index 3139ef12..ace168d0 100644 --- a/dispatch/src/main/resources/mapper/CallItemMapper.xml +++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml @@ -41,6 +41,7 @@ + @@ -881,10 +882,11 @@ + SELECT + FROM Z_INTEGRATION_LOG + + SITE = #{integration.site} + + AND INTEGRATION_TYPE = #{integration.integrationType} + + + AND INTEGRATION_WAY = #{integration.integrationWay} + + + AND STATUS = #{integration.status} + + + AND REQUEST_DATE_TIME >= #{integration.startDateTime} + + + AND REQUEST_DATE_TIME <= #{integration.endDateTime} + + + From 881f1412692c3738a380b4584c5c396c953e0997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 18 Aug 2021 10:31:12 +0800 Subject: [PATCH 3/4] ActiveMQUtil --- .../mesnac/common/util/ActiveMQUtil.java | 20 ++++++------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java index 67041ba3..04886140 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/util/ActiveMQUtil.java @@ -1,21 +1,16 @@ package com.foreverwin.mesnac.common.util; -import com.foreverwin.modular.core.exception.BaseException; import org.json.JSONObject; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.jms.core.JmsMessagingTemplate; import org.springframework.stereotype.Component; -import java.util.concurrent.TimeUnit; - /** * @Description TODO * @Author zhaojiawei * @Since 2021-07-21 */ @Component -@ConditionalOnProperty(prefix = "activeMq", value = {"enabled"}, matchIfMissing = true) public class ActiveMQUtil { @@ -28,16 +23,13 @@ public class ActiveMQUtil { try{ jsonObject.put("TO_USER", user); jsonObject.put("CONTENT",text); - defaultJmsTemplate.getJmsTemplate().setReceiveTimeout(TimeUnit.SECONDS.toMillis(3)); - String message = defaultJmsTemplate.convertSendAndReceive(queue, jsonObject.toString(), String.class); - if (StringUtil.isBlank(message)) { - //记日志 - } + // defaultJmsTemplate.getJmsTemplate().setReceiveTimeout(TimeUnit.SECONDS.toMillis(3)); + defaultJmsTemplate.convertAndSend(queue, jsonObject.toString()); +// if (StringUtil.isBlank(message)) { +// //记日志 +// } }catch (Exception ignored){ - throw new BaseException("消息发送失败"); +// throw new BaseException("消息发送失败"); } - - - } } From abed5edf44a2ba1bd8375988aad3940e7aa763c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Wed, 18 Aug 2021 10:45:37 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E5=BC=82=E5=B8=B8bug?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/AbnormalBillServiceImpl.java | 31 ++++++++++++++++--- .../resources/mapper/AbnormalBillMapper.xml | 12 ++++++- 2 files changed, 38 insertions(+), 5 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 ccd6611f..c337e4fe 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 @@ -22,12 +22,10 @@ import com.foreverwin.mesnac.common.service.MessageService; import com.foreverwin.mesnac.common.service.UserService; import com.foreverwin.mesnac.common.util.ActiveMQUtil; import com.foreverwin.mesnac.common.util.StringUtil; +import com.foreverwin.mesnac.meapi.dto.NcCodeDto; import com.foreverwin.mesnac.meapi.mapper.*; import com.foreverwin.mesnac.meapi.model.*; -import com.foreverwin.mesnac.meapi.service.DataFieldListService; -import com.foreverwin.mesnac.meapi.service.NwaUserService; -import com.foreverwin.mesnac.meapi.service.RouterService; -import com.foreverwin.mesnac.meapi.service.WorkCenterService; +import com.foreverwin.mesnac.meapi.service.*; import com.foreverwin.mesnac.meapi.util.StringUtils; import com.foreverwin.mesnac.quality.service.SelfReportService; import com.foreverwin.modular.core.exception.BaseException; @@ -129,6 +127,9 @@ public class AbnormalBillServiceImpl extends ServiceImpl ncCodesAndNcGroups = ncCodeService.findNcCodeDescriptionByNcCode(abnormalBill.getNcCode()); + List abnormalNcCodes = new LinkedList<>(); + for(int i = 0; i < ncCodesAndNcGroups.size(); i ++){ + AbnormalNcCode abnormalNcCode = new AbnormalNcCode(); + String uuid = UUID.randomUUID().toString(); + abnormalNcCode.setHandle(uuid); + abnormalNcCode.setSite(abnormalBill.getSite()); + abnormalNcCode.setAbnormalBillBo(abnormalBill.getHandle()); + abnormalNcCode.setNcCodeGroup(ncCodesAndNcGroups.get(i).getNgGroup()); + abnormalNcCode.setNcCode(ncCodesAndNcGroups.get(i).getNcCode()); + abnormalNcCode.setNcQty(abnormalBill.getNcQty()); + abnormalNcCode.setCreatedUser(user); + abnormalNcCode.setCreatedDateTime(now); + abnormalNcCode.setModifiedUser(user); + abnormalNcCode.setModifiedDateTime(now); + abnormalNcCodes.add(abnormalNcCode); + } + abnormalNcCodeService.saveOrUpdateBatch(abnormalNcCodes); + abnormalBillDisposeService.saveOrUpdate(abnormalBillDispose); this.saveOrUpdate(abnormalBill); //发送消息 diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index ed396bbb..b2418d9f 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -973,11 +973,14 @@ ZAB.NC_CODE NC_CODE ,ZAB.PB_DESCRIPTION PB_DESCRIPTION ,ZAB.SHUT_DOWN SHUT_DOWN ,ZAB.RESPONSE_USER RESPONSE_USER,ZAB.RESPONSE_DATE_TIME RESPONSE_DATE_TIME, ZABD.ABNORMAL_METHOD ABNORMAL_METHOD,ZNU3.FULL_NAME CONFIRM_USER,ZABD.RESOLVE_REMARK RESOLVE_REMARK, ZAB.CANCEL_CODE CANCEL_CODE,ZAB.CANCEL_DATE_TIME CANCEL_DATE_TIME,ZNU4.FULL_NAME CANCEL_USER,ZAB.CANCEL_REASON CANCEL_REASON, - ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP + ZAB.REPORT_SEND_USER_GROUP REPORT_SEND_USER_GROUP, + 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 INNER JOIN Z_ABNORMAL_BILL_DISPOSE ZABD ON ZABD.ABNORMAL_BILL_BO = ZAB.HANDLE INNER JOIN RESRCE R ON R.RESRCE = ZAB.RESRCE AND R.SITE = ZAB.SITE + 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} LEFT JOIN WORK_CENTER_T WCT ON WCT.WORK_CENTER_BO = ('WorkCenterBO:' || ZAB.SITE || ',' || ZAB.WORK_CENTER) AND WCT.LOCALE =#{language} LEFT JOIN Z_NWA_USER ZNU ON ZNU.USER_NAME = ZAB.CREATED_USER AND ZNU.SITE = ZAB.SITE LEFT JOIN Z_NWA_USER ZNU2 ON ZNU2.USER_NAME = ZAB.RESPONSE_USER AND ZNU2.SITE = ZAB.SITE @@ -993,6 +996,13 @@ + GROUP BY + ZAB.ABNORMAL_NO , ZAB.STATUS ,ZAB.REPORT_FROM ,WCT.DESCRIPTION , + ZAB.RESRCE ,R.DESCRIPTION ,ZNU.FULL_NAME ,ZAB.MESSAGE_TYPE , + ZAB.NC_CODE ,ZAB.PB_DESCRIPTION ,ZAB.SHUT_DOWN ,ZAB.RESPONSE_USER ,ZAB.RESPONSE_DATE_TIME , + ZABD.ABNORMAL_METHOD ,ZNU3.FULL_NAME ,ZABD.RESOLVE_REMARK , + ZAB.CANCEL_CODE ,ZAB.CANCEL_DATE_TIME ,ZNU4.FULL_NAME ,ZAB.CANCEL_REASON , + ZAB.REPORT_SEND_USER_GROUP