From 7a326ec05e656413e7d78eb40cb974cc72f08e62 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 15:05:26 +0800
Subject: [PATCH] 导入重复单据后,修改单据状态

---
 src/main/java/com/zy/asrs/controller/AgvOpenController.java |   27 +++++++++++----------------
 1 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvOpenController.java b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
index 18346cb..89fb7e1 100644
--- a/src/main/java/com/zy/asrs/controller/AgvOpenController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvOpenController.java
@@ -72,7 +72,7 @@
         //save api log (appkey 鍚庣画娣诲姞)
 
         AppAuthUtil.auth("",param, request);
-        int wrkNo = Integer.parseInt(param.getReqCode());
+        int wrkNo = Integer.parseInt(param.getTaskCode());
         if(wrkNo < 0){
             wrkNo = -wrkNo;
         }
@@ -112,17 +112,13 @@
 enum AgvTask{
 
     /**
-     * 涓婃姤浠诲姟鐘舵��
+     * 涓婃姤浠诲姟瀹屾垚
      */
     end{
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负205.宸ヤ綔瀹屾垚
             agvWrkMast.setWrkSts(205L);
-
-            //agvWrkMast.setLocNo(param.getLocationCode());
-            agvWrkMastService.updateById(agvWrkMast);
-            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),205);
 
             //鍑哄簱浠诲姟 101.鍑哄簱 || 103.鎷f枡鍑哄簱 || 107.鐩樼偣鍑哄簱
             if(agvWrkMast.getIoType() == 101 || agvWrkMast.getIoType() == 103 || agvWrkMast.getIoType() == 107){
@@ -132,21 +128,24 @@
             //鍑哄簱浠诲姟 110.绌烘澘鍑哄簱
             if(agvWrkMast.getIoType() == 110){
                 agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                agvWrkMast.setWrkSts(206L);
             }
+            agvWrkMastService.updateById(agvWrkMast);
         }
     },
     /**
-     * 涓婃姤浠诲姟鍒嗛厤缁欐満鍣ㄤ汉
+     * 浠诲姟寮�濮�
      */
     start{
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-
+            //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负203.浠诲姟寮�濮�
+            agvWrkMast.setWrkSts(203L);
+            agvWrkMastService.updateById(agvWrkMast);
         }
-
     },
     /**
-     * 涓婃姤鍙栫鐘舵��
+     * 璧板嚭鍌ㄤ綅鐘舵��
      */
     outbin{
         @Transactional
@@ -159,7 +158,7 @@
             }
 
             //淇敼AGV宸ヤ綔妗g殑宸ヤ綔鐘舵�佷负203.RCS鏀捐揣涓�
-            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),203);
+            agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
 
         }
 
@@ -170,11 +169,7 @@
     cancel{
         @Transactional
         public void success(AgvWrkMast agvWrkMast, AgvTaskCallBackParam param) {
-            //淇敼宸ヤ綔妗g姸鎬佷负204.鏀捐揣瀹屾垚
-            agvWrkMast.setWrkSts(204L);
-            //agvWrkMast.setLocNo(param.getLocationCode());
-            agvWrkMastService.updateById(agvWrkMast);
-            //agvWrkMastService.updateWrkStsByWrkNo(agvWrkMast.getWrkNo(),204);
+
 
         }
 

--
Gitblit v1.9.1