From 1918c5fe8c390ca90acff60b71e27257d65fb463 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期一, 24 一月 2022 10:21:54 +0800
Subject: [PATCH] Merge branch 'sxjzasrs' of http://47.97.1.152:5880/r/zy-asrs into sxjzasrs0
---
version/wcs/SXJZWCS_20220115.rar | 0
version/db/sxjzasrs20211227.bak | 0
src/main/webapp/static/js/locMast/locMast.js | 2 +-
src/main/java/com/zy/asrs/entity/LocMast.java | 4 ++--
4 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocMast.java b/src/main/java/com/zy/asrs/entity/LocMast.java
index 23d8301..4a9a651 100644
--- a/src/main/java/com/zy/asrs/entity/LocMast.java
+++ b/src/main/java/com/zy/asrs/entity/LocMast.java
@@ -215,9 +215,9 @@
case 0:
return "鏈煡";
case 1:
- return "浣庡簱浣�";
+ return "杞诲簱浣�";
case 2:
- return "楂樺簱浣�";
+ return "閲嶅簱浣�";
default:
return String.valueOf(this.locType1);
}
diff --git a/src/main/webapp/static/js/locMast/locMast.js b/src/main/webapp/static/js/locMast/locMast.js
index ea9e9d3..fc0fcc0 100644
--- a/src/main/webapp/static/js/locMast/locMast.js
+++ b/src/main/webapp/static/js/locMast/locMast.js
@@ -54,7 +54,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: '杞婚噸绫诲瀷'}
diff --git a/version/db/sxjzasrs20211227.bak b/version/db/sxjzasrs20211227.bak
new file mode 100644
index 0000000..97ec4c9
--- /dev/null
+++ b/version/db/sxjzasrs20211227.bak
Binary files differ
diff --git a/version/wcs/SXJZWCS_20220115.rar b/version/wcs/SXJZWCS_20220115.rar
new file mode 100644
index 0000000..f41a3f8
--- /dev/null
+++ b/version/wcs/SXJZWCS_20220115.rar
Binary files differ
--
Gitblit v1.9.1