From 7a44ef9a78ca4410901a46826eca5f969879b652 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Tue, 9 Nov 2021 14:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E7=89=A9=E6=96=99=E6=B5=81=E8=BD=AC=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/controller/ReportDataController.java   |  4 ++--
 .../mesnac/common/mapper/ReportDataMapper.java    |  2 +-
 .../main/resources/mapper/ReportDataMapper.xml    | 15 ++++++++++-----
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
index 563782ee..5aa82b00 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/controller/ReportDataController.java
@@ -168,8 +168,8 @@ public class ReportDataController {
      * @param
      * @return
      */
-    @GetMapping("/doItemMove")
-    public R doItemMove(List<String> list) {
+    @PostMapping("/doItemMove")
+    public R doItemMove(@RequestBody List<String> list) {
         try{
             String site = CommonMethods.getSite();
             //List<String> list = (List<String>) paramMap.get("list");
diff --git a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
index 081fddae..45e09153 100644
--- a/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
+++ b/common/src/main/java/com/foreverwin/mesnac/common/mapper/ReportDataMapper.java
@@ -37,5 +37,5 @@ public interface ReportDataMapper {
 
     List<Map<String, Object>> selectItemMoveData(Map paramMap);
 
-    List<Map<String, Object>> doItemMove(@Param("site") String site, @Param("list") List<String> list);
+    void doItemMove(@Param("site") String site, @Param("list") List<String> list);
 }
diff --git a/common/src/main/resources/mapper/ReportDataMapper.xml b/common/src/main/resources/mapper/ReportDataMapper.xml
index bd238ee9..c1c43575 100644
--- a/common/src/main/resources/mapper/ReportDataMapper.xml
+++ b/common/src/main/resources/mapper/ReportDataMapper.xml
@@ -671,8 +671,13 @@
                       WHERE ZSD.SITE = #{site} AND ZSD.OTHER_2 IS NOT NULL
                       GROUP BY ZSD.SFC )
         SELECT ZSD.SHOP_ORDER ,ZSD.SFC , CF.VALUE WORK_ORDER , I.ITEM , IT.DESCRIPTION ITEM_DESCRIPTION ,
-               ZSD.BLANKING_SIZE , ZSD.DISPATCH_QTY , ZSD.OPERATION , OT.DESCRIPTION OPERATION_DESCRIPTION  , ZSD.EMPLOYEE_DESCRIPTION ,
-               ZSD.OTHER_2 , ZSD.OTHER_3 , ZSD.HANDLE , ZSD.BLANKING_SIZE
+               ZSD.BLANKING_SIZE ,  ZSD.OPERATION , OT.DESCRIPTION OPERATION_DESCRIPTION  , ZSD.EMPLOYEE_DESCRIPTION ,
+               ZSD.DISPATCH_QTY ,ZSD.OTHER_2 , ZSD.OTHER_3 , ZSD.HANDLE , ZSD.BLANKING_SIZE ,
+               CASE WHEN ZSD.OTHER_2 = 'H' THEN '转入焊接'
+                    WHEN ZSD.OTHER_2 = 'Z' THEN '转装配'
+                    WHEN ZSD.OTHER_2 = 'RK' THEN '入库' END OTHER_2_DESC ,
+               CASE WHEN ZSD.OTHER_3 = 'true' THEN '已流转'
+                ELSE '未流转' END OTHER_3_DESC
         FROM Z_SFC_DISPATCH ZSD
                  LEFT JOIN SHOP_ORDER SO ON SO.SHOP_ORDER = ZSD.SHOP_ORDER
                  LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
@@ -697,9 +702,9 @@
     </select>
 
     <update id="doItemMove">
-        UPDATE Z_SFC_DISPATCH ZSD SET ZSD.OTHER_3 = 'true' WHERE ZSD.HANDLE IN
-            <foreach item="handle" collection="array" separator="," open="(" close=")" index="">
-                #{handle}
+        UPDATE Z_SFC_DISPATCH ZSD SET ZSD.OTHER_3 = 'true'  WHERE ZSD.HANDLE IN
+            <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+                #{item}
             </foreach>
             AND ZSD.SITE = #{site}
     </update>