From 794941c21ec6a768a11e215c09ee2b0693a6fc64 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 一月 2021 16:00:21 +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/utils/VersionUtils.java | 41 +++++-
src/main/resources/UpdateThread.cs | 10
src/main/java/com/zy/asrs/entity/MatCode.java | 26 ++--
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/views/pda/comb.html | 4
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/views/pda/stockOut.html | 2
src/main/java/com/zy/asrs/entity/WrkDetl.java | 27 ++--
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2
src/main/webapp/static/js/common.js | 29 +++-
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 2
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 16 +-
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java | 4
src/main/webapp/static/js/pakStore/stockAdjust.js | 8 +
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 4
src/main/webapp/views/matCode/matCode_detail.html | 6
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/java/com/zy/common/web/FileController.java | 2
src/main/webapp/views/pakStore/matQuery.html | 2
src/main/webapp/views/pda/locDetlIframe.html | 4
src/main/webapp/views/pda/matQuery.html | 8
src/main/webapp/views/waitPakin/waitPakin_detail.html | 2
src/main/java/com/zy/asrs/controller/MatCodeController.java | 10
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 6
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 16 +-
src/main/java/com/zy/asrs/entity/WaitPakin.java | 16 +-
src/main/webapp/views/matCode/matCode.html | 18 +-
src/main/webapp/views/pdaCe/index.html | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 16 +-
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2
src/main/webapp/views/waitPakin/waitPakin.html | 2
36 files changed, 169 insertions(+), 136 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index e001475..6d4c5b2 100644
--- a/src/main/java/com/zy/asrs/controller/MatCodeController.java
+++ b/src/main/java/com/zy/asrs/controller/MatCodeController.java
@@ -123,7 +123,7 @@
// 瀵煎嚭
@RequestMapping(value = "/matCode/export/auth")
- @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鐗╂枡缂栫爜鏁版嵁瀵煎嚭")
+ @ManagerAuth(value = ManagerAuth.Auth.NONE, memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎嚭")
public void export(@RequestParam(required = false) String fileName,
@RequestParam(required = false) Integer rowCount,
HttpServletResponse response) throws Exception {
@@ -138,7 +138,7 @@
}
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鐗╂枡缂栫爜":fileName, "UTF-8");
+ fileName = URLEncoder.encode(Cools.isEmpty(fileName)?"鍟嗗搧缂栧彿":fileName, "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
EasyExcel.write(response.getOutputStream(), MatCodeExcel.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
@@ -148,7 +148,7 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鏁版嵁瀵煎叆")
@Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
@@ -158,7 +158,7 @@
// 鎵撳嵃
@RequestMapping(value = "/matCode/print/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鎵撳嵃")
+ @ManagerAuth(memo = "鍟嗗搧缂栧彿鎵撳嵃")
public R matCodePrint(@RequestParam(value = "param[]") String[] param) {
if(Cools.isEmpty(param)) {
return R.parse(CodeRes.EMPTY);
@@ -179,7 +179,7 @@
}
@RequestMapping(value = "/macCode/code/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
, @RequestParam String param
, HttpServletResponse response) throws Exception {
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ef2ea78..097ad3e 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -27,29 +27,29 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
@TableId(value = "matnr", type = IdType.INPUT)
private String matnr;
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
private String lgnum;
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
@ApiModelProperty(value= "鏁伴噺")
@@ -61,7 +61,7 @@
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@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 9222313..e6f8431 100644
--- a/src/main/java/com/zy/asrs/entity/MatCode.java
+++ b/src/main/java/com/zy/asrs/entity/MatCode.java
@@ -20,9 +20,9 @@
private static final long serialVersionUID = 1L;
/**
- * 鐗╂枡缂栫爜
+ * 鍟嗗搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栫爜")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
@TableId(value = "mat_no", type = IdType.INPUT)
@TableField("mat_no")
private String matNo;
@@ -34,34 +34,34 @@
private String barcode;
/**
- * 鐗╂枡鍚嶇О
+ * 鍟嗗搧鍚嶇О
*/
- @ApiModelProperty(value= "鐗╂枡鍚嶇О")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
@TableField("mat_name")
private String matName;
/**
* 鐗╂枡鍗曚綅
*/
- @ApiModelProperty(value= "鐗╂枡鍗曚綅")
+ @ApiModelProperty(value= "鍗曚綅")
private String str1;
- @ApiModelProperty(value= "鐗╂枡瑙勬牸")
+ @ApiModelProperty(value= "瑙勬牸")
private String str2;
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String str3;
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String str4;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍨嬪彿")
private String str5;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鎵瑰彿")
private String str6;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String str7;
@ApiModelProperty(value= "")
@@ -208,9 +208,9 @@
// MatCode matCode = new MatCode(
// 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 f2376d9..ebf804b 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;
@@ -26,7 +26,7 @@
private String str1;
/**
- * 鐗╂枡瑙勬牸
+ * 瑙勬牸
*/
private String str2;
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 4760530..d823559 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -29,12 +29,12 @@
private String brand; // 鍝佺墝
private String loc_no; //搴撲綅鍙�
- private String mat_no; //鐗╂枡缂栫爜
+ private String mat_no; //鍟嗗搧缂栧彿
private Long ctns; //绠辨暟
private Long qty; //鏁伴噺
private double wt; //閲嶉噺
private String memo; //澶囨敞
- private String mat_name; //鐗╂枡鍚嶇О
+ private String mat_name; //鍟嗗搧鍚嶇О
private String str1;
private String str2;
private String str3;
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e93fc7e..a18b5bf 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -19,13 +19,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@@ -38,31 +38,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -86,7 +86,7 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@ApiModelProperty(value= "搴撲綅鍙�")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 8f7a8c2..3665acf 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -20,13 +20,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@@ -39,31 +39,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -87,7 +87,7 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
@ApiModelProperty(value= "搴撲綅鍙�")
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9a72f82..304a28c 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -36,15 +36,14 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
-
/**
* 浠撳簱鍙�
@@ -55,31 +54,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
- * 浠撳簱鍙�
+ * 鏉＄爜
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
- * 浠撳簱鍙�
+ * 鎵瑰彿
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
- * 浠撳簱鍙�
+ * 鍗曟嵁缂栧彿
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
- * 浠撳簱鍙�
+ * 鍝侀」鏁�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -101,9 +100,9 @@
private String zpallet;
/**
- * 鐢ㄦ埛ID
+ * 瀹㈡埛鍚嶇О
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 0f663b5..c1bf1f2 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -36,13 +36,13 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "鍟嗗搧缂栧彿")
private String matnr;
/**
* 鐗╂枡鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
@@ -55,31 +55,31 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "鍨嬪彿")
private String type;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "棰滆壊")
+ @ApiModelProperty(value= "鏉＄爜")
private String color;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "渚涘簲鍟�")
+ @ApiModelProperty(value= "鎵瑰彿")
private String supplier;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "浠撳簱")
+ @ApiModelProperty(value= "鍗曟嵁缂栧彿")
private String warehouse;
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鍝佺墝")
+ @ApiModelProperty(value= "鍝侀」鏁�")
private String brand;
/**
@@ -103,7 +103,7 @@
/**
* 鐢ㄦ埛ID
*/
- @ApiModelProperty(value= "鐢ㄦ埛ID")
+ @ApiModelProperty(value= "瀹㈡埛鍚嶇О")
private String bname;
/**
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 5947e14..edb0595 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -15,7 +15,7 @@
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 f55851b..f0d9867 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -34,7 +34,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 94be71a..b8f8ccd 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -19,7 +19,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鐗╂枡鍙�
+ * @param matnr 鍟嗗搧缂栧彿
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetlToday(String matnr);
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
index da06986..bf03c36 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkMastHandler.java
@@ -87,6 +87,8 @@
locDetl = new LocDetl();
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
@@ -164,6 +166,8 @@
locDetl = new LocDetl();
locDetl.setLocNo(wrkMast.getLocNo()); // 搴撲綅鍙�
VersionUtils.setLocDetl(locDetl, wrkDetl); // 鐗堟湰鎺у埗
+ locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
locDetl.setModiTime(now);
locDetl.setAppeTime(now);
if (!locDetlService.insert(locDetl)) {
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index f79da50..8112dba 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -17,18 +17,26 @@
wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- wrkDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
+ wrkDetl.setType(matCode.getStr5()); // 鍨嬪彿
+ wrkDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+ wrkDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ wrkDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+ wrkDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
wrkDetl.setAltme(matCode.getStr1()); // 鍗曚綅
- wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ wrkDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setWrkDetl(WrkDetl wrkDetl, LocDetl locDetl) {
wrkDetl.setMatnr(locDetl.getMatnr()); // 鐗╂枡缂栧彿
wrkDetl.setMaktx(locDetl.getMaktx()); // 鐗╂枡鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
- wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
- wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
+ wrkDetl.setType(locDetl.getType()); // 鍨嬪彿
+ wrkDetl.setColor(locDetl.getColor()); // 鏉＄爜
+ wrkDetl.setSupplier(locDetl.getSupplier()); // 鎵瑰彿
+ wrkDetl.setWarehouse(locDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+ wrkDetl.setBrand(locDetl.getBrand()); // 鍝侀」鏁�
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
+ wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛鍚嶇О
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -36,19 +44,26 @@
locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
- locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ locDetl.setType(matCode.getStr5()); // 鍨嬪彿
+ locDetl.setColor(matCode.getBarcode()); // 鏉＄爜
+ locDetl.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ locDetl.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+ locDetl.setBrand(matCode.getStr3()); // 鍝侀」鏁�
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
+ locDetl.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
- locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
- locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
- locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
+ locDetl.setType(wrkDetl.getType()); // 鍨嬪彿
+ locDetl.setColor(wrkDetl.getColor()); // 鏉＄爜
+ locDetl.setSupplier(wrkDetl.getSupplier()); // 鎵瑰彿
+ locDetl.setWarehouse(wrkDetl.getWarehouse()); // 鍗曟嵁缂栧彿
+ locDetl.setBrand(wrkDetl.getBrand()); // 鍝侀」鏁�
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
+ locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛鍚嶇О
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
@@ -56,9 +71,13 @@
waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
- waitPakIn.setColor(matCode.getStr3()); // 鍔╄鐮�
+ waitPakIn.setType(matCode.getStr5()); // 鍨嬪彿
+ waitPakIn.setColor(matCode.getBarcode()); // 鏉＄爜
+ waitPakIn.setSupplier(matCode.getStr6()); // 鎵瑰彿
+ waitPakIn.setWarehouse(matCode.getStr7()); // 鍗曟嵁缂栧彿
+ waitPakIn.setBrand(matCode.getStr3()); // 鍝侀」鏁�
waitPakIn.setAltme(matCode.getStr1()); // 鍗曚綅
- waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛
+ waitPakIn.setBname(matCode.getStr4()); // 瀹㈡埛鍚嶇О
}
// excel ----------------------------------------------------------------------
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 2bc8599..926760a 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -87,7 +87,7 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞宸ヤ綔绫诲瀷
* @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @param matNos 鍟嗗搧缂栧彿闆嗗悎
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
@Transactional
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index 37a78dd..934b131 100644
--- a/src/main/java/com/zy/common/web/FileController.java
+++ b/src/main/java/com/zy/common/web/FileController.java
@@ -70,7 +70,7 @@
}
@RequestMapping(value = "/barcode/qrcode/auth")
-// @ManagerAuth(memo = "鐗╂枡缂栫爜鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
+// @ManagerAuth(memo = "鍟嗗搧缂栧彿鏉″舰鐮佽幏鍙�(type:1(鏉″舰鐮�);2(浜岀淮鐮�)")
public R matCodeBarcode(@RequestParam(defaultValue = "1") Integer type
, @RequestParam String param
, @RequestParam(required = false) Integer width
diff --git a/src/main/resources/UpdateThread.cs b/src/main/resources/UpdateThread.cs
index bf7d0f4..9789b84 100644
--- a/src/main/resources/UpdateThread.cs
+++ b/src/main/resources/UpdateThread.cs
@@ -835,7 +835,7 @@
goto re;
}
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｅ晢鍝佺紪鍙�
string sqlDetl = "";
string sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -910,7 +910,7 @@
#endregion
#region 鎷ｆ枡鍐嶅叆搴�
case 53:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｅ晢鍝佺紪鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -964,7 +964,7 @@
#endregion
#region 骞舵澘鍐嶅叆搴�
case 54:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｅ晢鍝佺紪鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,zmatid,matnr,maktx,werks,anfme,altme,zpallet,bname from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1030,7 +1030,7 @@
#endregion
#region 鐩樼偣鍐嶅叆搴�
case 57:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｅ晢鍝佺紪鍙�
sqlDetl = "";
sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
@@ -1133,7 +1133,7 @@
{
#region 鍏ㄦ澘鍑哄簱
case 101:
- ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｇ墿鏂欑紪鐮�
+ ///鏍规嵁宸ヤ綔鍙凤紝鏌ヨ宸ヤ綔鏄庣粏妗ｅ晢鍝佺紪鍙�
string sqlWaitIn = "";
sql = "select lgnum,tbnum,tbpos,matnr from asr_wrk_detl where wrk_no=" + li_wrk_no;
DataView dv_wrkdetl = Common.ExecAsrsSelect(sql);
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 57c6601..63fea19 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -167,23 +167,30 @@
}
var matCols = [
- {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
- ,{field: 'str3', align: 'center',title: '棰滆壊'}
- ,{field: 'num1', align: 'center',title: '鏁伴噺'}
- ,{field: 'str1', align: 'center',title: '鐗╂枡鍗曚綅'}
- ,{field: 'str4', align: 'center',title: '瀹㈡埛'}
+ {field: 'matNo', align: 'center',title: '鍟嗗搧缂栧彿'}
+ ,{field: 'matName', align: 'center',title: '鍟嗗搧鍚嶇О'}
+ ,{field: 'str2', align: 'center',title: '瑙勬牸'}
+ ,{field: 'str5', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'str6', align: 'center',title: '鎵瑰彿'}
+ ,{field: 'str1', align: 'center',title: '鍗曚綅'}
+ ,{field: 'barcode', align: 'center',title: '鏉＄爜'}
+ ,{field: 'str7', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'str3', align: 'center',title: '鍝侀」鏁�'}
+ ,{field: 'str4', align: 'center',title: '瀹㈡埛鍚嶇О'}
]
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: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'type', align: 'center',title: '鍨嬪彿'}
+ ,{field: 'supplier', align: 'center',title: '鎵瑰彿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
+ ,{field: 'color', align: 'center',title: '鏉＄爜'}
+ ,{field: 'warehouse', align: 'center',title: '鍗曟嵁缂栧彿'}
+ ,{field: 'brand', 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 cb4e143..27412cd 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -241,9 +241,13 @@
matnr: data[i].matNo,
maktx: data[i].matName,
lgnum: data[i].str2,
- color: data[i].str3,
- bname: data[i].str4,
+ type: data[i].str5,
+ color: data[i].barcode,
+ supplier: data[i].str6,
+ warehouse: data[i].str7,
+ brand: data[i].str3,
altme: data[i].str1,
+ bname: data[i].str4,
})
}
}
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index f866f55..d2e1786 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/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index c0a0654..87666d6 100644
--- a/src/main/webapp/views/matCode/matCode.html
+++ b/src/main/webapp/views/matCode/matCode.html
@@ -54,7 +54,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="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -161,7 +161,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;">
@@ -170,7 +170,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+ <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
<td align="center" colspan="5">xxxxxx-xx/xx</td>
<td align="center" colspan="2">鍗曚綅</td>
<td align="center" colspan="2">xx</td>
@@ -182,7 +182,7 @@
<div id="template-preview-2" class="template-preview" style="display: none">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 30px">
- <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+ <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
<tr style="height: 30px">
@@ -204,7 +204,7 @@
<div id="template-preview-3" class="template-preview" style="display: none">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 74px">
- <td align="center" scope="col" colspan="1">鐗╂枡鍚嶇О</td>
+ <td align="center" scope="col" colspan="1">鍟嗗搧鍚嶇О</td>
<td align="center" scope="col" colspan="1" style="">xxxxxx-xx/xx</td>
<td align="center" scope="col" colspan="2" rowspan="2">
<img class="template-code template-qrcode" src="" width="80%">
@@ -240,7 +240,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">
@@ -249,7 +249,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="3">鐗╂枡鍚嶇О</td>
+ <td align="center" colspan="3">鍟嗗搧鍚嶇О</td>
<td align="center" colspan="5" style="overflow: hidden; white-space: nowrap;text-overflow: ellipsis;">{{this.matName}}</td>
<td align="center" colspan="2">鍗曚綅</td>
<td align="center" colspan="2">{{this.str1}}</td>
@@ -262,7 +262,7 @@
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 35px">
- <td align="center" width="20%">鐗╂枡鍚嶇О</td>
+ <td align="center" width="20%">鍟嗗搧鍚嶇О</td>
<td align="center" width="80%" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.matName}}</td>
</tr>
<tr style="height: 35px">
@@ -285,7 +285,7 @@
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 74px" >
- <td align="center" scope="col" colspan="1">鐗╂枡鍚嶇О</td>
+ <td align="center" scope="col" colspan="1">鍟嗗搧鍚嶇О</td>
<td align="center" scope="col" colspan="1" style="
display: inline-block;
line-height: 20px;
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 146c560..140e3d6 100644
--- a/src/main/webapp/views/matCode/matCode_detail.html
+++ b/src/main/webapp/views/matCode/matCode_detail.html
@@ -24,7 +24,7 @@
</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="matNo" class="layui-input" type="text" onkeyup="check(this.id, 'matCode')" lay-verify="required" >
</div>
@@ -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="matName" class="layui-input" type="text">
</div>
@@ -48,7 +48,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label">鐗╂枡瑙勬牸锛�</label>
+ <label class="layui-form-label">瑙勬牸锛�</label>
<div class="layui-input-inline">
<input id="str2" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 04c577a..95fd76a 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -52,7 +52,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 798b065..d6a2c61 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,7 +51,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 ebe1d3f..530de5b 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -27,7 +27,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="mat_no" placeholder="鐗╂枡缂栫爜" autocomplete="off">
+ <input class="layui-input" type="text" name="mat_no" placeholder="鍟嗗搧缂栧彿" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index c3931c3..b2bb877 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: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matNo', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'matName', 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 1ec5114..9a9e927 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">
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index d1129a2..656acdc 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,15 +77,15 @@
<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">
- <span>鐗╂枡瑙勬牸</span>
+ <span>瑙勬牸</span>
<input id="str2" type="text" disabled="disabled">
</div>
<div class="form-item">
@@ -108,7 +108,7 @@
var pageCurr;
/**
- * 鏍规嵁鐗╂枡缂栫爜鏌ヨ鐗╂枡璇︽儏
+ * 鏍规嵁鍟嗗搧缂栧彿鏌ヨ鐗╂枡璇︽儏
*/
function find(el){
if (isEmpty(el.value)) {
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index a2b72d8..ac589c5 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: 'matNo', align: 'center', title: '鐗╂枡缂栫爜'},
- {field: 'matName', align: 'center', title: '鐗╂枡鍚嶇О'}
+ {field: 'matNo', align: 'center', title: '鍟嗗搧缂栧彿'},
+ {field: 'matName', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 87a39e0..54cd9c7 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -77,7 +77,7 @@
}
/**
- * 鏍规嵁鐗╂枡鍙锋煡鎵惧簱瀛樻槑缁�
+ * 鏍规嵁鍟嗗搧缂栧彿鏌ユ壘搴撳瓨鏄庣粏
*/
function findByMatNo(el){
if (isEmpty(el.value)) {
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index ae2e4cb..cf341ba 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -487,7 +487,7 @@
function help() {
window.alert("鈶� 鎸塅1杈撳叆鏉＄爜\n" +
- "鈶� 鎸塅2杈撳叆鐗╂枡鍙凤紝鎸塃NTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
+ "鈶� 鎸塅2杈撳叆鍟嗗搧缂栧彿锛屾寜ENTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
"鈶� 鎸塅3寮�濮嬬粍鎵榎n" +
"鍏跺畠锛氭寜F5鍒锋柊椤甸潰");
}
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 020c173..dca05aa 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 35f5db0..bde3a5e 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 2629772..46bf6c7 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 f237c44..d419c9d 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 6a22c57..7af64e3 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