From 49ca453631f70827ffb4caae3c7032146c2baa32 Mon Sep 17 00:00:00 2001
From: zpl <pzl_7001@163.com>
Date: Wed, 11 Aug 2021 16:57:08 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8F=AB=E6=96=99PDA?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/CallItemController.java        | 36 ++++++++++++++++++
 .../dispatch/mapper/CallItemMapper.java       | 11 ++++++
 .../dispatch/service/CallItemService.java     | 16 ++++++++
 .../service/impl/CallItemServiceImpl.java     | 15 ++++++++
 .../main/resources/mapper/CallItemMapper.xml  | 37 +++++++++++++++----
 5 files changed, 108 insertions(+), 7 deletions(-)

diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java
index 437da2fe..61b47712 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/controller/CallItemController.java
@@ -151,6 +151,24 @@ public class CallItemController {
         return R.ok("叫料操作成功");
     }
 
+    /**
+     * 生产叫料pda
+     * @param callItemList
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/callOrConfirmItemPda")
+    public R callOrConfirmItemPda(@RequestBody List<CallItem> callItemList) {
+        try {
+            String site = CommonMethods.getSite();
+            String user = CommonMethods.getUser();
+            callItemService.callOrConfirmItemPda(site, user, callItemList.get(0).getCallStatus() ,callItemList);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+        return R.ok("叫料成功");
+    }
+
 
     @ResponseBody
     @PostMapping("/confirmReceive")
@@ -203,6 +221,24 @@ public class CallItemController {
         return R.ok("刷新叫料明细成功");
     }
 
+    /**
+     * 刷新叫料数据
+     * @param callItemList
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/refreshCallItemPda")
+    public R refreshCallItemPda(@RequestBody List<CallItem> callItemList) {
+        try {
+            String site = CommonMethods.getSite();
+            String user = CommonMethods.getUser();
+            callItemService.refreshCallItemPda(site, user, callItemList);
+        } catch (Exception e) {
+            return R.failed(e.getMessage());
+        }
+        return R.ok("刷新叫料明细成功");
+    }
+
     @ResponseBody
     @PostMapping("/refreshRequiredTime")
     public R refreshRequiredTime(@RequestBody List<String> callItemNoList) {
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java
index 4506b694..cb1c7abf 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/mapper/CallItemMapper.java
@@ -40,6 +40,17 @@ public interface CallItemMapper extends BaseMapper<CallItem> {
 
     void updateCallItemStatusByDispatchBo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
 
+    /**
+     * PDA生产叫料--修改叫料状态
+     * @param status
+     * @param user
+     * @param dateTime
+     * @param list
+     */
+    void updateCallItemStatusByHandle(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
+
+    void findRefreshCallItemPda(@Param("list") List<String> list);
+
     void updateCallItemStatusByCallItemNo(@Param("status") String status, @Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
 
     void refreshRequiredTime(@Param("user") String user, @Param("dateTime") LocalDateTime dateTime, @Param("list") List<String> list);
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java
index 03e2fd95..00bd8193 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/CallItemService.java
@@ -76,6 +76,14 @@ public interface CallItemService extends IService<CallItem> {
      */
     void callItem(String site, String user, List<CallItem> callItemList);
 
+    /**
+     * 叫料PDA
+     * @param site
+     * @param user
+     * @param callItemList
+     */
+    void callOrConfirmItemPda(String site, String user, String status ,List<CallItem> callItemList);
+
     /**
      *  确认到料
      *  ----需要校验叫料明细行中不允许存在叫料类型为材料，且组件物料类型为原材料的行
@@ -104,6 +112,14 @@ public interface CallItemService extends IService<CallItem> {
      */
     void refreshCallItem(String site, String user, List<CallItem> callItemList);
 
+    /**
+     * 刷新叫料明细PDA
+     * @param site
+     * @param user
+     * @param callItemList
+     */
+    void refreshCallItemPda(String site, String user, List<CallItem> callItemList);
+
     /**
      * 刷新需求时间
      *
diff --git a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
index e8a4f5fb..6e945aa4 100644
--- a/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
+++ b/dispatch/src/main/java/com/foreverwin/mesnac/dispatch/service/impl/CallItemServiceImpl.java
@@ -154,6 +154,16 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         this.updateCallItemStatusByDispatchBo(Constants.CALL_ITEM_STATUS_CALLED, user, dispatchBoList);
     }
 
+    @Override
+    public void callOrConfirmItemPda(String site, String user,String status ,List<CallItem> callItemList) {
+        LocalDateTime dateTime = LocalDateTime.now();
+        List<String> list = new ArrayList<>();
+        for (CallItem callItem : callItemList) {
+            list.add(callItem.getHandle());
+        }
+        callItemMapper.updateCallItemStatusByHandle(status, user, dateTime, list);
+    }
+
     @Override
     public void confirmReceive(String site, String user, List<CallItem> callItemList) {
         if (callItemList == null || callItemList.size() <= 0) {
@@ -259,6 +269,11 @@ public class CallItemServiceImpl extends ServiceImpl<CallItemMapper, CallItem> i
         }
     }
 
+    @Override
+    public void refreshCallItemPda(String site, String user, List<CallItem> callItemList) {
+
+    }
+
     @Override
     public void refreshRequiredTime(String site, String user, List<String> callItemNoList) {
         if (callItemNoList == null || callItemNoList.size() <= 0) {
diff --git a/dispatch/src/main/resources/mapper/CallItemMapper.xml b/dispatch/src/main/resources/mapper/CallItemMapper.xml
index 14036eec..0132e1fb 100644
--- a/dispatch/src/main/resources/mapper/CallItemMapper.xml
+++ b/dispatch/src/main/resources/mapper/CallItemMapper.xml
@@ -833,6 +833,14 @@
         </foreach>
     </update>
 
+    <update id="updateCallItemStatusByHandle">
+        UPDATE Z_CALL_ITEM SET CALL_STATUS = #{status}, MODIFY_USER = #{user}, MODIFIED_DATE_TIME = #{dateTime}
+        WHERE HANDLE IN
+        <foreach item="item" collection="list" separator="," open="(" close=")" index="">
+            #{item}
+        </foreach>
+    </update>
+
     <update id="updateCallItemStatusByCallItemNo">
         UPDATE Z_CALL_ITEM SET STATUS = #{status}, MODIFY_USER = #{user}, MODIFIED_DATE_TIME = #{dateTime}
         WHERE STATUS != '804' AND  CALL_ITEM_NO IN
@@ -971,10 +979,10 @@
     </select>
 
     <select id="findCallItemInfoList" resultMap="FullResultMap">
-        SELECT  CI.RESRCE ,CF.VALUE SHOP_ORDER ,CI.REQUIRED_QTY , CI.STATUS AS CALL_STATUS,
+        SELECT  CI.HANDLE ,CI.RESRCE ,CF.VALUE SHOP_ORDER ,CI.REQUIRED_QTY , CI.CALL_STATUS,
         B.BOM AS ITEM, B.DESCRIPTION ITEM_DESCRIPTION ,
         SD.WORK_CENTER , WCT.DESCRIPTION AS WORK_CENTER_DESCRIPTION, SD.BLANKING_SIZE, SD.REMARK, SD.PLANNED_START_DATE,
-        I.ITEM AS ITEM_NO ,IT.DESCRIPTION AS COMPONENT_DESCRIPTION
+        I.ITEM AS COMPONENT ,IT.DESCRIPTION AS COMPONENT_DESCRIPTION
         FROM  Z_CALL_ITEM CI
         LEFT JOIN SHOP_ORDER SO ON CI.SHOP_ORDER = SO.SHOP_ORDER
         LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = SO.HANDLE AND CF."ATTRIBUTE" = 'WORK_ORDER'
@@ -985,7 +993,7 @@
         LEFT JOIN WORK_CENTER_T WCT ON WC.HANDLE = WCT.WORK_CENTER_BO
         LEFT JOIN ITEM I ON CI.COMPONENT_BO = I.HANDLE
         LEFT JOIN ITEM_T IT ON I.HANDLE = IT.ITEM_BO
-        WHERE CI.SITE = #{site}
+        WHERE CI.SITE = #{site} AND WCT.LOCALE = 'zh'
         <if test="workCenter != null and workCenter != ''">
             AND SD.WORK_CENTER = #{workCenter}
         </if>
@@ -998,13 +1006,28 @@
         <if test="status != null and status != ''">
             AND CI.STATUS = #{status}
         </if>
-        <if test="startFromDate_S != null">
-            AND SD.PLANNED_START_DATE >= #{startFromDate_S}
+        <if test="startFromDate != null">
+            AND SD.PLANNED_START_DATE >= #{startFromDate}
         </if>
-        <if test="startToDate_S != null">
-            AND SD.PLANNED_START_DATE &lt;= #{startToDate_S}
+        <if test="startToDate != null">
+            AND SD.PLANNED_START_DATE &lt;= #{startToDate}
         </if>
         ORDER BY CF.VALUE ,CI.RESRCE, I.ITEM
     </select>
+    <select id="findRefreshCallItemPda" resultMap="FullResultMap">
+        SELECT CI.HANDLE ,CI.SFC ,CI.COMPONENT_BO ,BC.QTY REQUIRED_QTY, CF.VALUE STEP_ID
+               --BC.BOM_BO , CI.STEP_ID ,
+        FROM Z_CALL_ITEM CI
+                 LEFT JOIN SFC S ON S.SFC = CI.SFC
+                 LEFT JOIN SFC_BOM SB ON SB.SFC_BO = S.HANDLE
+                 LEFT JOIN BOM_COMPONENT BC ON BC.BOM_BO = SB.BOM_BO AND BC.COMPONENT_GBO = CI.COMPONENT_BO
+                 LEFT JOIN CUSTOM_FIELDS CF ON CF.HANDLE = BC.HANDLE AND CF."ATTRIBUTE" = 'STEP_ID' AND CF.VALUE = CI.STEP_ID
+        WHERE HANDLE IN
+            (
+            <foreach item="item" index="index" collection="coll" separator=",">
+                #{item}
+            </foreach>
+            )
+    </select>
 
 </mapper>