From f405d7cd127c94f4776ff774b1bef3deff2723a2 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 20 八月 2024 14:43:11 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java | 12 +++++++-----
zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js | 2 +-
zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js | 1 +
4 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
index 9eabd34..1f624ac 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/LocMast.java
@@ -226,12 +226,14 @@
// );
public String getWhsType$(){
- BasWhsService service = SpringUtils.getBean(BasWhsService.class);
- BasWhs basWhs = service.getById(this.whsType);
- if (!Cools.isEmpty(basWhs)){
- return String.valueOf(basWhs.getWhsDesc());
+ if (Cools.isEmpty(this.whsType)) return "鏈煡";
+ switch (this.whsType.intValue()){
+ case 0:
+ return "绔嬩綋浠撳簱";
+ case 1:
+ return "骞抽潰浠撳簱";
}
- return null;
+ return "鏈煡";
}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
index e43530f..dcd0d0e 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
@@ -22,6 +22,7 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷',width:200}
// ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'pltType', align: 'center',title: ''}
// ,{field: 'ctnType', align: 'center',title: ''}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
index 0793482..cc7f7ec 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -50,7 +50,7 @@
{type: 'checkbox', fixed: 'left'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�',sort:true}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��',width:200}
- // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
,{field: 'bay1', align: 'center',title: '鍒�'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
index 4cc1bc2..4ee32b0 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -28,7 +28,7 @@
{type: 'checkbox'}
,{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'locSts$', align: 'center',title: '搴撲綅鐘舵��', width: 180, style: 'color: #8E2323'}
- // ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
+ ,{field: 'whsType$', align: 'center',title: '搴撲綅绫诲瀷'}
,{field: 'barcode', align: 'center',title: '鎵樼洏鐮�'}
,{field: 'crnNo', align: 'center',title: '鍫嗗灈鏈哄彿'}
,{field: 'row1', align: 'center',title: '鎺�'}
--
Gitblit v1.9.1