From 560cfccea702316d4edec94c3699047fab96880c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 03 九月 2024 14:36:56 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/webapp/static/js/prior/prior.js | 2 +-
zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html | 2 +-
zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java | 2 +-
zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js | 2 +-
zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js | 2 +-
zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js | 2 +-
zy-asrs-wms/src/main/webapp/views/prior/prior.html | 4 ++--
zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html | 2 +-
zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java | 2 +-
zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js | 2 +-
zy-asrs-wms/src/main/webapp/views/order/out.html | 4 ++--
zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html | 4 ++--
zy-asrs-wms/src/main/webapp/views/pakStore/turnOverQuery.html | 2 +-
zy-asrs-wms/src/main/webapp/static/js/order/out.js | 2 +-
zy-asrs-wms/src/main/webapp/views/mat/mat.html | 4 ++--
zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html | 2 +-
zy-asrs-wms/src/main/webapp/static/js/order/order.js | 4 ++--
zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html | 4 ++--
zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java | 2 +-
21 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
index 65f076a..ed53c7b 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/MatExcel.java
@@ -21,7 +21,7 @@
@ExcelProperty(index = 1, value = "浜岀骇鍒嗙被")
private String secClass;
- @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(index = 2, value = "鍝佸彿")
private String matnr;
@ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
index 357137d..4f13f5a 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/SafeStoExport.java
@@ -14,7 +14,7 @@
@ExcelProperty(index = 0, value = "璐т綅")
private String node_name;
- @ExcelProperty(index = 1, value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(index = 1, value = "鍝佸彿")
private String matnr;
@ExcelProperty(index = 2, value = "鍟嗗搧鍚嶇О")
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java
index 605e7f0..8132e89 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/domain/entity/WaitPakinExcel.java
@@ -21,7 +21,7 @@
@ExcelProperty(index = 1, value = "鏁伴噺")
private Double anfme;
- @ExcelProperty(index = 2, value = "鍟嗗搧缂栧彿")
+ @ExcelProperty(index = 2, value = "鍝佸彿")
private String matnr;
@ExcelProperty(index = 3, value = "鍟嗗搧鍚嶇О")
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/order.js b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
index 37355ea..ce8e072 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/order.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/order.js
@@ -159,7 +159,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
+ {field: 'matnr', title: '鍝佸彿', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'batch', title: '搴忓垪鐮�'},
{field: 'anfme', title: '鏁伴噺'},
@@ -311,7 +311,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍝佸悕', width: 160},
+ {field: 'matnr', title: '鍝佸彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
diff --git a/zy-asrs-wms/src/main/webapp/static/js/order/out.js b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
index 6f0bf25..bb1e67d 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/order/out.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/order/out.js
@@ -32,7 +32,7 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'origin', align: 'center',title: '浠撳簱鍙�'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js b/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
index ee2474f..7b92742 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -29,7 +29,7 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'qty', align: 'center',title: ''}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'batch', align: 'center',title: '鎵瑰彿'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js b/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
index 65fc1e2..49a0520 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/orderDetlLog/orderDetlLog.js
@@ -27,7 +27,7 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js b/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
index aae357c..9ec9a5e 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/prior/prior.js
@@ -28,7 +28,7 @@
,{field: 'uuid', align: 'center',title: '缂栧彿'}
,{field: 'name', align: 'center',title: '鎺ㄨ崘鍚�'}
,{field: 'matId$', align: 'center',title: '鍏宠仈鍟嗗搧'}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'nodeId', align: 'center',title: '鍏宠仈璐т綅'}
,{field: 'nodeName', align: 'center',title: '璐т綅鍚嶇О'}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js b/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
index e49ec93..94174f6 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workCountIn.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js b/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
index bb72e2f..c12ff05 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/report/workCountOut.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
index 1974d2d..6be70a5 100644
--- a/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
+++ b/zy-asrs-wms/src/main/webapp/static/js/safeSto/safeSto.js
@@ -24,7 +24,7 @@
cols: [[
{type: 'numbers', fixed: 'left'}
,{field: 'locNo$', align: 'center',title: '搴撲綅'}
- ,{field: 'matnr', align: 'center',title: '鍝佸悕'}
+ ,{field: 'matnr', align: 'center',title: '鍝佸彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'progress', align: 'center',title: '浣跨敤鎯呭喌', templet: '#progressTpl', width: 350}
,{field: 'status', align: 'center',title: '璀︽姤', templet: '#statusTpl', width: 100}
diff --git a/zy-asrs-wms/src/main/webapp/views/mat/mat.html b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
index e3e9459..d45dcd8 100644
--- a/zy-asrs-wms/src/main/webapp/views/mat/mat.html
+++ b/zy-asrs-wms/src/main/webapp/views/mat/mat.html
@@ -94,9 +94,9 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸悕:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍝佸彿:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸悕"/>
+ <input name="matnr" class="layui-input" placeholder="杈撳叆鍝佸彿"/>
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/order/out.html b/zy-asrs-wms/src/main/webapp/views/order/out.html
index 4fe5aa8..e2d89e4 100644
--- a/zy-asrs-wms/src/main/webapp/views/order/out.html
+++ b/zy-asrs-wms/src/main/webapp/views/order/out.html
@@ -95,9 +95,9 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍝佸悕:</label>
+ <label class="layui-form-label">鍝佸彿:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="鍝佸悕"/>
+ <input name="matnr" class="layui-input" placeholder="鍝佸彿"/>
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
index cb70e29..638b995 100644
--- a/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/zy-asrs-wms/src/main/webapp/views/orderDetl/orderDetl.html
@@ -98,9 +98,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍝佸悕: </label>
+ <label class="layui-form-label">鍝佸彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍚�">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html b/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
index b9e878c..e65eb20 100644
--- a/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
+++ b/zy-asrs-wms/src/main/webapp/views/orderDetlLog/orderDetlLog.html
@@ -92,9 +92,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍝佸悕: </label>
+ <label class="layui-form-label">鍝佸彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍚�">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/pakStore/turnOverQuery.html b/zy-asrs-wms/src/main/webapp/views/pakStore/turnOverQuery.html
index 83df52e..f9605cf 100644
--- a/zy-asrs-wms/src/main/webapp/views/pakStore/turnOverQuery.html
+++ b/zy-asrs-wms/src/main/webapp/views/pakStore/turnOverQuery.html
@@ -53,7 +53,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/prior/prior.html b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
index 5c1c4eb..0c2f378 100644
--- a/zy-asrs-wms/src/main/webapp/views/prior/prior.html
+++ b/zy-asrs-wms/src/main/webapp/views/prior/prior.html
@@ -92,9 +92,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍝佸悕: </label>
+ <label class="layui-form-label">鍝佸彿: </label>
<div class="layui-input-block">
- <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍚�">
+ <input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ搧鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html
index 0b183b8..81b0ae3 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountIn.html
@@ -20,7 +20,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html b/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html
index d42c553..9eb2087 100644
--- a/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/zy-asrs-wms/src/main/webapp/views/report/viewWorkCountOut.html
@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
index 0779541..1b43cf8 100644
--- a/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
+++ b/zy-asrs-wms/src/main/webapp/views/safeSto/safeSto.html
@@ -25,7 +25,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍝佸悕" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鍝佸彿" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
index d4703a4..d85709b 100644
--- a/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
+++ b/zy-asrs-wms/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
@@ -28,7 +28,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗┿��銆�鏂欙細</label>
+ <label class="layui-form-label"><span class="not-null">*</span>鍝併��銆�鍙凤細</label>
<div class="layui-input-inline">
<input id="matnr" class="layui-input" type="text" lay-verify="required" >
</div>
--
Gitblit v1.9.1