From 5cf5e532ffe25e098e9bbcc345b27427e85fc8ae Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期三, 07 十二月 2022 15:57:36 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/webapp/views/pda/stockIn.html | 4
src/main/java/com/zy/asrs/entity/DocLog.java | 8
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/java/com/zy/asrs/entity/Mat.java | 56 +++---
src/main/java/com/zy/asrs/entity/WrkDetl.java | 20 +-
src/main/webapp/static/js/common.js | 40 ++--
src/main/webapp/static/js/report/workCountIn.js | 4
src/main/webapp/views/pack/pack.html | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 24 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 12
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/webapp/views/pakStore/matQuery.html | 4
src/main/webapp/views/pda/locDetlIframe.html | 6
src/main/webapp/views/report/viewWorkCountIn.html | 2
src/main/webapp/views/pda/matQuery.html | 6
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 12
src/main/java/com/zy/asrs/entity/LocDetl.java | 16 +-
src/main/webapp/static/js/order/order.js | 8
src/main/webapp/views/order/out.html | 8
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4
src/main/java/com/zy/asrs/entity/AdjDetl.java | 4
src/main/webapp/static/js/pack/pack.js | 2
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 2
src/main/java/com/zy/asrs/utils/VersionUtils.java | 14
src/main/webapp/views/mat/mat.html | 64 ++++++-
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/views/pda/comb.html | 4
src/main/webapp/static/js/orderDetl/orderDetl.js | 6
src/main/webapp/views/order/order.html | 2
src/main/webapp/static/js/order/out.js | 10
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 12
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 2
src/main/java/com/zy/asrs/entity/Pack.java | 6
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 20 +-
src/main/webapp/static/js/report/workCountOut.js | 4
src/main/java/com/zy/asrs/controller/OrderController.java | 4
src/main/webapp/static/js/locDetl/locDetl.js | 10
src/main/webapp/views/waitPakin/waitPakin_detail.html | 2
src/main/webapp/views/report/viewWorkCountOut.html | 2
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 4
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2
src/main/webapp/views/orderDetl/orderDetl.html | 6
src/main/webapp/views/waitPakin/waitPakin.html | 2
50 files changed, 245 insertions(+), 205 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4741832..4ccd232 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -441,9 +441,9 @@
Row row = sheet.getRow(i);
// 璁㈠崟缂栧彿
String uuid = dataFormatter.formatCellValue(row.getCell(0));
- // 鍟嗗搧鍚嶇О
+ // 鐗╂枡鍙�
String maktx = dataFormatter.formatCellValue(row.getCell(1));
- // 鍟嗗搧缂栫爜
+ // 鍗曟嵁鍙�
String matnr = dataFormatter.formatCellValue(row.getCell(2));
// 鏁伴噺
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index b9b0f9b..3dc0dc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -38,9 +38,9 @@
private String locNo;
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
diff --git a/src/main/java/com/zy/asrs/entity/DocLog.java b/src/main/java/com/zy/asrs/entity/DocLog.java
index 1f25e05..d5bd63b 100644
--- a/src/main/java/com/zy/asrs/entity/DocLog.java
+++ b/src/main/java/com/zy/asrs/entity/DocLog.java
@@ -46,9 +46,9 @@
private String docName;
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
@@ -58,7 +58,7 @@
private Double qua;
/**
- * 缁撴灉 1: 鎴愬姛 0: 澶辫触
+ * 缁撴灉 1: 鎴愬姛 0: 澶辫触
*/
@ApiModelProperty(value= "缁撴灉 1: 鎴愬姛 0: 澶辫触 ")
private Integer success;
@@ -94,7 +94,7 @@
// null, // 鍗曟嵁缂栧彿
// null, // 鍗曟嵁绫诲瀷
// null, // 鍗曟嵁鍚嶇О
-// null, // 鍟嗗搧缂栧彿
+// null, // 鍗曟嵁鍙�
// null, // 涓婃姤鏁伴噺
// null, // 缁撴灉
// null, // 涓婃姤鏃堕棿
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ef2b85b..be9a529 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -35,12 +35,12 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty("鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ExcelProperty("鍗曟嵁鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty("鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty("鐗╂枡鍙�")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -55,7 +55,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -73,19 +73,19 @@
@ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
@ApiModelProperty(value= "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index bb98001..1ce8414 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,25 +56,25 @@
private Long tagId;
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
- @ExcelProperty(value = "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ExcelProperty(value = "鍗曟嵁鍙�")
private String matnr;
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
- @ExcelProperty(value = "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡鍙�")
private String maktx;
/**
- * 鍒悕
+ * 绉诲姩绫诲瀷
*/
- @ApiModelProperty(value= "鍒悕")
- @ExcelProperty(value = "鍒悕")
+ @ApiModelProperty(value= "绉诲姩绫诲瀷")
+ @ExcelProperty(value = "绉诲姩绫诲瀷")
private String name;
/**
@@ -85,10 +85,10 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
- @ExcelProperty(value = "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
+ @ExcelProperty(value = "鎵规")
private String model;
/**
@@ -127,10 +127,10 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
- @ExcelProperty(value = "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
+ @ExcelProperty(value = "鍖呮暟")
private Double units;
/**
@@ -141,10 +141,10 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
- @ExcelProperty(value = "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
+ @ExcelProperty(value = "鐗╂枡鐘舵��")
private String origin;
/**
@@ -155,10 +155,10 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
- @ExcelProperty(value = "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
+ @ExcelProperty(value = "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
@@ -351,21 +351,21 @@
// Mat mat = new Mat(
// null, // 缂栧彿
// null, // 鎵�灞炲綊绫�
-// null, // 鍟嗗搧缂栧彿
-// null, // 鍟嗗搧鍚嶇О
-// null, // 鍒悕
+// null, // 鍗曟嵁鍙�
+// null, // 鐗╂枡鍙�
+// null, // 绉诲姩绫诲瀷
// null, // 瑙勬牸
-// null, // 鍨嬪彿
+// null, // 鎵规
// null, // 棰滆壊
// null, // 鍝佺墝
// null, // 鍗曚綅
// null, // 鍗曚环
// null, // sku
-// null, // 鍗曚綅閲�
+// null, // 鍖呮暟
// null, // 鏉＄爜
-// null, // 浜у湴
+// null, // 鐗╂枡鐘舵��
// null, // 鍘傚
-// null, // 鐢熶骇鏃ユ湡
+// null, // 鍗曟嵁鏃堕棿
// null, // 鍝侀」鏁�
// null, // 瀹夊叏搴撳瓨閲�
// null, // 閲嶉噺
diff --git a/src/main/java/com/zy/asrs/entity/MatCodePrint.java b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
index ebf804b..3e7848e 100644
--- a/src/main/java/com/zy/asrs/entity/MatCodePrint.java
+++ b/src/main/java/com/zy/asrs/entity/MatCodePrint.java
@@ -6,7 +6,7 @@
public class MatCodePrint {
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
private String matNo;
@@ -16,7 +16,7 @@
private String barcode;
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
private String matName;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 8a2728c..05abc92 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,15 +62,15 @@
private Double qty;
/**
- * 鍟嗗搧缂栫爜
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栫爜")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
- * 鍟嗗搧鍚嶇О
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
/**
@@ -86,9 +86,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
/**
@@ -122,9 +122,9 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
/**
@@ -134,9 +134,9 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
/**
@@ -146,9 +146,9 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index 686c8bd..b00ade2 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -43,9 +43,9 @@
private String barcode;
/**
- * 鍟嗗搧缂栧彿
+ * 鍗曟嵁鍙�
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
@@ -119,7 +119,7 @@
// Pack pack = new Pack(
// null, // 鏉＄爜[闈炵┖]
-// null, // 鍟嗗搧缂栧彿
+// null, // 鍗曟嵁鍙�
// null, // 搴忓垪鐮�
// null, // 璁㈠崟鐘舵��
// null, // 鐘舵��
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 93815de..6e6aafd 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -38,10 +38,10 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -54,7 +54,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -72,19 +72,19 @@
@ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
@ApiModelProperty(value= "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
private String manu_date;
@ApiModelProperty(value= "鍝侀」鏁�")
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 0089da5..8e5416a 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -48,10 +48,10 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -63,7 +63,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -81,19 +81,19 @@
@ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
@ApiModelProperty(value= "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
private String manu_date;
@ApiModelProperty(value= "鍝侀」鏁�")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 78185ae..93e57dc 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -27,10 +27,10 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -43,7 +43,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -61,19 +61,19 @@
@ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
@ApiModelProperty(value= "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 34cade8..b62b226 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -26,10 +26,10 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
@ApiModelProperty(value= "搴忓垪鐮�")
@@ -42,7 +42,7 @@
@ApiModelProperty(value= "瑙勬牸")
private String specs;
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -60,19 +60,19 @@
@ApiModelProperty(value= "sku")
private String sku;
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
@ApiModelProperty(value= "鍘傚")
private String manu;
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 39ea4d5..3a7806c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -49,13 +49,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
/**
@@ -78,9 +78,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
/**
@@ -114,9 +114,9 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
/**
@@ -126,9 +126,9 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
/**
@@ -138,9 +138,9 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index c3879d1..05fc954 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -48,13 +48,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍟嗗搧缂栧彿")
+ @ApiModelProperty(value= "鍗曟嵁鍙�")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String maktx;
/**
@@ -77,9 +77,9 @@
private String specs;
/**
- * 鍨嬪彿
+ * 鎵规
*/
- @ApiModelProperty(value= "鍨嬪彿")
+ @ApiModelProperty(value= "鎵规")
private String model;
/**
@@ -113,9 +113,9 @@
private String sku;
/**
- * 鍗曚綅閲�
+ * 鍖呮暟
*/
- @ApiModelProperty(value= "鍗曚綅閲�")
+ @ApiModelProperty(value= "鍖呮暟")
private Double units;
/**
@@ -125,9 +125,9 @@
private String barcode;
/**
- * 浜у湴
+ * 鐗╂枡鐘舵��
*/
- @ApiModelProperty(value= "浜у湴")
+ @ApiModelProperty(value= "鐗╂枡鐘舵��")
private String origin;
/**
@@ -137,9 +137,9 @@
private String manu;
/**
- * 鐢熶骇鏃ユ湡
+ * 鍗曟嵁鏃堕棿
*/
- @ApiModelProperty(value= "鐢熶骇鏃ユ湡")
+ @ApiModelProperty(value= "鍗曟嵁鏃堕棿")
@TableField("manu_date")
private String manuDate;
diff --git a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
index 381d7c2..5108e8b 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -21,7 +21,7 @@
@Data
public static class LocDetlAdjust {
- // 鍟嗗搧缂栧彿
+ // 鍗曟嵁鍙�
private String matnr;
// 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 331d3b0..5074631 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -22,7 +22,7 @@
// 搴撲綅鍙�
private String locNo;
- // 鍟嗗搧缂栧彿
+ // 鍗曟嵁鍙�
private String matnr;
// 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index e80ba27..42b8a96 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -30,7 +30,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鍟嗗搧缂栧彿
+ * @param matnr 鍗曟嵁鍙�
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d593df9..e6aef59 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -337,7 +337,7 @@
Date now = new Date();
pack = new Pack(
param.getBarcode(), // 鏉＄爜[闈炵┖]
- analyse.getMatnr(), // 鍟嗗搧缂栧彿
+ analyse.getMatnr(), // 鍗曟嵁鍙�
analyse.getBarcode(), // 搴忓垪鐮�
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -433,7 +433,7 @@
if (!matService.insert(mat)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
} else {
- log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍟嗗搧缂栧彿锛歿}]", mat.getMatnr());
+ log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍗曟嵁鍙凤細{}]", mat.getMatnr());
}
}
}
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index 0c7ff89..e2e7ebd 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -132,7 +132,7 @@
mat = excel;
mat.setTagId(tagId);
if (!matService.insert(mat)) {
- throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽晢鍝佺紪鐮侊細" + excel.getMatnr());
+ throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽崟鎹彿锛�" + excel.getMatnr());
}
total++;
}
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index 6b46fa9..7f0bd37 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -15,7 +15,7 @@
// wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// wrkDetl.setType(matCode.getStr5()); // 鎵规
// wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
// wrkDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -30,7 +30,7 @@
// wrkDetl.setBatch(locDetl.getBatch());
// wrkDetl.setOrderNo(locDetl.getOrderNo());
// wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
-// wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+// wrkDetl.setType(locDetl.getType()); // 鎵规
// wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
// wrkDetl.setSupplier(locDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
@@ -44,7 +44,7 @@
// locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
-// locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+// locDetl.setType(matCode.getStr5()); // 鎵规
// locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
// locDetl.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -59,7 +59,7 @@
// locDetl.setBatch(wrkDetl.getBatch());
// locDetl.setOrderNo(wrkDetl.getOrderNo());
// locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
-// locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+// locDetl.setType(wrkDetl.getType()); // 鎵规
// locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
// locDetl.setSupplier(wrkDetl.getSupplier()); // 搴忓垪鐮�
// locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
@@ -73,7 +73,7 @@
// waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
// waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
// waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
-// waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
+// waitPakIn.setType(matCode.getStr5()); // 鎵规
// waitPakIn.setColor(matCode.getBarcode()); // 鏉＄爜
// waitPakIn.setSupplier(matCode.getStr6()); // 搴忓垪鐮�
// waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
@@ -95,7 +95,7 @@
// waitPakIn.setBatch(orderDetl.getBatch());
// waitPakIn.setOrderNo(orderDetl.getOrderNo());
// waitPakIn.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// waitPakIn.setType(orderDetl.getModel()); // 鍨嬪彿
+// waitPakIn.setType(orderDetl.getModel()); // 鎵规
// waitPakIn.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// waitPakIn.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
@@ -106,7 +106,7 @@
// wrkDetl.setBatch(orderDetl.getBatch());
// wrkDetl.setOrderNo(orderDetl.getOrderNo());
// wrkDetl.setLgnum(orderDetl.getSpecs()); // 瑙勬牸
-// wrkDetl.setType(orderDetl.getModel()); // 鍨嬪彿
+// wrkDetl.setType(orderDetl.getModel()); // 鎵规
// wrkDetl.setSupplier(orderDetl.getSupplier()); // 搴忓垪鐮�
// wrkDetl.setAltme(orderDetl.getUnit()); // 鍗曚綅
// }
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index eea03f1..ba2856e 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -22,7 +22,7 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 97c54b2..101c3fb 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,27 +181,25 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
- // {field: 'id', align: 'center',title: 'ID'}
- // ,{field: 'uuid', align: 'center',title: '缂栧彿'}
- // ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', width: 200}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- // ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 180}
+ ,{field: 'name', align: 'center',title: '绉诲姩绫诲瀷'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 150}
+ ,{field: 'specs', align: 'center',title: '瑙勬牸'}
+ ,{field: 'model', align: 'center',title: '鎵规', hide: false}
+ ,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: false}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
+ ,{field: 'units', align: 'center',title: '鍖呮暟', hide: false}
+ ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
+
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
@@ -222,28 +220,30 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
+ {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 180}
+ ,{field: 'name', align: 'center',title: '绉诲姩绫诲瀷'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ ,{field: 'model', align: 'center',title: '鎵规', hide: true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
- ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true, hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
+ ,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: true}
+ ,{field: 'weight', align: 'center',title: '閲嶉噺', hide: true}
+ ,{field: 'units', align: 'center',title: '鍖呮暟', hide: true}
+ ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 9ec3489..c071769 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
+ {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', sort:true}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
@@ -16,11 +16,11 @@
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ ,{field: 'units', align: 'center',title: '鍖呮暟', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '浜у湴', hide: true}
+ ,{field: 'origin', align: 'center',title: '鐗╂枡鐘舵��', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 3ef4275..d0178b6 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -129,8 +129,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
+ {field: 'matnr', title: '鍗曟嵁鍙�', width: 160},
+ {field: 'maktx', title: '鐗╂枡鍙�', width: 160},
{field: 'batch', title: '搴忓垪鐮�'},
{field: 'anfme', title: '鏁伴噺'},
{field: 'qty', title: '浣滀笟鏁伴噺', style: 'font-weight: bold'},
@@ -236,8 +236,8 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
+ {field: 'matnr', title: '鍗曟嵁鍙�', width: 160},
+ {field: 'maktx', title: '鐗╂枡鍙�', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 0687db2..a96fd48 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,15 +32,15 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜', width: 160}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 160}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- // ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ // ,{field: 'model', align: 'center',title: '鎵规'}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -385,8 +385,8 @@
cellMinWidth: 100,
cols: [[
{type: 'checkbox'},
- {field: 'matnr', title: '鍟嗗搧缂栫爜', align: 'center', width: 350},
- {field: 'maktx', title: '鍟嗗搧鍚嶇О', align: 'center'},
+ {field: 'matnr', title: '鍗曟嵁鍙�', align: 'center', width: 350},
+ {field: 'maktx', title: '鐗╂枡鍙�', align: 'center'},
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '鎵瑰彿', align: 'center'},
{field: 'anfme', title: '鏁伴噺', align: 'center', width: 90, style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index c86b5e2..1117f77 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,11 +25,11 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栫爜'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
- ,{field: 'model', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'model', align: 'center',title: '鎵规'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 4780364..4ecb8c4 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -24,7 +24,7 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', minWidth: 250, width: 250}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index 0edc32b..f52174e 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index 6534f00..ed0ee3c 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -2,8 +2,8 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
- ,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index dad6b6c..bd570e8 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.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">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index a312e9c..f87358d 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -16,7 +16,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>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 5c45008..128f3c5 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,13 +86,13 @@
<!-- 琛ㄦ牸宸ュ叿鏍�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="杈撳叆鍟嗗搧缂栧彿"/>
</div>
</div>
<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="maktx" class="layui-input" placeholder="杈撳叆鍟嗗搧鍚嶇О"/>
</div>
@@ -167,8 +167,6 @@
<input name="uuid" type="hidden">
<input name="nodeId" type="hidden">
<input name="tag_id" type="hidden">
- <input name="model" type="hidden">
- <input name="name" type="hidden">
<input name="batch" type="hidden">
<input name="docId" type="hidden">
<input name="docNum" type="hidden">
@@ -192,26 +190,47 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧鍚嶇О</label>
+ <label class="layui-form-label">鐗╂枡鍙�</label>
<div class="layui-input-block">
- <input name="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input name="maktx" placeholder="璇疯緭鍏ョ墿鏂欏彿" class="layui-input">
</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 name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">
+ <input name="name" placeholder="璇疯緭鍏ョЩ鍔ㄧ被鍨�" class="layui-input">
</div>
</div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">閲嶉噺</label>
+ <div class="layui-input-block">
+ <input type="number" name="weight" placeholder="璇疯緭鍏ラ噸閲�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鐘舵��</label>
+ <div class="layui-input-block">
+ <input name="origin" placeholder="璇疯緭鍏ョ姸鎬�" class="layui-input">
+ </div>
+ </div>
+
+<!-- <div class="layui-form-item">-->
+<!-- <label class="layui-form-label">澶囨敞</label>-->
+<!-- <div class="layui-input-block">-->
+<!-- <input name="memo" placeholder="璇疯緭鍏ュ娉�" class="layui-input">-->
+<!-- </div>-->
+<!-- </div>-->
</div>
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍟嗗搧缂栧彿</label>
+ <label class="layui-form-label layui-form-required">鍗曟嵁鍙�</label>
<div class="layui-input-block">
- <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
+ <input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ崟鎹彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
</div>
@@ -219,6 +238,27 @@
<label class="layui-form-label">瑙勬牸</label>
<div class="layui-input-block">
<input name="specs" placeholder="璇疯緭鍏ヨ鏍�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鎵规</label>
+ <div class="layui-input-block">
+ <input name="model" placeholder="璇疯緭鍏ユ壒娆�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍗曟嵁鏃堕棿</label>
+ <div class="layui-input-block">
+ <input name="manuDate" placeholder="璇疯緭鍏ュ崟鎹椂闂�" class="layui-input">
+ </div>
+ </div>
+
+ <div class="layui-form-item">
+ <label class="layui-form-label">鍖呮暟</label>
+ <div class="layui-input-block">
+ <input type="number" name="units" placeholder="璇疯緭鍏ュ寘鏁�" class="layui-input">
</div>
</div>
@@ -250,7 +290,7 @@
<div id="template-preview-1" class="template-preview" style="display: inline-block">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍟嗗搧缂栫爜</td>
+ <td colspan="3" align="center" scope="col">鍗曟嵁鍙�</td>
<td class="barcode" colspan="9" align="center" scope="col">
<img class="template-code template-barcode" src="" width="90%;">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -329,7 +369,7 @@
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
<tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍟嗗搧缂栫爜</td>
+ <td align="center" colspan="3" scope="col">鍗曟嵁鍙�</td>
<td align="center" class="barcode" colspan="9" scope="col">
<img class="template-code" src="{{this.barcodeUrl}}" width="90%">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 4690b27..28221e7 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -261,7 +261,7 @@
<thead>
<tr style="background: none">
<td>No.</td>
- <td>鍟嗗搧缂栧彿</td>
+ <td>鍗曟嵁鍙�</td>
<td>鏁伴噺</td>
</tr>
</thead>
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index c3687e3..3bd1358 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -98,15 +98,15 @@
<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">
- <label class="layui-form-label">鍟嗗搧鍚嶇О:</label>
+ <label class="layui-form-label">鐗╂枡鍙�:</label>
<div class="layui-input-inline">
- <input name="maktx" class="layui-input" placeholder="鍟嗗搧鍚嶇О"/>
+ <input name="maktx" class="layui-input" placeholder="鐗╂枡鍙�"/>
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index 0bed06f..a10a654 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -82,13 +82,13 @@
</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="璇疯緭鍏ュ晢鍝佺紪鐮�">
</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="maktx" placeholder="璇疯緭鍏ュ晢鍝佸悕绉�">
</div>
@@ -106,7 +106,7 @@
</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="model" placeholder="璇疯緭鍏ュ瀷鍙�">
</div>
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index d6d5aac..d90c0e5 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -97,7 +97,7 @@
</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="璇疯緭鍏ュ晢鍝佺紪鍙�">
</div>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 55840de..2207764 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.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/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index a35e39f..aeabb05 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.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/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index 54c50b4..fa90969 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -30,12 +30,12 @@
<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">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="maktx" placeholder="鍟嗗搧鍚嶇О" autocomplete="off">
+ <input class="layui-input" type="text" name="maktx" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 4739ffb..3095974 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,8 +55,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'matnr', align: 'center', title: '鍗曟嵁鍙�'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
]],
done: function (res, curr, count) {
}
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 9a9e927..52bee46 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -79,11 +79,11 @@
<input id="locNo" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鍟嗗搧缂栧彿</span>
+ <span>鍗曟嵁鍙�</span>
<input id="matnr" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鍟嗗搧鍚嶇О</span>
+ <span>鐗╂枡鍙�</span>
<input id="maktx" type="text" disabled="disabled">
</div>
<div class="form-item">
@@ -133,4 +133,4 @@
countDom.val(countDom.val() - 1);
}
</script>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 1c2b07b..f080461 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,11 +77,11 @@
<div class="form-box">
<div class="form-item">
- <span>鍟嗗搧缂栧彿</span>
+ <span>鍗曟嵁鍙�</span>
<input id="matNo" type="text" placeholder="鎵爜 / 杈撳叆" onkeyup="find(this)" autocomplete="off">
</div>
<div class="form-item">
- <span>鍟嗗搧鍚嶇О</span>
+ <span>鐗╂枡鍙�</span>
<input id="matName" type="text" disabled="disabled">
</div>
<div class="form-item">
@@ -183,4 +183,4 @@
}
</script>
-</html>
\ No newline at end of file
+</html>
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 9384793..8d86b26 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -120,8 +120,8 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
- {field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
+ {field: 'matnr', align: 'center', title: '鍗曟嵁鍙�'},
+ {field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html
index 0b183b8..dc60af2 100644
--- a/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/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/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index d42c553..b872981 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/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/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index dca05aa..4e93e0f 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 bde3a5e..b4572a5 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">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 8b052f7..772715d 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.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>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakin/waitPakin_detail.html b/src/main/webapp/views/waitPakin/waitPakin_detail.html
index d419c9d..f12604c 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -36,7 +36,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>
+ <label class="layui-form-label">鍗曟嵁鍙凤細</label>
<div class="layui-input-inline">
<input id="matnr" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
index 7af64e3..0f32b40 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
@@ -42,7 +42,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label">鍟嗗搧缂栧彿锛�</label>
+ <label class="layui-form-label">鍗曟嵁鍙凤細</label>
<div class="layui-input-inline">
<input id="matnr" class="layui-input" type="text">
</div>
--
Gitblit v1.9.1