From 25a7d3ea808a0297bd9b2cbd6c9a039687d196e3 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Thu, 21 Oct 2021 22:46:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=A6=E9=97=B4=E8=BD=AC=E5=87=BA=EF=BC=8C?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=B7=A5=E5=BA=8F=E6=9F=A5=E8=AF=A2=E7=9A=84?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mesnac/production/mapper/WorkShopTransferMapper.java   | 2 +-
 .../service/impl/WorkShopTransferServiceImpl.java          | 4 ++--
 .../src/main/resources/mapper/WorkShopTransferMapper.xml   | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java b/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java
index b1ca2d8b..e6d8f33c 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/mapper/WorkShopTransferMapper.java
@@ -20,7 +20,7 @@ import java.util.List;
 @Repository
 public interface WorkShopTransferMapper extends BaseMapper<WorkShopTransfer> {
 
-    List<WorkShopTransferDto> getOutList(@Param("site") String site, @Param("workCenter") String workCenter, @Param("transferWorkCenter") String transferWorkCenter, @Param("operation") String operation, @Param("status") String status, @Param("sfc") String sfc, @Param("stepId")String stepId);
+    List<WorkShopTransferDto> getOutList(@Param("site") String site, @Param("workCenter") String workCenter, @Param("transferWorkCenter") String transferWorkCenter, @Param("operation") String operation, @Param("operationDescription") String operationDescription,@Param("status") String status, @Param("sfc") String sfc, @Param("stepId")String stepId);
 
     WorkShopTransferDto getSfcData(@Param("site") String site,@Param("sfc") String sfc);
 
diff --git a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java
index 663dc732..ee3ce1bd 100644
--- a/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java
+++ b/production/src/main/java/com/foreverwin/mesnac/production/service/impl/WorkShopTransferServiceImpl.java
@@ -159,7 +159,7 @@ public class WorkShopTransferServiceImpl extends ServiceImpl<WorkShopTransferMap
                     ExceptionUtil.throwException(e);
                 }
             }
-            List<WorkShopTransferDto> list = workShopTransferMapper.getOutList(site, null, null, null, null, sfc,stepId);
+            List<WorkShopTransferDto> list = workShopTransferMapper.getOutList(site, null, null, null, null,null, sfc,stepId);
             WorkShopTransferDto transferDto = list.get(0);
             WorkShopTransfer transferLog = new WorkShopTransfer();
             transferLog.setHandle(UUID.randomUUID().toString());
@@ -270,7 +270,7 @@ public class WorkShopTransferServiceImpl extends ServiceImpl<WorkShopTransferMap
         String transferWorkCenter = workShopTransferDto.getTransferWorkCenter();
         String operation = workShopTransferDto.getOperation();
         String status = workShopTransferDto.getStatus();
-        return workShopTransferMapper.getOutList(site,workCenter,transferWorkCenter,operation,status,null, null);
+        return workShopTransferMapper.getOutList(site,workCenter,transferWorkCenter,null,operation,status,null, null);
     }
     @Override
     public List<WorkShopTransferDto> getInList(WorkShopTransferDto workShopTransferDto) {
diff --git a/production/src/main/resources/mapper/WorkShopTransferMapper.xml b/production/src/main/resources/mapper/WorkShopTransferMapper.xml
index 8aa2a3ed..61d8dee8 100644
--- a/production/src/main/resources/mapper/WorkShopTransferMapper.xml
+++ b/production/src/main/resources/mapper/WorkShopTransferMapper.xml
@@ -631,7 +631,9 @@
     </delete>
     <!-- BaseMapper标准查询/修改/删除 -->
     <select id="getOutList" resultType="com.foreverwin.mesnac.production.dto.WorkShopTransferDto">
-    SELECT zsd.handle SFC_DISPATCH_BO,zsd.sfc, PREZSD.OPERATION LAST_OPERATION,PREZSD.STEP_ID LAST_STEP_ID,PREZSD.WORK_CENTER TRANSFER_WORK_CENTER,zsd.WORK_CENTER,WCT.DESCRIPTION WORK_CENTER_DESC,zsd.SHOP_ORDER,c1.VALUE WORK_ORDER,IT.DESCRIPTION ITEM_DESC,ZSD.BLANKING_SIZE,SFC.QTY,PREOT.DESCRIPTION LAST_OPERATION_DESC,PREZSD.EMPLOYEE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESC,
+    SELECT zsd.handle SFC_DISPATCH_BO,zsd.sfc, PREZSD.OPERATION LAST_OPERATION,PREZSD.STEP_ID LAST_STEP_ID,PREZSD.WORK_CENTER TRANSFER_WORK_CENTER,zsd.WORK_CENTER,
+           WCT.DESCRIPTION WORK_CENTER_DESC,zsd.SHOP_ORDER,c1.VALUE WORK_ORDER,IT.DESCRIPTION ITEM_DESC,ZSD.BLANKING_SIZE,SFC.QTY,PREOT.DESCRIPTION LAST_OPERATION_DESC,
+           PREZSD.EMPLOYEE_DESCRIPTION,OT.DESCRIPTION OPERATION_DESC,
      CASE WHEN ZWST.IS_IN='Y'  THEN '已接收'  WHEN ZWST.IS_OUT='Y'  THEN '转序中'  ELSE '待转出' END STATUS
      FROM Z_SFC_DISPATCH zsd
      JOIN sfc sfc ON sfc.sfc=zsd.sfc AND zsd.site=sfc.site
@@ -664,6 +666,9 @@
      <if test="operation!=null and operation!=''">
          AND ZSD.OPERATION=#{operation}
      </if>
+     <if test="operationDescription!=null and operationDescription!=''">
+         AND PREOT.DESCRIPTION=#{operationDescription}
+     </if>
     <if test="sfc!=null and sfc!=''">
         AND ZSD.sfc=#{sfc}
     </if>