From 14dfd8520004949924757919f505ed1805f62199 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期日, 02 六月 2024 11:58:25 +0800
Subject: [PATCH] #回调日志

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |   57 +++++++++++++++++----------------------------------------
 1 files changed, 17 insertions(+), 40 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
index 688fa4f..c66f01b 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -163,48 +163,23 @@
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
                         agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                        //鏇存柊鐩爣搴撲綅鏄庣粏 101.鍑哄簱 鍒犻櫎婧愬簱浣嶅簱瀛樻槑缁�
+                        agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no",agvWrkMast.getSourceLocNo()));
                     }
-                    break;
-                case 113:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    // 鎺ラ┏浣� -- 搴撲綅
-                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
-                    }
-                    break;
-                case 1:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    //鏇存柊鐩爣搴撲綅鏄庣粏
-                    log.info("鏇存柊鐩爣搴撲綅鏄庣粏 agvWrkMast.getLocNo(): " + agvWrkMast.getLocNo() + ", wrkNo: " + wrkNo);
-                    agvLocDetlService.addLocDetlInfo(agvWrkMast.getLocNo(),wrkNo);
-                    //鐢熸垚鍏ュ簱閫氱煡鍘嗗彶妗�
-                    boolean save = agvWaitPakinLogService.save(barcode);
-                    //鍒犻櫎鍏ュ簱閫氱煡妗�
-                    log.info("鍒犻櫎鍏ュ簱閫氱煡妗� supp_code: " + barcode);
-                    agvWaitPakinService.delete(new EntityWrapper<AgvWaitPakin>().eq("supp_code",barcode));
-                    break;
-                case 11:
-                case 12:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    //鏇存柊搴撳瓨鏄庣粏
-                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
-                    //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
-                    break;
-                case 108:
-                case 121:
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    //鏇存柊搴撳瓨鏄庣粏
-                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
-                    //淇敼婧愬簱浣嶇姸鎬佷负O
-                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                     break;
                 case 112:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    List<AgvWrkDetl> agvWrkDetls = agvWrkDetlService.selectList(new EntityWrapper<AgvWrkDetl>().eq("wrk_no", agvWrkMast.getWrkNo()));
+                    for (AgvWrkDetl agvWrkDetl : agvWrkDetls) {
+                        AgvLocDetl locDetl = new AgvLocDetl();
+                        locDetl.setLocNo(agvWrkMast.getLocNo());
+                        locDetl.sync(agvWrkDetl);
+                        locDetl.setModiTime(new Date());
+                        agvLocDetlService.insert(locDetl);
+                    }
                     // 鎺ラ┏浣� -- 搴撲綅
                     if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
                         agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
-                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
                         // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
                     } else {
                         //淇敼婧愬簱浣嶇姸鎬佷负O
@@ -218,11 +193,13 @@
                         agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
                     }
                     break;
-
-
-
-
-
+                case 121:
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    //鏇存柊搴撳瓨鏄庣粏
+                    agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
+                    //淇敼婧愬簱浣嶇姸鎬佷负O
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    break;
 
                 default:
                     return null;

--
Gitblit v1.9.1