From c306561dd021f79cc46ddc847c25b120ff352eda Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 03 一月 2024 11:22:56 +0800
Subject: [PATCH] #库位编码映射
---
src/main/java/com/zy/asrs/controller/MapController.java | 1 +
src/main/webapp/views/home/map.html | 3 +++
src/main/webapp/static/wms/js/locMast/locMast.js | 1 +
src/main/java/com/zy/asrs/entity/LocMast.java | 8 ++++++++
4 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 7489168..46f72a1 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -93,6 +93,7 @@
jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
}
jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+ jsonObject.put("locNo$", locMast.getLocNo$());//璁剧疆搴撲綅鍙�
jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
jsonObject.put("barcode", Optional.ofNullable(locMast.getBarcode()).orElse("鏃�"));//鎵樼洏鍙�
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 03aca14..6260958 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.SpringUtils;
import com.zy.asrs.service.BasLocStsService;
+import com.zy.asrs.utils.Utils;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -185,6 +186,13 @@
@TableField(exist = false)
private String emptyContainer;
+ public String getLocNo$(){
+ if (Cools.isEmpty(this.locNo)){
+ return "";
+ }
+ return Utils.getWmsLocNo(this.locNo);
+ }
+
public String getEmptyContainer$(){
if (Cools.isEmpty(this.emptyContainer)){
return "";
diff --git a/src/main/webapp/static/wms/js/locMast/locMast.js b/src/main/webapp/static/wms/js/locMast/locMast.js
index ec8afa3..4d17c76 100644
--- a/src/main/webapp/static/wms/js/locMast/locMast.js
+++ b/src/main/webapp/static/wms/js/locMast/locMast.js
@@ -22,6 +22,7 @@
{type: 'checkbox', fixed: 'left'}
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
+ ,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
diff --git a/src/main/webapp/views/home/map.html b/src/main/webapp/views/home/map.html
index 4c4cced..fff16b3 100644
--- a/src/main/webapp/views/home/map.html
+++ b/src/main/webapp/views/home/map.html
@@ -538,6 +538,9 @@
搴撲綅鍙�: {{ map[mapI][mapJ].locNo }}
</div>
<div style="margin-top: 10px;">
+ 搴撲綅鍙�: {{ map[mapI][mapJ].locNo$}}
+ </div>
+ <div style="margin-top: 10px;">
搴撲綅鐘舵��: {{ getLocSts(map[mapI][mapJ].locSts) }}
</div>
<div style="margin-top: 10px;">
--
Gitblit v1.9.1