From e6cd8fe66a491f9626bf820adeed8a4e72960125 Mon Sep 17 00:00:00 2001
From: yinq <1345442242@qq.com>
Date: Wed, 8 Feb 2023 17:35:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B7=A8=E8=BD=A6=E9=97=B4=E8=BD=AC?=
=?UTF-8?q?=E5=BA=8F=E5=A2=9E=E9=A1=B9=E5=A2=9E=E7=AD=9B=E9=80=89=E6=9D=A1?=
=?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mesnac/meapi/dto/LogisticsDto.java | 19 ++++++++++++++++++
.../mapper/LogisticsTurnoverMapper.xml | 20 +++++++++++++++----
2 files changed, 35 insertions(+), 4 deletions(-)
diff --git a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java b/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java
index 7aaecbc4..ee9d41a1 100644
--- a/meapi/src/main/java/com/foreverwin/mesnac/meapi/dto/LogisticsDto.java
+++ b/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;
}
diff --git a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml b/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml
index e6b7624d..66f3a874 100644
--- a/meapi/src/main/resources/mapper/LogisticsTurnoverMapper.xml
+++ b/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')