From 23a0da92c1d2e3d046fd6bac53915d5adcf897ac Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 31 七月 2020 14:32:18 +0800
Subject: [PATCH] #商品变物料
---
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 2 +-
src/main/webapp/views/locDetl/locDetl.html | 2 +-
src/main/java/com/zy/asrs/utils/VersionUtils.java | 8 ++++----
src/main/webapp/static/layuiadmin/json/menu1.js | 2 +-
src/main/java/com/zy/asrs/entity/MatCode.java | 6 +++---
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 2 +-
src/main/webapp/views/report/viewWorkIn.html | 2 +-
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 6 +++---
src/main/webapp/views/report/viewWorkOut.html | 2 +-
src/main/java/com/zy/asrs/entity/LocDetl.java | 2 +-
src/main/java/com/zy/asrs/entity/WrkDetl.java | 2 +-
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 2 +-
src/main/webapp/static/js/common.js | 12 ++++++------
src/main/webapp/static/layuiadmin/style/template.css | 2 +-
14 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index b79839c..26d40f8 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String lgnum;
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
private String type;
@ApiModelProperty(value= "鍔╄鐮�")
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 6f45a09..7cd7f14 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -22,7 +22,7 @@
/**
* 鐗╂枡缂栫爜
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鐗╂枡缂栫爜")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -36,7 +36,7 @@
/**
* 鐗╂枡鍚嶇О
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍚嶇О")
@TableField("mat_name")
private String matName;
@@ -46,7 +46,7 @@
@ApiModelProperty(value= "鍩烘湰鍗曚綅")
private String str1;
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
private String str2;
@ApiModelProperty(value= "瑙勬牸鍨嬪彿")
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 0f6ce87..11142f4 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -22,7 +22,7 @@
private String bname; //鐢ㄦ埛ID
private String lgnum; //瑙勬牸
- private String type; // 鍟嗗搧绫诲埆
+ private String type; // 鐗╂枡绫诲埆
private String mnemonic; // 鍔╄鐮�
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index b744cac..2115d8f 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -23,7 +23,7 @@
private String bname; //鐢ㄦ埛ID
private String lgnum; //瑙勬牸
- private String type; // 鍟嗗搧绫诲埆
+ private String type; // 鐗╂枡绫诲埆
private String mnemonic; // 鍔╄鐮�
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 57dd856..9c917aa 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -55,7 +55,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
private String type;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 63f117a..e6b01cc 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -55,7 +55,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧绫诲埆")
+ @ApiModelProperty(value= "鐗╂枡绫诲埆")
private String type;
/**
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 0c84a50..bd67d8e 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -16,7 +16,7 @@
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- wrkDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
+ wrkDetl.setType(matCode.getStr2()); // 鐗╂枡绫诲埆
wrkDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
wrkDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
wrkDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
@@ -28,7 +28,7 @@
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setType(locDetl.getType()); // 鍟嗗搧绫诲埆
+ wrkDetl.setType(locDetl.getType()); // 鐗╂枡绫诲埆
wrkDetl.setMnemonic(locDetl.getMnemonic()); // 鍔╄鐮�
wrkDetl.setSupplier(locDetl.getSupplier()); // 榛樿渚涘簲鍟�
wrkDetl.setWarehouse(locDetl.getWarehouse()); // 榛樿浠撳簱
@@ -41,7 +41,7 @@
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(matCode.getStr3()); // 瑙勬牸
- locDetl.setType(matCode.getStr2()); // 鍟嗗搧绫诲埆
+ locDetl.setType(matCode.getStr2()); // 鐗╂枡绫诲埆
locDetl.setMnemonic(matCode.getStr5()); // 鍔╄鐮�
locDetl.setSupplier(matCode.getStr6()); // 榛樿渚涘簲鍟�
locDetl.setWarehouse(matCode.getStr7()); // 榛樿浠撳簱
@@ -53,7 +53,7 @@
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setType(wrkDetl.getType()); // 鍟嗗搧绫诲埆
+ locDetl.setType(wrkDetl.getType()); // 鐗╂枡绫诲埆
locDetl.setMnemonic(wrkDetl.getMnemonic()); // 鍔╄鐮�
locDetl.setSupplier(wrkDetl.getSupplier()); // 榛樿渚涘簲鍟�
locDetl.setWarehouse(wrkDetl.getWarehouse()); // 榛樿浠撳簱
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
index eb17c5d..c78eebd 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java
@@ -9,19 +9,19 @@
*/
public class MatCodeExcel {
- @ExcelProperty(value= "鍟嗗搧缂栫爜", index = 1)
+ @ExcelProperty(value= "鐗╂枡缂栫爜", index = 1)
private String matNo;
@ExcelProperty(value= "鏉″舰鐮�", index = 4)
private String barcode;
- @ExcelProperty(value= "鍟嗗搧鍚嶇О", index = 2)
+ @ExcelProperty(value= "鐗╂枡鍚嶇О", index = 2)
private String matName;
@ExcelProperty(value= "鍩烘湰鍗曚綅", index = 8)
private String str1;
- @ExcelProperty(value= "鍟嗗搧绫诲埆", index = 3)
+ @ExcelProperty(value= "鐗╂枡绫诲埆", index = 3)
private String str2;
@ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index da9fc8b..0b6e211 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -171,11 +171,11 @@
}
var matCols = [
- {field: 'matNo', align: 'center',title: '鍟嗗搧缂栫爜'}
+ {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
,{field: 'barcode', align: 'center',title: '鏉″舰鐮�'}
- ,{field: 'matName', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'str1', align: 'center',title: '鍩烘湰鍗曚綅'}
- ,{field: 'str2', align: 'center',title: '鍟嗗搧绫诲埆'}
+ ,{field: 'str2', align: 'center',title: '鐗╂枡绫诲埆'}
,{field: 'str3', align: 'center',title: '瑙勬牸鍨嬪彿'}
,{field: 'str4', align: 'center',title: '鐘舵��', hide: true}
,{field: 'str5', align: 'center',title: '鍔╄鐮�'}
@@ -205,10 +205,10 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ {field: 'matnr', align: 'center',title: '鐗╂枡缂栫爜'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍚嶇О'}
,{field: 'lgnum', align: 'center',title: '瑙勬牸'}
- ,{field: 'type', align: 'center',title: '鍟嗗搧绫诲埆'}
+ ,{field: 'type', align: 'center',title: '鐗╂枡绫诲埆'}
// ,{field: 'mnemonic', align: 'center',title: '鍔╄鐮�'}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
// ,{field: 'warehouse', align: 'center',title: '浠撳簱'}
diff --git a/src/main/webapp/static/layuiadmin/json/menu1.js b/src/main/webapp/static/layuiadmin/json/menu1.js
index 0cfd0c0..d378ec9 100644
--- a/src/main/webapp/static/layuiadmin/json/menu1.js
+++ b/src/main/webapp/static/layuiadmin/json/menu1.js
@@ -180,7 +180,7 @@
,"spread": true
,"list": [{
"name": "list"
- ,"title": "鍟嗗搧鍒楄〃"
+ ,"title": "鐗╂枡鍒楄〃"
},{
"name": "category"
,"title": "鍒嗙被绠＄悊"
diff --git a/src/main/webapp/static/layuiadmin/style/template.css b/src/main/webapp/static/layuiadmin/style/template.css
index 8985602..e031875 100644
--- a/src/main/webapp/static/layuiadmin/style/template.css
+++ b/src/main/webapp/static/layuiadmin/style/template.css
@@ -129,7 +129,7 @@
.cmdlist-text .flow{text-align: right;float: right;}
#demo0{text-align: center;}
-/* 鍟嗗搧鍒楄〃 */
+/* 鐗╂枡鍒楄〃 */
.layadmin-message-fluid .layui-col-md12{background: #fff;height: auto;padding-bottom: 50px;}
.layadmin-message-fluid .layui-input-block{margin-left: 0;}
.layadmin-message-fluid .layui-form{padding:45px 40px 0 40px;}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 0f7ce4c..f866f55 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -21,7 +21,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/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 43f8721..020c173 100644
--- a/src/main/webapp/views/report/viewWorkIn.html
+++ b/src/main/webapp/views/report/viewWorkIn.html
@@ -26,7 +26,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" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 6d91968..35f5db0 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -26,7 +26,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" style="width: 300px">
--
Gitblit v1.9.1