From 9daa13c2e2daac74a5f6064fc4accc8a0e0a3ca1 Mon Sep 17 00:00:00 2001
From: Leon <3066758958@qq.com>
Date: Mon, 2 Aug 2021 17:37:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BE=E5=B7=A5=E4=BF=AE=E6=94=B9=E5=8F=91?=
 =?UTF-8?q?=E5=B8=83=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/foreverwin/mesnac/common/dto/SfcDispatchDto.java | 9 +++++++++
 .../dispatch/controller/SfcDispatchController.java       | 3 ++-
 .../mesnac/dispatch/mapper/SfcDispatchMapper.java        | 6 ++++++
 dispatch/src/main/resources/mapper/SfcDispatchMapper.xml | 3 +++
 4 files changed, 20 insertions(+), 1 deletion(-)

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 34746857..96bfb08f 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
@@ -174,6 +174,7 @@ public class SfcDispatchDto implements Serializable{
     private String isCompleted;
     private BigDecimal completedQty;
     private String userName;
+    private String resourceWorkCenter;
 
     private String status;
     private String locale;
@@ -584,6 +585,14 @@ public class SfcDispatchDto implements Serializable{
         this.userName = userName;
     }
 
+    public String getResourceWorkCenter() {
+        return resourceWorkCenter;
+    }
+
+    public void setResourceWorkCenter(String resourceWorkCenter) {
+        this.resourceWorkCenter = resourceWorkCenter;
+    }
+
     public String getLocale() {
         return locale;
     }
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
index 07b79f8c..f4a3cdfa 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/SfcDispatchController.java
@@ -70,7 +70,7 @@ public class SfcDispatchController {
     @ResponseBody
     @GetMapping("getSfcDispatch")
     public R getSfcDispatch(String workCenter, String dispatchStatus, String item, String itemNumber, String workOrder, String shopOrder,
-                            String resrce, String resourceType, String operation, String sfc, String componentDescription, String turnOperation,
+                            String resrce, String resourceType, String operation, String sfc, String component, String componentDescription, String turnOperation,
                             String isDispatch, String startFromDate_S, String startToDate_S, String completeFromDate_S, String completeToDate_S) {
         List<ShopOrderRelease> list;
         try {
@@ -86,6 +86,7 @@ public class SfcDispatchController {
             shopOrderRelease.setResourceType(resourceType);
             shopOrderRelease.setOperation(operation);
             shopOrderRelease.setSfc(sfc);
+            shopOrderRelease.setComponent(component);
             shopOrderRelease.setComponentDescription(componentDescription);
             shopOrderRelease.setTurnOperation(turnOperation);
             shopOrderRelease.setIsDispatch(isDispatch);
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
index 6cee0e1f..8334a760 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/SfcDispatchMapper.java
@@ -24,6 +24,12 @@ public interface SfcDispatchMapper extends BaseMapper<SfcDispatch> {
 
     List<SfcDispatch> findSfcDispatch(@Param("site") String site, @Param("sfc") String sfc, @Param("operation") String operation, @Param("stepId") String stepId);
 
+    /**
+     * 查询派工生产批次数据
+     *
+     * @param shopOrderRelease
+     * @return
+     */
     List<ShopOrderRelease> findSfcDispatchList(ShopOrderRelease shopOrderRelease);
 
     /**
diff --git a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
index 432ed72b..9c6bc92a 100644
--- a/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
+++ b/dispatch/src/main/resources/mapper/SfcDispatchMapper.xml
@@ -1044,6 +1044,9 @@
             <if test="turnOperation != null and turnOperation != ''">
                 AND SD.TURN_OPERATION = #{turnOperation}
             </if>
+            <if test="component != null and component != ''">
+                AND CP.ITEM = #{component}
+            </if>
             <if test="componentDescription != null and componentDescription != ''">
                 AND CPT.DESCRIPTION LIKE '%' || #{componentDescription} || '%'
             </if>