From 9a3dd3c806104ce59abcba635e67355573bd68ac Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 26 二月 2026 15:54:47 +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 | 7 ++++++-
src/main/java/com/zy/asrs/controller/BasMapController.java | 13 +++++++++++++
src/main/resources/mapper/BasDevpMapper.xml | 1 +
5 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/BasMapController.java b/src/main/java/com/zy/asrs/controller/BasMapController.java
index bc0200c..9dfa3f9 100644
--- a/src/main/java/com/zy/asrs/controller/BasMapController.java
+++ b/src/main/java/com/zy/asrs/controller/BasMapController.java
@@ -178,6 +178,7 @@
HashMap<Integer, List<StationObjModel>> outStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> runBlockReassignStationMap = new HashMap<>();
HashMap<Integer, List<StationObjModel>> isOutOrderStationMap = new HashMap<>();
+ HashMap<Integer, List<StationObjModel>> isLiftTransferStationMap = new HashMap<>();
for (Map.Entry<Integer, List<List<HashMap<String, Object>>>> entry : dataMap.entrySet()) {
Integer lev = entry.getKey();
@@ -275,6 +276,13 @@
isOutOrderStationList.add(stationObjModel);
isOutOrderStationMap.put(deviceNo, isOutOrderStationList);
}
+
+ Integer isLiftTransfer = value.getInteger("isLiftTransfer");
+ if (isLiftTransfer != null && isLiftTransfer == 1) {
+ List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.getOrDefault(deviceNo, new ArrayList<>());
+ isLiftTransferStationList.add(stationObjModel);
+ isLiftTransferStationMap.put(deviceNo, isLiftTransferStationList);
+ }
} else if (nodeType.equals("rgv")) {
//RGV
nodeData.put("type", "rgv");
@@ -325,6 +333,7 @@
List<StationObjModel> outStationList = outStationMap.get(deviceNo);
List<StationObjModel> runBlockReassignStationList = runBlockReassignStationMap.get(deviceNo);
List<StationObjModel> isOutOrderStationList = isOutOrderStationMap.get(deviceNo);
+ List<StationObjModel> isLiftTransferStationList = isLiftTransferStationMap.get(deviceNo);
if (barcodeStationList != null) {
basDevp.setBarcodeStationList(JSON.toJSONString(barcodeStationList, SerializerFeature.DisableCircularReferenceDetect));
@@ -346,6 +355,10 @@
basDevp.setIsOutOrderList(JSON.toJSONString(isOutOrderStationList, SerializerFeature.DisableCircularReferenceDetect));
}
+ if (isLiftTransferStationList != null) {
+ basDevp.setIsLiftTransferList(JSON.toJSONString(isLiftTransferStationList, 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 4037114..c807969 100644
--- a/src/main/java/com/zy/asrs/entity/BasDevp.java
+++ b/src/main/java/com/zy/asrs/entity/BasDevp.java
@@ -120,6 +120,13 @@
@TableField("is_out_order_list")
private String isOutOrderList;
+ /**
+ * 椤跺崌绉绘牻鐐�
+ */
+ @ApiModelProperty(value= "椤跺崌绉绘牻鐐�")
+ @TableField("is_lift_transfer_list")
+ private String isLiftTransferList;
+
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 523a24e..93647da 100644
--- a/src/main/resources/mapper/BasDevpMapper.xml
+++ b/src/main/resources/mapper/BasDevpMapper.xml
@@ -18,6 +18,7 @@
<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" />
+ <result column="is_lift_transfer_list" property="isLiftTransferList" />
</resultMap>
diff --git a/src/main/webapp/static/js/basDevp/basDevp.js b/src/main/webapp/static/js/basDevp/basDevp.js
index f040ad5..a373c0a 100644
--- a/src/main/webapp/static/js/basDevp/basDevp.js
+++ b/src/main/webapp/static/js/basDevp/basDevp.js
@@ -39,6 +39,7 @@
{ field: "outStationList", align: "center", title: "鍑哄簱绔欑偣鏁版嵁" },
{ field: "runBlockReassignLocStationList", align: "center", title: "杩愯鍫靛閲嶆柊鍒嗛厤搴撲綅绔欑偣鏁版嵁" },
{ field: "isOutOrderList", align: "center", title: "鍑哄簱鎺掑簭浜や簰鐐�" },
+ { field: "isLiftTransferList", align: "center", title: "椤跺崌绉绘牻鐐�" },
{
fixed: "right",
diff --git a/src/main/webapp/views/basDevp/basDevp.html b/src/main/webapp/views/basDevp/basDevp.html
index 8b79e0e..215b640 100644
--- a/src/main/webapp/views/basDevp/basDevp.html
+++ b/src/main/webapp/views/basDevp/basDevp.html
@@ -155,6 +155,12 @@
<input class="layui-input" name="isOutOrderList" placeholder="璇疯緭鍏ュ嚭搴撴帓搴忎氦浜掔偣">
</div>
</div>
+ <div class="layui-form-item">
+ <label class="layui-form-label">椤跺崌绉绘牻鐐�: </label>
+ <div class="layui-input-block">
+ <input class="layui-input" name="isLiftTransferList" placeholder="璇疯緭鍏ョ數姊腑杞偣">
+ </div>
+ </div>
</div>
</div>
@@ -194,4 +200,3 @@
</form>
</script>
</html>
-
--
Gitblit v1.9.1