From c2233dd6f802e22a0b546c5c494402884f259e0a Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期二, 24 十二月 2024 15:03:28 +0800
Subject: [PATCH] 出入库限制

---
 src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java |   46 +++++++++++++++++++++++++++-------------------
 1 files changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index e2f5bc5..e9ab1b0 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -88,25 +88,29 @@
     public R inLocCallAgv(String sta, String inSta) {
 
         BasDevp basDevp = basDevpMapper.selectById(inSta);
-        // 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
-        if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
-             // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
-            Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
-            switch (inSta) {
-                case "1040": wrapper.in("source_sta_no","1043","1044");break;
-                case "2010": wrapper.in("source_sta_no","2013","2014"); break;
-                case "2000": wrapper.in("source_sta_no","2003","2004");break;
-                case "3010": wrapper.in("source_sta_no","3013","3014");break;
-                default:
-            }
-            int count = wrkMastService.selectCount(wrapper);
-            if (count == 0) {
-                // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
-                basDevp.setDevMk("1");
-                basDevpMapper.updateById(basDevp);
-            } else {
-                return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
-            }
+
+        // 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
+        Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().lt("wrk_sts", 14).in("io_type", 101, 103, 107, 110);
+
+        switch (inSta) {
+            case "1040":
+                wrapper.in("source_sta_no", "1043", "1044");
+                break;
+            case "2010":
+                wrapper.in("source_sta_no", "2013", "2014");
+                break;
+            case "2000":
+                wrapper.in("source_sta_no", "2003", "2004");
+                break;
+            case "3010":
+                wrapper.in("source_sta_no", "3013", "3014");
+                break;
+            default:
+        }
+        int count = wrkMastService.selectCount(wrapper);
+        log.info("鍏ュ簱鍛煎彨agv鍛煎彨绔欑偣锛歿}锛岀洰鏍囩珯鐐癸細{},鍑哄簱浠诲姟鏁帮細{}",sta,inSta,count);
+        if (count != 0) {
+            return R.parse(inSta + "绔欑偣瀛樺湪鍑哄簱浠诲姟");
         }
 
         // 鍏堢粦瀹�
@@ -140,6 +144,10 @@
             JSONObject jsonObject = JSON.parseObject(response);
             if (jsonObject.getInteger("code").equals(0)) {
                 success = true;
+                // 娌℃湁鍑哄簱浠诲姟锛屾洿鏀逛负鍏ュ簱妯″紡
+                basDevp.setDevMk("1");
+                basDevp.setInQty(basDevp.getInQty() + 1);
+                basDevpMapper.updateById(basDevp);
             } else {
                 message = jsonObject.getString("message");
                 log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);

--
Gitblit v1.9.1