From 44fbf7f1e833516bcf661ca661f9fa3c31cea6c8 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期二, 11 六月 2024 13:07:14 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/AgvLocMastController.java |   21 +++++++++++++++++++++
 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java |   31 +++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
index 30cd109..fb407d4 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocMastController.java
@@ -81,6 +81,27 @@
         if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
             return R.error("褰撳墠鎿嶄綔宸茶闃绘锛岃鑱旂郴绠$悊鍛�");
         }
+        int br = 0;
+        switch (locMast.getBarcode().substring(0,2)) {
+            case "10":
+                br = 1;
+                break;
+            case "20":
+                br = 2;
+                break;
+            case "21":
+                br = 4;
+                break;
+            case "30":
+                br = 3;
+                break;
+            case "40":
+                br = 5;
+                break;
+        }
+        if (oldLocMast.getLocType1() != br) {
+            return  R.error("璐ф灦鍜屽簱浣嶇被鍨嬩笉鍖归厤锛�");
+        }
         Date now = new Date();
         // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
         if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F") || oldLocMast.getLocSts().equals("S")) {
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
index 82b39b9..af1a48d 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java
@@ -328,16 +328,47 @@
         if (Cools.isEmpty(agvBasDevp)) {
             throw new CoolException("鏆傛棤"+ station + "绔欑偣");
         }
+        int br = 0;
+        if (containerType == 21 && agvBasDevp.getFloor() == 2) {
+            containerType = 20;
+        }
+        switch (containerType) {
+            case 10:
+                br = 1;
+                break;
+            case 20:
+                br = 2;
+                break;
+            case 21:
+                br = 4;
+                break;
+            case 30:
+                br = 3;
+                break;
+            case 40:
+                br = 5;
+                break;
+        }
+        if (br == 4 && agvBasDevp.getLocType1() == 2) {
+            br = 2;
+        }
+        if (agvBasDevp.getLocType1() != br) {
+            throw new CoolException("绔欑偣寮傚父锛�");
+        }
         if (containerType == 40) {
             locType = 5;
         } else if (containerType == 21 && agvBasDevp.getFloor() == 3) {
             locType = 4;
         } else if (containerType == 20 && agvBasDevp.getFloor() == 3) {
             locType = 2;
+        } else if (containerType == 30) {
+            locType = 3;
         } else {
             locType = agvBasDevp.getLocType1();
         }
 
+
+
         if(!Cools.eq(agvBasDevp.getBarcode(),containerCode) && !agvBasDevp.getLocSts().equals("O") && !emptyAutoIn){
             throw new CoolException("褰撳墠宸ヤ綔浣嶇姸鎬佷负" + agvBasDevp.getLocSts()+",鏃犳硶杩涜鍏ュ簱");
         }

--
Gitblit v1.9.1