From b8b7ba8ad9cf6196704c159b5c7404ed8f8465cc Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Fri, 5 Nov 2021 17:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E6=B4=BE=E5=B7=A5=E7=95=8C?=
 =?UTF-8?q?=E9=9D=A2=E5=AF=BC=E5=85=A5=E5=AF=BC=E5=87=BA=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E7=89=A9=E6=96=99=E5=8E=BB=E5=90=91=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java | 1 +
 .../mesnac/common/service/impl/ProdReadyTaskServiceImpl.java  | 2 ++
 .../mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java  | 2 ++
 dispatch/src/main/resources/mapper/SfcDispatchMapper.xml      | 4 ++--
 4 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
index 8201e4e0..c627d5a2 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/dto/SfcDispatchDto.java
@@ -215,6 +215,7 @@ public class SfcDispatchDto implements Serializable{
     private String completeToDate_S;
 
     private String other1;
+    @ExcelColumn("物料去向")
     private String other2;
     private String other3;
     private String other4;
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
index b79a1c4a..fa5377c4 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/service/impl/ProdReadyTaskServiceImpl.java
@@ -508,6 +508,8 @@ public class ProdReadyTaskServiceImpl extends ServiceImpl<ProdReadyTaskMapper, P
             }
             labelPrintDto.setOperation(operationDesc.toString());
 
+            //打印物料去向
+            labelPrintDto.setItemTypeOrder(sfcDispatchDto.getOther2());
             labelPrintDtoList.add(labelPrintDto);
             printData = JSON.toJSONString(labelPrintDtoList);
             //打印记录
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
index 7a94bb2e..82a61981 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/SfcDispatchServiceImpl.java
@@ -469,6 +469,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
                 sfcDispatch.setPlannedCompDate(sfcDispatchDto.getPlannedCompDate());
                 sfcDispatch.setEarliestStartDate(sfcDispatchDto.getEarliestStartDate());
                 sfcDispatch.setLatestEndDate(sfcDispatchDto.getLatestEndDate());
+                sfcDispatch.setOther2(sfcDispatchDto.getOther2());
 
                 list.add(sfcDispatch);
 
@@ -629,6 +630,7 @@ public class SfcDispatchServiceImpl extends ServiceImpl<SfcDispatchMapper, SfcDi
             sfcDispatch.setPlannedCompDate(sfcDispatchDto.getPlannedCompDate());
             sfcDispatch.setEarliestStartDate(sfcDispatchDto.getEarliestStartDate());
             sfcDispatch.setLatestEndDate(sfcDispatchDto.getLatestEndDate());
+            sfcDispatch.setOther2(sfcDispatchDto.getOther2());
 
             //是否分配资源
             if (StringUtil.notBlank(resource)) {
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 3e556921..ec9a2ab3 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -684,7 +684,7 @@
                         CASE WHEN SD.DISPATCH_STATUS = 'COMPLETE' THEN SD.DISPATCH_QTY ELSE 0 END COMPLETED_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
                         SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.DISPATCH_SEQ-1 BEFORE_SEQ, SD.DISPATCH_SEQ+1 AFTER_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
                         CASE WHEN CC.VALUE = '9' THEN N'是' ELSE N'否' END IS_MAJOR, CASE WHEN SD.TURN_OPERATION = 'true' THEN N'是' ELSE N'否' END TURN_OPERATION, SD.BLANKING_SIZE, MAX(BC.COMPONENT_GBO) COMPONENT_BO,
-                        WR.WORK_CENTER RESOURCE_WORK_CENTER, MAX(CP.ITEM) COMPONENT, MAX(CT.DESCRIPTION) COMPONENT_DESCRIPTION, MAX(C3.VALUE) TEXTURE, MAX(C4.VALUE) MAT_SPEC
+                        WR.WORK_CENTER RESOURCE_WORK_CENTER, MAX(CP.ITEM) COMPONENT, MAX(CT.DESCRIPTION) COMPONENT_DESCRIPTION, MAX(C3.VALUE) TEXTURE, MAX(C4.VALUE) MAT_SPEC ,SD.OTHER_2
                 FROM Z_SFC_DISPATCH SD
                 INNER JOIN SFC SC ON SC.SITE = SD.SITE AND SC.SFC = SD.SFC
                 LEFT JOIN RESRCE RS ON SD.SITE = RS.SITE AND SD.RESRCE = RS.RESRCE
@@ -778,7 +778,7 @@
                           SD.STEP_ID, SD.OPERATION, OT.DESCRIPTION, SD.RESOURCE_TYPE, SD.RESRCE, SD.EMPLOYEE, SD.EMPLOYEE, SD.DISPATCH_QTY, SD.PROD_HOURS, RS.DESCRIPTION,
                           SD.DISPATCH_STATUS, SD.DISPATCH_QTY, SD.PLANNED_START_DATE, SD.PLANNED_COMP_DATE, SD.WORK_CENTER, SD.IS_DISPATCH, SD.EMPLOYEE_DESCRIPTION,
                           SD.ACTUAL_START_DATE, SD.ACTUAL_COMPLETE_DATE, SD.REMARK, SD.DISPATCH_SEQ, SD.EARLIEST_START_DATE, SD.LATEST_END_DATE,
-                          CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER
+                          CC.VALUE, SD.TURN_OPERATION, SD.BLANKING_SIZE, WR.WORK_CENTER ,SD.OTHER_2
             ) WIP
             LEFT JOIN Z_SFC_DISPATCH V1 ON V1.SITE = WIP.SITE AND V1.SFC = WIP.SFC AND V1.ROUTER_BO = WIP.ROUTER_BO AND V1.DISPATCH_SEQ = WIP.BEFORE_SEQ
             LEFT JOIN Z_SFC_DISPATCH V2 ON V2.SITE = WIP.SITE AND V2.SFC = WIP.SFC AND V2.ROUTER_BO = WIP.ROUTER_BO AND V2.DISPATCH_SEQ = WIP.AFTER_SEQ