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/webapp/views/basDevp/basDevp_detail.html | 22 ++++++++++++++--------
src/main/webapp/static/js/basDevp/basDevp.js | 2 +-
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 13 ++++++++++---
src/main/java/com/zy/common/utils/OutStockInterceptUtil.java | 23 ++++++++++++++++++-----
4 files changed, 43 insertions(+), 17 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) {
diff --git a/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java b/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
index b3f156a..e28bbf7 100644
--- a/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
+++ b/src/main/java/com/zy/common/utils/OutStockInterceptUtil.java
@@ -1,6 +1,7 @@
package com.zy.common.utils;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
+import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.SpringUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
@@ -24,9 +25,10 @@
public static final Map<Integer,Boolean> inSiteMap = new HashMap<Integer,Boolean>();
static {
- inSiteMap.put(1040, true);
- inSiteMap.put(2010, true);inSiteMap.put(2000, true);
- inSiteMap.put(3010, true);
+ inSiteMap.put(1040, true);inSiteMap.put(1042, true);
+ inSiteMap.put(2010, true);inSiteMap.put(2012, true);
+ inSiteMap.put(2000, true);inSiteMap.put(2002, true);
+ inSiteMap.put(3010, true);inSiteMap.put(3012, true);
}
/**
@@ -44,8 +46,19 @@
} else if (devMk.equals("2")) {
// 鍒ゆ柇璇ョ珯鐐瑰叆搴撲换鍔℃槸鍚﹀畬鎴�
WrkMastMapper wrkMastMapper = SpringUtils.getBean(WrkMastMapper.class);
- int count = wrkMastMapper.selectCount(new EntityWrapper<WrkMast>()
- .eq("source_sta_no", site).in("io_type",1,10,53,57));
+ Wrapper<WrkMast> wrapper = new EntityWrapper<WrkMast>().in("io_type", 1, 10, 53, 57);
+ switch (site) {
+ case 1040: wrapper.in("sta_no","1043","1044");break;
+ case 1042: wrapper.in("sta_no","1043","1044");break;
+ case 2010: wrapper.in("sta_no","2013","2014"); break;
+ case 2012: wrapper.in("sta_no","2013","2014"); break;
+ case 2000: wrapper.in("sta_no","2003","2004");break;
+ case 2002: wrapper.in("sta_no","2003","2004");break;
+ case 3010: wrapper.in("sta_no","3013","3014");break;
+ case 3012: wrapper.in("sta_no","3013","3014");break;
+ default:
+ }
+ int count = wrkMastMapper.selectCount(wrapper);
if (count == 0) {
basDevp.setDevMk("0"); // 娌℃湁鍏ュ簱浠诲姟锛屽垏鎹㈡垚鍑哄簱妯″紡
basDevpMapper.updateById(basDevp);
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index 9e4b732..05d0019 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -22,7 +22,7 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'devNo', align: 'center',sort:true,title: '缂栧彿'}
// ,{field: 'decDesc', align: 'center',title: '璁惧鎻忚堪'}
- // ,{field: 'devMk', align: 'center',title: '澶囨敞'}
+ ,{field: 'devMk', align: 'center',title: '鍑哄叆鐘舵��'}
,{field: 'inEnable', align: 'center',title: '鍙叆', templet:function(row){
var html = "<input value='inEnable' type='checkbox' lay-skin='primary' lay-filter='tableCheckbox' table-index='"+row.LAY_TABLE_INDEX+"'";
if(row.inEnable === 'Y'){html += " checked ";}
diff --git a/src/main/webapp/views/basDevp/basDevp_detail.html b/src/main/webapp/views/basDevp/basDevp_detail.html
index afaa743..fc38e31 100644
--- a/src/main/webapp/views/basDevp/basDevp_detail.html
+++ b/src/main/webapp/views/basDevp/basDevp_detail.html
@@ -30,12 +30,12 @@
</div>
</div>
- <div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">澶囥��銆�娉細</label>
- <div class="layui-input-inline">
- <input id="devMk" class="layui-input" type="text">
- </div>
- </div>
+<!-- <div class="layui-inline" style="width:31%;display: none">-->
+<!-- <label class="layui-form-label">澶囥��銆�娉細</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="devMk" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;">
<label class="layui-form-label">鍙��銆�鍏ワ細</label>
<div class="layui-input-inline">
@@ -234,10 +234,16 @@
<input id="cartPos" class="layui-input" type="text">
</div>
</div>
+<!-- <div class="layui-inline" style="width:31%;">-->
+<!-- <label class="layui-form-label">璁惧鎻忚堪锛�</label>-->
+<!-- <div class="layui-input-inline">-->
+<!-- <input id="decDesc" class="layui-input" type="text">-->
+<!-- </div>-->
+<!-- </div>-->
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">璁惧鎻忚堪锛�</label>
+ <label class="layui-form-label">绔欑偣鍑哄叆鐘舵��</label>
<div class="layui-input-inline">
- <input id="decDesc" class="layui-input" type="text">
+ <input id="devMk" class="layui-input" type="text">
</div>
</div>
--
Gitblit v1.9.1