From f036546850daafeb40b3b725c87663a5b727e4d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E5=98=89=E4=BC=9F?= <1724121454@qq.com> Date: Thu, 16 Sep 2021 16:15:21 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=BC=82=E5=B8=B8=E5=8F=91=E9=80=81?= =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/mapper/AbnormalBillMapper.xml | 11 ++++++++++- anomaly/src/main/resources/mapper/ReportMapper.xml | 4 ++++ .../foreverwin/mesnac/common/util/ActiveMQUtil.java | 4 +--- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml index 6d672f3e..bd51f34b 100644 --- a/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml +++ b/anomaly/src/main/resources/mapper/AbnormalBillMapper.xml @@ -1258,7 +1258,16 @@ it.DESCRIPTION ITEM,zab.WORK_ORDER WORK_ORDER,zab.ITEM_NUMBER PROJECT, LISTAGG(nct.DESCRIPTION , ',') WITHIN GROUP(ORDER BY zab.ABNORMAL_NO) NC, r.DESCRIPTION "RESOURCE",r2.DESCRIPTION WORKCENTER_LIN, - zabd.ABNORMAL_METHOD METHOD + CASE WHEN zabd.ABNORMAL_METHOD = 'X' THEN '线下换料' + WHEN zabd.ABNORMAL_METHOD = 'S' THEN '试装' + WHEN zabd.ABNORMAL_METHOD = 'R' THEN '让步放心' + WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废' + WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作' + WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修' + WHEN zabd.ABNORMAL_METHOD = 'FW' THEN '返修(外协)' + WHEN zabd.ABNORMAL_METHOD = 'FB' THEN '返修(不返回原工艺)' + ELSE '' + END ABNORMAL_METHOD, FROM Z_ABNORMAL_BILL zab INNER JOIN ITEM i ON i.HANDLE = zab.ITEM_BO LEFT JOIN RESRCE r ON r.RESRCE = zab.RESRCE AND r.SITE = zab.SITE diff --git a/anomaly/src/main/resources/mapper/ReportMapper.xml b/anomaly/src/main/resources/mapper/ReportMapper.xml index 55835712..8a28f329 100644 --- a/anomaly/src/main/resources/mapper/ReportMapper.xml +++ b/anomaly/src/main/resources/mapper/ReportMapper.xml @@ -271,6 +271,8 @@ WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废' WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作' WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修' + WHEN zabd.ABNORMAL_METHOD = 'FW' THEN '返修(外协)' + WHEN zabd.ABNORMAL_METHOD = 'FB' THEN '返修(不返回原工艺)' ELSE '' END ABNORMAL_METHOD,zabd.RESOLVE_REMARK RESOLVE_REMARK,zabd.RESOLVE_USER RESOLVE_USER, zabd.CLOSED_DATE_TIME CLOSED_DATE_TIME,zab.NC_QTY NC_QTY,zab.PB_QTY PB_QTY, @@ -368,6 +370,8 @@ WHEN zabd.ABNORMAL_METHOD = 'C' THEN '报废' WHEN zabd.ABNORMAL_METHOD = 'P' THEN '配作' WHEN zabd.ABNORMAL_METHOD = 'F' THEN '返修' + WHEN zabd.ABNORMAL_METHOD = 'FW' THEN '返修(外协)' + WHEN zabd.ABNORMAL_METHOD = 'FB' THEN '返修(不返回原工艺)' ELSE '' END ABNORMAL_METHOD,zabd.RESOLVE_DATE_TIME RESOLVE_DATE_TIME, znu3.FULL_NAME RESOLVE_USER,zabd.CLOSED_DATE_TIME CANCEL_DATE_TIME , 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 379ed643..2f9ba131 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 @@ -18,7 +18,6 @@ import java.time.LocalDateTime; @Component public class ActiveMQUtil { - @Autowired(required = false) @Qualifier("mesJmsTemplate") private JmsMessagingTemplate mesJmsTemplate; @@ -34,8 +33,7 @@ public class ActiveMQUtil { mesJmsTemplate.convertAndSend(queue, jsonObject.toString()); }catch (Exception ignored){ LocalDateTime now = LocalDateTime.now(); - logger.info("消息发送失败。日期:" + now + "消息内容:"+text) ; -// throw new BaseException("消息发送失败"); + logger.info("消息发送失败。日期:" + now + ",消息内容:"+text+",错误信息:"+ignored.getMessage()); } } } From 1ea4efcdc28597869f5644fc0d849fbcfc4db661 Mon Sep 17 00:00:00 2001 From: zpl Date: Thu, 16 Sep 2021 16:47:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=9B=BE=E7=BA=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/foreverwin/mesnac/common/controller/FileController.java | 2 +- .../java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java index 03d1761e..67a1c89d 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/FileController.java @@ -72,7 +72,7 @@ public class FileController { //String newPath = new String(coderPath.getBytes("GBK"), FTPClient.DEFAULT_CONTROL_ENCODING); in = ftpClient.getFtp(path); if(null == in){ - in = ftpClient.getFtp(new String(path.getBytes("UTF-8"), FTPClient.DEFAULT_CONTROL_ENCODING)); + in = ftpClient.getFtp(new String(path.getBytes("GBK"), FTPClient.DEFAULT_CONTROL_ENCODING)); } //本地测试 diff --git a/common/src/main/java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java b/common/src/main/java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java index 8fdef290..d192284a 100644 --- a/common/src/main/java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java +++ b/common/src/main/java/com/foreverwin/mesnac/common/ftp/CappFtpClient.java @@ -312,6 +312,7 @@ public class CappFtpClient { */ public InputStream getFtp(String path) throws Exception { login(); + ftp.enterLocalPassiveMode(); InputStream in = ftp.retrieveFileStream(path); return in; }