From c253255495465d4406fcaddeb7be40d15fce290a Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期四, 21 三月 2024 13:00:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/phyzasrs' into phyzasrs
---
src/main/java/com/zy/asrs/entity/AgvLocMast.java | 6 ++++--
src/main/webapp/static/js/agvLocMast/locMast.js | 2 +-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/AgvLocMast.java b/src/main/java/com/zy/asrs/entity/AgvLocMast.java
index f8f9807..11bc094 100644
--- a/src/main/java/com/zy/asrs/entity/AgvLocMast.java
+++ b/src/main/java/com/zy/asrs/entity/AgvLocMast.java
@@ -223,9 +223,11 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "寰呭寘瑁�";
case 2:
- return "楂樺簱浣�";
+ return "鍘熸潗鏂�";
+ case 3:
+ return "绠卞３";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/webapp/static/js/agvLocMast/locMast.js b/src/main/webapp/static/js/agvLocMast/locMast.js
index 0de37a1..f6721a5 100644
--- a/src/main/webapp/static/js/agvLocMast/locMast.js
+++ b/src/main/webapp/static/js/agvLocMast/locMast.js
@@ -55,7 +55,7 @@
// ,{field: 'barcode', align: 'center',title: ''}
// ,{field: 'PdcType', align: 'center',title: ''}
// ,{field: 'ctnNo', align: 'center',title: ''}
- //,{field: 'locType1$', align: 'center',title: '楂樹綆绫诲瀷'}
+ ,{field: 'locType1$', align: 'center',title: '搴撲綅绫诲瀷'}
// ,{field: 'locType2$', align: 'center',title: '瀹界獎绫诲瀷'}
// ,{field: 'locType3$', align: 'center',title: '杞婚噸绫诲瀷'}
--
Gitblit v1.9.1