Merge remote-tracking branch 'mesnac/master'

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

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 ,

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));
             }
 
             //本地测试

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

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)  ;
+                logger.info("消息发送失败。日期:" + now + ",消息内容:"+text+",错误信息:"+ignored.getMessage());
-//                throw new BaseException("消息发送失败");
             }
     }
 }