update 跨车间转序增项增筛选条件

meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java

@@ -45,6 +45,25 @@ public class LogisticsDto {
     private String other6;
     private String deleteUser;
 
+    private String itemCode;
+    private String nextNextOperation;
+
+    public String getItemCode() {
+        return itemCode;
+    }
+
+    public void setItemCode(String itemCode) {
+        this.itemCode = itemCode;
+    }
+
+    public String getNextNextOperation() {
+        return nextNextOperation;
+    }
+
+    public void setNextNextOperation(String nextNextOperation) {
+        this.nextNextOperation = nextNextOperation;
+    }
+
     public String getDeleteUser() {
         return deleteUser;
     }

meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml

@@ -765,6 +765,7 @@
         WCT2.DESCRIPTION TURNOUT_WORKCENTER,
         ZSD.SFC,
         C1.VALUE WORK_ORDER,
+        IM.ITEM                                                  ITEM_CODE,
         IT.DESCRIPTION ITEM_DESCRIPTION,
         ZSD.BLANKING_SIZE,
         ZSD.DISPATCH_QTY,
@@ -783,10 +784,9 @@
         ZNU2.FULL_NAME DELETE_USER,
         ZLT.COM_DATE_TIME,
         ZLT.OTHER4,
-        CASE WHEN ZLT.OTHER6 ='1' THEN '已删除' ELSE '' END OTHER6
-
-        FROM
-        Z_LOGISTICS_TURNOVER ZLT
+        CASE WHEN ZLT.OTHER6 = '1' THEN '已删除' ELSE '' END        OTHER6,
+        NNOD.DESCRIPTION                                 NEXT_NEXT_OPERATION
+        FROM Z_LOGISTICS_TURNOVER ZLT
         LEFT JOIN Z_NWA_USER ZNU ON ZLT.OTHER5 = ZNU.USER_NAME
         LEFT JOIN Z_NWA_USER ZNU2 ON ZLT.DELETE_USER = ZNU2.USER_NAME
         LEFT JOIN WORK_CENTER WC ON WC.WORK_CENTER = ZLT.TURNOVER_WORK_CENTER
@@ -813,6 +813,17 @@
         AND O.CURRENT_REVISION = 'true'
         LEFT JOIN OPERATION_T OT ON OT.OPERATION_BO = O.HANDLE
         AND OT.LOCALE = 'zh'
+        LEFT JOIN (SELECT PZSD.HANDLE, PZSD.NEXT_NEXT_OPERATION, NNOT.DESCRIPTION
+        FROM (
+        SELECT OZSD.HANDLE,
+        OZSD.OPERATION,
+        LEAD(OZSD.OPERATION, 2)
+        OVER ( PARTITION BY OZSD.SFC ORDER BY OZSD.SFC,OZSD.DISPATCH_NO ) NEXT_NEXT_OPERATION
+        FROM Z_SFC_DISPATCH OZSD) PZSD
+        INNER JOIN OPERATION NNO
+        ON NNO.OPERATION = PZSD.NEXT_NEXT_OPERATION AND NNO.CURRENT_REVISION = 'true'
+        LEFT JOIN OPERATION_T NNOT ON NNOT.OPERATION_BO = NNO.HANDLE AND NNOT.LOCALE = 'zh') NNOD
+        ON ZLT.SFC_DISPATCH_BO = NNOD.HANDLE
         <where>
             ZSD.SITE='1000'
             <if test="other6!=null and other6 != ''" > AND  ZLT.OTHER6 = #{other6}</if>
@@ -825,6 +836,7 @@
             <if test="workOrder!=null"> AND C1.VALUE LIKE  '%'||#{workOrder}||'%'</if>
             <if test="shopOrder!=null"> AND SO.SHOP_ORDER=#{shopOrder}</if>
             <if test="sfc!=null"> AND ZSD.SFC  LIKE  '%'||#{sfc}||'%'</if>
+            <if test="nextOperation!=null"> AND OT.DESCRIPTION  LIKE  '%'||#{nextOperation}||'%'</if>
             <if test="comfirmUser!=null"> AND ZNU.FULL_NAME = #{comfirmUser}</if>
             <if test="startFromDate != null">
                 AND ZLT.COM_DATE_TIME >= TO_DATE(#{startFromDate}, 'YYYY-MM-DD')