From f0c7bcab060507ed23c2d82d3ebe5a9af0378ea3 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期三, 17 三月 2021 09:19:21 +0800
Subject: [PATCH] 1.0.3 全局-生成单号改为生产单号
---
src/main/java/com/zy/asrs/entity/param/CombParam.java | 2 +-
src/main/webapp/views/pda/combPro.html | 4 ++--
src/main/java/com/zy/asrs/controller/LocDetlController.java | 2 +-
src/main/webapp/views/pakStore/locDetlQuery.html | 2 +-
src/main/webapp/static/js/common.js | 2 +-
5 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index de77a91..7a45480 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -72,7 +72,7 @@
if (Cools.isEmpty(param.get("supplier"))) {
param.remove("supplier");
}
- /* 鐢熸垚鍗曞彿涓虹┖锛屽垹闄ょ敓鎴愬崟鍙穡arehouse */
+ /* 鐢熶骇鍗曞彿涓虹┖锛屽垹闄ょ敓浜у崟鍙穡arehouse */
if (Cools.isEmpty(param.get("warehouse"))) {
param.remove("warehouse");
}
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 6e1815a..86d30fa 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -15,7 +15,7 @@
// 鎴愬搧鐮�
private String productCode;
- // 鐢熸垚鍗曞彿
+ // 鐢熶骇鍗曞彿
private String warehouse;
private String billNo;
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 498c33e..b5a901e 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -209,7 +209,7 @@
,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
,{field: 'mnemonic', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
,{field: 'supplier', align: 'center',title: '閫氱煡鍗曞彿', hide: true}
- ,{field: 'warehouse', align: 'center',title: '鐢熸垚鍗曞彿'}
+ ,{field: 'warehouse', align: 'center',title: '鐢熶骇鍗曞彿'}
// ,{field: 'brand', align: 'center',title: '鍝佺墝'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 8f90d4f..db7949d 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -83,7 +83,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="warehouse" placeholder="鐢熸垚鍗曞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="warehouse" placeholder="鐢熶骇鍗曞彿" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/pda/combPro.html b/src/main/webapp/views/pda/combPro.html
index e395ba4..83b94c9 100644
--- a/src/main/webapp/views/pda/combPro.html
+++ b/src/main/webapp/views/pda/combPro.html
@@ -90,7 +90,7 @@
<input id="matName" type="text" disabled="disabled" style="width: 70%">
</div>
<div class="form-item">
- <span>鐢熸垚鍗曞彿</span>
+ <span>鐢熶骇鍗曞彿</span>
<input id="warehouse" type="text" disabled="disabled" style="width: 60%;height: 24.8px; color: blue">
</div>
<div class="form-item" style="margin-top: 5px">
@@ -122,7 +122,7 @@
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', event: 'modify', style:'cursor: pointer;color: blue', width:50},
{field: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'warehouse', align: 'center', title: '鐢熸垚鍗曞彿'}
+ {field: 'warehouse', align: 'center', title: '鐢熶骇鍗曞彿'}
// {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
]],
done: function (res, curr, count) {
--
Gitblit v1.9.1