From fe41dba0515f75370aadb06abb38a0c2269610fb Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 03 八月 2020 10:46:40 +0800
Subject: [PATCH] #嘉善WMS系统
---
src/main/java/com/zy/asrs/utils/VersionUtils.java | 4 ++++
src/main/webapp/static/js/pakStore/stockAdjust.js | 1 +
src/main/webapp/static/js/common.js | 2 +-
3 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 5f8abc6..7ca13d3 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -18,6 +18,7 @@
wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
@@ -25,6 +26,7 @@
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
+ wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -34,6 +36,7 @@
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+ locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
@@ -42,6 +45,7 @@
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
+ locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 642afe0..9c055cc 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -188,6 +188,6 @@
,{field: 'anfme', align: 'center',title: '閲嶉噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'bname', align: 'center',title: '鐢ㄦ埛'}
+ ,{field: 'bname', align: 'center',title: '瀹㈡埛'}
]
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 2eefc15..cb4e143 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -242,6 +242,7 @@
maktx: data[i].matName,
lgnum: data[i].str2,
color: data[i].str3,
+ bname: data[i].str4,
altme: data[i].str1,
})
}
--
Gitblit v1.9.1