From 8dc04110a843ff594be3c52bb2de8e24de62569f Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 31 五月 2024 15:38:07 +0800
Subject: [PATCH] #new

---
 src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java |  162 +++++++++++++++++++++++++++++++++--------------------
 src/main/resources/application.yml                            |   15 ++--
 2 files changed, 108 insertions(+), 69 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 2839148..6db063c 100644
--- a/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/AgvWrkMastHandler.java
@@ -71,72 +71,112 @@
             agvWrkMastService.updateById(agvWrkMast);
             // 绌烘澘鍏ュ簱 璁剧疆搴撲綅鐘舵�佷负D.绌烘《/绌烘爤鏉�
             String locSts = agvWrkMast.getIoType() == 10 ? "D" : "F";
-            if (agvWrkMast.getIoType() == 10 || agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 || agvWrkMast.getIoType() == 113) {
-                // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
-                if ((agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111) && agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                    // 鎺ラ┏浣� -- 搴撲綅
-                } else {
+            switch (agvWrkMast.getIoType()){
+                case 10:
                     agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-                }
-            } else {
-                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
-            }
 
-            if (agvWrkMast.getIoType() != 111) {
-                //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
-                agvWrkMastLogService.save(agvWrkMast);
-                //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
-                agvWrkDetlLogService.save(wrkNo);
-            }
-
-            //绫诲瀷涓哄叆搴撴椂
-            if(agvWrkMast.getIoType() == 1){
-                //鏇存柊鐩爣搴撲綅鏄庣粏
-                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));
-            }
-            //绫诲瀷涓哄簱浣嶇Щ杞椂
-            if(agvWrkMast.getIoType() == 11 || agvWrkMast.getIoType() == 12){
-                //鏇存柊搴撳瓨鏄庣粏
-                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
-                //淇敼婧愬簱浣嶇姸鎬佷负O
-                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",null);
-            }
-
-            //绫诲瀷涓哄簱浣嶇Щ杞椂
-            if(agvWrkMast.getIoType() == 108){
-                //鏇存柊搴撳瓨鏄庣粏
-                agvLocDetlService.updateStock(agvWrkMast.getSourceLocNo(),agvWrkMast.getLocNo());
-                //淇敼婧愬簱浣嶇姸鎬佷负O
-                agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
-            }
-
-            if(agvWrkMast.getIoType() == 109 || agvWrkMast.getIoType() == 111 || agvWrkMast.getIoType() == 112){
-                // 鎺ラ┏浣� -- 搴撲綅
-                if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
+                    agvWrkMastLogService.save(agvWrkMast);
+                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
+                    agvWrkDetlLogService.save(wrkNo);
+                    break;
+                case 109:
                     // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
-                } else {
+                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                        // 鎺ラ┏浣� -- 搴撲綅
+                    } else {
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    }
+
+                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
+                    agvWrkMastLogService.save(agvWrkMast);
+                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
+                    agvWrkDetlLogService.save(wrkNo);
+
+                    // 鎺ラ┏浣� -- 搴撲綅
+                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                        // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
+                    } else {
+                        //淇敼婧愬簱浣嶇姸鎬佷负O
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    }
+                    break;
+                case 111:
+                    // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
+                    if (agvWrkMast.getLocNo().substring(0,2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                        // 鎺ラ┏浣� -- 搴撲綅
+                    } else {
+                        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);
+                        // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
+                    } else {
+                        //淇敼婧愬簱浣嶇姸鎬佷负O
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    }
+                    break;
+                case 113:
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"D",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+
+                    //鐢熸垚AGV宸ヤ綔鍘嗗彶妗�
+                    agvWrkMastLogService.save(agvWrkMast);
+                    //鐢熸垚AGV宸ヤ綔鏄庣粏鍘嗗彶妗�
+                    agvWrkDetlLogService.save(wrkNo);
+
+                    // 鎺ラ┏浣� -- 搴撲綅
+                    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:
+                    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);
-                }
-            }
-
-            if(agvWrkMast.getIoType() == 113){
-                // 鎺ラ┏浣� -- 搴撲綅
-                if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
-                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
-                }
-            }
-
-            if (agvWrkMast.getIoType() == 58) {
-                agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+                    break;
+                case 112:
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    // 鎺ラ┏浣� -- 搴撲綅
+                    if (agvWrkMast.getSourceLocNo().substring(0,2).equals("DB")) {
+                        agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",(short)0);
+                        // 搴撲綅 -- 鎺ラ┏浣� / 搴撲綅
+                    } else {
+                        //淇敼婧愬簱浣嶇姸鎬佷负O
+                        agvLocMastService.updateLocStsByLocNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue(),"",(short)0);
+                    }
+                    break;
+                case 58:
+                    agvLocMastService.updateLocStsByLocNo(agvWrkMast.getLocNo(),"F",agvWrkMast.getBarcode(),agvWrkMast.getWhsType().shortValue());
+                    agvBasDevpService.updateLocStsAndBarcodeByDevNo(agvWrkMast.getSourceLocNo(),"O","",agvWrkMast.getWhsType().shortValue());
+                    break;
+                default:
+                    return null;
             }
 
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index cba1204..d7f8164 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,8 +10,7 @@
     enabled: false
   datasource:
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
-#    url: jdbc:sqlserver://192.168.4.188:1433;databasename=phyzasrs
+    #    url: jdbc:sqlserver://127.0.0.1:1433;databasename=phyzasrs
     url: jdbc:sqlserver://192.168.4.15:1433;databasename=phyzasrs
     username: sa
     password: sa@123
@@ -21,7 +20,7 @@
     host: 127.0.0.1
     port: 6379
     database: 0
-#    password: xltys1995
+  #    password: xltys1995
   servlet:
     multipart:
       maxFileSize: 100MB
@@ -73,11 +72,11 @@
     password: Wlzh44338
 
 agv:
-#  url: localhost:8080
-#  taskCreatePath: /agv/task/create
-#  containerMoveInPath: /agv/container/moveIn
-#  containerMoveOutPath: /agv/container/moveOut
-#  containerArrivedPath: /agv/containerArrived
+  #  url: localhost:8080
+  #  taskCreatePath: /agv/task/create
+  #  containerMoveInPath: /agv/container/moveIn
+  #  containerMoveOutPath: /agv/container/moveOut
+  #  containerArrivedPath: /agv/containerArrived
   url: 192.168.103.32:8181
   taskCreatePath: /rcms/services/rest/hikRpcService/genAgvSchedulingTask
   taskCancelPath: /rcms/services/rest/hikRpcService/cancelTask

--
Gitblit v1.9.1