Merge remote-tracking branch 'origin/master'

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

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}
         <where>
@@ -955,10 +958,13 @@
                 <if test="abnormalBill.reportFrom != null and abnormalBill.reportFrom != ''">
                     AND zab.REPORT_FROM = #{abnormalBill.reportFrom}
                 </if>
+                <if test="abnormalBill.workOrder != null and abnormalBill.workOrder != ''">
+                    AND CF.VALUE = #{abnormalBill.workOrder}
+                </if>
             </if>
         </where>
         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
     </select>
 
     <select id="findAllByAbnormalNoDevice" resultMap="abnormalBillDto">

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

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

production/src/main/java/com/foreverwin/mesnac/production/service/impl/AccessoryLogServiceImpl.java

@@ -76,7 +76,7 @@ public class AccessoryLogServiceImpl extends ServiceImpl<AccessoryLogMapper, Acc
         queryWrapper.eq(ItemBatch.LABEL,label);
         List<ItemBatch> list = itemBatchService.list(queryWrapper);
         if (qty.compareTo(BigDecimal.ZERO)<=0){
-            throw new BaseException("数量不能小于零");
+            throw new BaseException("使用数量不能小于零");
         }
         if (list.isEmpty()){
             throw new BaseException("标签不存在");

quality/src/main/resources/mapper/InspectionTaskManageMapper.xml

@@ -39,9 +39,14 @@
         <if test="workCenter != null and workCenter != ''">
             AND B.WORK_CENTER = #{workCenter}
         </if>
-        <if test="category != null and category != ''">
-            AND B.CATEGORY = #{category}
-        </if>
+          <choose>
+              <when test="category != null and category != ''">
+                  AND B.CATEGORY = #{category}
+              </when>
+              <otherwise>
+                  AND (B.CATEGORY = 'S' OR B.CATEGORY = 'P')
+              </otherwise>
+          </choose>
         <if test="status != null and status != ''">
             AND B.STATUS = #{status}
         </if>