From 08782f91c979be03a8b911fcc0d4d73ec3329488 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 25 二月 2026 14:20:41 +0800
Subject: [PATCH] #
---
src/main/webapp/static/js/basDevp/basDevp.js | 1 +
src/main/java/com/zy/asrs/entity/BasDevp.java | 7 +++++++
src/main/webapp/views/basDevp/basDevp.html | 6 ++++++
src/main/java/com/zy/asrs/controller/BasMapController.java | 13 +++++++++++++
src/main/resources/mapper/BasDevpMapper.xml | 1 +
5 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index 3fca44d..bc0200c 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -177,6 +177,7 @@
HashMap<Integer, List<StationObjModel>> inStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
Integer lev = entry.getKey();
@@ -267,6 +268,13 @@
runBlockReassignStationList.add(stationObjModel);
runBlockReassignStationMap.put(deviceNo, runBlockReassignStationList);
}
+
+ Integer isOutOrder = value.getInteger("isOutOrder");
+ if (isOutOrder != null && isOutOrder == 1) {
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ isOutOrderStationList.add(stationObjModel);
+ isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
+ }
} else if (nodeType.equals("rgv")) {
//RGV
nodeData.put("type", "rgv");
@@ -316,6 +324,7 @@
List<StationObjModel> inStationList = inStationMap.get(deviceNo);
List<StationObjModel> outStationList = outStationMap.get(deviceNo);
List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
+ List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);
if (barcodeStationList != null) {
basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -333,6 +342,10 @@
basDevp.setRunBlockReassignLocStationList(JSON.toJSONString(runBlockReassignStationList, SerializerFeature.DisableCircularReferenceDetect));
}
+ if (isOutOrderStationList != null) {
+ basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
+ }
+
basDevp.setStationList(JSON.toJSONString(stationList, SerializerFeature.DisableCircularReferenceDetect));
basDevp.setUpdateTime(new Date());
basDevpService.insertOrUpdate(basDevp);
diff --git a/src/main/java/com/zy/asrs/entity/BasDevp.java b/src/main/java/com/zy/asrs/entity/BasDevp.java
index cafa3fd..4037114 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -113,6 +113,13 @@
@TableField("run_block_reassign_loc_station_list")
private String runBlockReassignLocStationList;
+ /**
+ * 鍑哄簱鎺掑簭浜や簰鐐�
+ */
+ @ApiModelProperty(value= "鍑哄簱鎺掑簭浜や簰鐐�")
+ @TableField("is_out_order_list")
+ private String isOutOrderList;
+
public BasDevp() {}
public BasDevp(Integer devpNo,Integer status,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo,String stationList,String barcodeStationList,String inStationList,String outStationList) {
diff --git a/src/main/resources/mapper/BasDevpMapper.xml b/src/main/resources/mapper/BasDevpMapper.xml
index d6c01b5..523a24e 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -17,6 +17,7 @@
<result column="in_station_list" property="inStationList" />
<result column="out_station_list" property="outStationList" />
<result column="run_block_reassign_loc_station_list" property="runBlockReassignLocStationList" />
+ <result column="is_out_order_list" property="isOutOrderList" />
</resultMap>
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index f323842..f040ad5 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -38,6 +38,7 @@
{ field: "inStationList", align: "center", title: "鍏ュ簱绔欑偣鏁版嵁" },
{ field: "outStationList", align: "center", title: "鍑哄簱绔欑偣鏁版嵁" },
{ field: "runBlockReassignLocStationList", align: "center", title: "杩愯鍫靛閲嶆柊鍒嗛厤搴撲綅绔欑偣鏁版嵁" },
+ { field: "isOutOrderList", align: "center", title: "鍑哄簱鎺掑簭浜や簰鐐�" },
{
fixed: "right",
diff --git a/src/main/webapp/views/basDevp/basDevp.html b/src/main/webapp/views/basDevp/basDevp.html
index 98bb472..8b79e0e 100644
--- a/src/main/webapp/views/basDevp/basDevp.html
+++ b/src/main/webapp/views/basDevp/basDevp.html
@@ -149,6 +149,12 @@
<input class="layui-input" name="runBlockReassignLocStationList" placeholder="璇疯緭鍏ヨ繍琛屽牭濉為噸鏂板垎閰嶅簱浣嶇珯鐐规暟鎹�">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍑哄簱鎺掑簭浜や簰鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="isOutOrderList" placeholder="璇疯緭鍏ュ嚭搴撴帓搴忎氦浜掔偣">
+ </div>
+ </div>
</div>
</div>
--
Gitblit v1.9.1