From 3695eb9fa6062ef00e685835cf384c02e60f7b17 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 20 十二月 2024 13:39:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtasrs' into jxgtasrs
---
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++++++---
1 files changed, 10 insertions(+), 3 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 effd7d5..29f863d 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -91,8 +91,15 @@
// 0.鍑哄簱妯″紡锛�1.agv鍏ュ簱涓紝2.鐢熸垚鍏ュ簱浠诲姟
if (basDevp.getDevMk().equals("0")) { // 鏄嚭搴�
// 鍒ゆ柇鏄惁鏈夊嚭搴撲换鍔�
- int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>()
- .eq("sta_no", inSta).lt("wrk_sts",14).in("io_type",101,103,107,110));
+ 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");
@@ -131,10 +138,10 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- jsonObject.getString("message");
if (jsonObject.getInteger("code").equals(0)) {
success = true;
} else {
+ message = jsonObject.getString("message");
log.error("鍏ュ簱鍛煎彨agv澶辫触锛侊紒锛乽rl锛歿}锛況equest锛歿}锛況esponse锛歿}", ApiInterfaceConstant.AGV_IP + ApiInterfaceConstant.AGV_CALL_IN_PATH, body, response);
}
} catch (Exception e) {
--
Gitblit v1.9.1