From 5fe9c379f0cc696568a0db249026a1e8a3b02a5a Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <xltys1995>
Date: 星期二, 15 九月 2020 13:52:39 +0800
Subject: [PATCH] Merge branch 'gdasrs' of https://gitee.com/luxiaotao1123/zy-asrs into gdasrs
---
src/main/webapp/static/js/pakStore/locCheckOut.js | 4
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/java/com/zy/asrs/entity/param/CombParam.java | 4
src/main/webapp/views/pda/stockIn.html | 10
src/main/java/com/zy/asrs/controller/LocMastController.java | 2
src/main/resources/UpdateThread.cs | 24
src/main/webapp/static/js/report/locMap.js | 2
src/main/webapp/static/js/operateLog/operateLog.js | 2
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java | 2
src/main/webapp/static/js/wrkMast/wrkMast.js | 6
src/main/webapp/static/js/stoMan/stoQue.js | 12
src/main/webapp/views/locDetl/locDetl_detail.html | 4
src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcel.java | 275 --------------------
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/views/wrkDetl/wrkDetl_detail.html | 4
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 4
src/main/webapp/views/pda/stockOut.html | 6
src/main/java/com/zy/asrs/entity/WrkDetl.java | 10
src/main/webapp/static/js/common.js | 22
src/main/webapp/static/js/errorWrkMast/errorWrkMast.js | 6
src/main/java/com/zy/common/service/CommonService.java | 4
src/main/webapp/static/layuiadmin/style/template.css | 2
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | 6
src/main/webapp/views/wrkMast/wrkMast.html | 2
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/webapp/static/js/pakStore/stockAdjust.js | 6
src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 12
src/main/webapp/views/matCode/matCode_detail.html | 8
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/webapp/static/js/pakStore/stockOut.js | 10
src/main/webapp/views/pakStore/matQuery.html | 4
src/main/webapp/views/pda/locDetlIframe.html | 4
src/main/webapp/views/pda/matQuery.html | 10
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 10
src/main/java/com/zy/asrs/entity/LocDetl.java | 6
src/main/java/com/zy/asrs/entity/AdjDetl.java | 6
src/main/java/com/zy/asrs/utils/VersionUtils.java | 30 +-
src/main/java/com/zy/asrs/entity/MatCode.java | 24
src/main/java/com/zy/common/utils/IpTools.java | 2
src/main/webapp/views/pakStore/locDetlQuery.html | 59 +++-
src/main/webapp/views/pda/comb.html | 8
pom.xml | 2
src/main/java/com/zy/asrs/controller/WorkController.java | 2
src/main/webapp/views/adjDetl/adjDetl.html | 2
src/main/webapp/static/js/pakStore/locMove.js | 2
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 4
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/webapp/views/stoMan/stoQue.html | 2
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 8
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 2
src/main/webapp/static/js/pakStore/pakStore.js | 10
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 4
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 10
src/main/java/com/zy/asrs/service/WorkService.java | 2
src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html | 6
src/main/webapp/static/layuiadmin/json/menu1.js | 2
src/main/java/com/zy/system/entity/OperateLog.java | 2
src/main/java/com/zy/common/web/FileController.java | 2
src/main/webapp/views/operateLog/operateLog_detail.html | 4
src/main/webapp/views/waitPakin/waitPakin_detail.html | 4
src/main/java/com/zy/asrs/controller/MatCodeController.java | 12
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 8
src/main/java/com/zy/asrs/entity/WaitPakin.java | 12
src/main/webapp/views/matCode/matCode.html | 26 +-
src/main/webapp/views/pdaCe/index.html | 6
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 4
src/main/webapp/views/adjDetl/adjDetl_detail.html | 2
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/webapp/views/errorWrkMast/errorWrkMast.html | 2
71 files changed, 270 insertions(+), 500 deletions(-)
diff --git a/pom.xml b/pom.xml
index a056ec6..bdd7c84 100644
--- a/pom.xml
+++ b/pom.xml
@@ -89,7 +89,7 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
- <version>2.0.5</version>
+ <version>2.2.6</version>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
diff --git a/src/main/java/com/zy/asrs/controller/LocMastController.java b/src/main/java/com/zy/asrs/controller/LocMastController.java
index a2a3819..ab5d3ab 100644
--- a/src/main/java/com/zy/asrs/controller/LocMastController.java
+++ b/src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -96,7 +96,7 @@
return R.error();
}
LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
- // 鏈夌墿鏂欐椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
+ // 鏈変骇鍝佹椂淇敼涓虹┖搴撲綅鎴栬�呯┖鏉垮簱浣嶏紝鍒欏垹闄ゅ簱瀛樻槑缁�
if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
locDetlService.delete(new EntityWrapper<LocDetl>().eq("loc_no", locMast.getLocNo()));
diff --git a/src/main/java/com/zy/asrs/controller/MatCodeController.java b/src/main/java/com/zy/asrs/controller/MatCodeController.java
index e001475..ad2b01c 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,17 +148,17 @@
// 瀵煎叆
@RequestMapping(value = "/matCode/import/auth")
- @ManagerAuth(memo = "鐗╂枡缂栫爜鏁版嵁瀵煎叆")
+ @ManagerAuth(memo = "浜у搧浠ｅ彿鏁版嵁瀵煎叆")
@Transactional
public R matCodeImport(MultipartFile file) throws IOException, InterruptedException {
MatCodeExcelListener listener = new MatCodeExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), MatCodeExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉＄墿鏂欎俊鎭�");
+ return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉′骇鍝佷俊鎭�");
}
// 鎵撳嵃
@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/controller/WorkController.java b/src/main/java/com/zy/asrs/controller/WorkController.java
index 6627272..49c905b 100644
--- a/src/main/java/com/zy/asrs/controller/WorkController.java
+++ b/src/main/java/com/zy/asrs/controller/WorkController.java
@@ -68,7 +68,7 @@
@RequestMapping("/available/take/check/site")
@ManagerAuth(memo = "鑾峰彇鐩樼偣鍑哄簱绔欑偣")
public R availableTakeCheckSite(){
- return R.ok().add(basDevpService.getAvailableOutSite(103));
+ return R.ok().add(basDevpService.getAvailableOutSite(107));
}
@RequestMapping("/available/empty/take/site")
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index bc45c3e..1124fc0 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -37,9 +37,9 @@
private String locNo;
/**
- * 鐗╂枡缂栧彿
+ * 浜у搧缂栧彿
*/
- @ApiModelProperty(value= "鐗╂枡缂栧彿")
+ @ApiModelProperty(value= "浜у搧缂栧彿")
@TableField("mat_no")
private String matNo;
@@ -139,7 +139,7 @@
// AdjDetl adjDetl = new AdjDetl(
// 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 ef2ea78..8e2eb7f 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -27,17 +27,17 @@
@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= "棰滆壊")
diff --git a/src/main/java/com/zy/asrs/entity/MatCode.java b/src/main/java/com/zy/asrs/entity/MatCode.java
index 9222313..ddbb5ea 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,25 +34,25 @@
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= "棰滆壊")
private String str3;
- @ApiModelProperty(value= "瀹㈡埛")
+ @ApiModelProperty(value= "搴撲綅鍚嶇О")
private String str4;
@ApiModelProperty(value= "")
@@ -112,7 +112,7 @@
@ApiModelProperty(value= "")
private String str23;
- @ApiModelProperty(value= "閲嶉噺")
+ @ApiModelProperty(value= "")
private Double num1;
@ApiModelProperty(value= "")
@@ -208,9 +208,9 @@
// MatCode matCode = new MatCode(
// 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 f2376d9..5680fb4 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,17 +16,17 @@
private String barcode;
/**
- * 鐗╂枡鍚嶇О
+ * 浜у搧鍚嶇О
*/
private String matName;
/**
- * 鐗╂枡鍗曚綅
+ * 鍩烘湰鍗曚綅
*/
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..b25c97d 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -11,10 +11,10 @@
public class ViewStayTimeBean {
private int tbnum; //杞偍璇锋眰缂栧彿
private int tbpos; //琛岄」鐩�
- private String zmatid; //鐗╂枡鏍囩ID
+ private String zmatid; //浜у搧鏍囩ID
- private String matnr; //鐗╂枡
- private String maktx; //鐗╂枡鎻忚堪
+ private String matnr; //浜у搧
+ private String maktx; //浜у搧鎻忚堪
private String werks; //宸ュ巶
private double anfme; //鏁伴噺
private String altme; //鍗曚綅
@@ -22,19 +22,19 @@
private String bname; //鐢ㄦ埛ID
private String lgnum; //瑙勬牸
- private String type; // 鐗╂枡绫诲埆
+ private String type; // 浜у搧绫诲埆
private String color; // 棰滆壊
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
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/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 0d8a904..b976351 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -12,10 +12,10 @@
private int tbnum; //杞偍璇锋眰缂栧彿
private int tbpos; //琛岄」鐩�
- private String zmatid; //鐗╂枡鏍囩ID
+ private String zmatid; //浜у搧鏍囩ID
- private String matnr; //鐗╂枡
- private String maktx; //鐗╂枡鎻忚堪
+ private String matnr; //浜у搧
+ private String maktx; //浜у搧鎻忚堪
private String werks; //宸ュ巶
private double anfme; //鏁伴噺
private String altme; //鍗曚綅
@@ -23,7 +23,7 @@
private String bname; //鐢ㄦ埛ID
private String lgnum; //瑙勬牸
- private String type; // 鐗╂枡绫诲埆
+ private String type; // 浜у搧绫诲埆
private String color; // 棰滆壊
private String supplier; // 渚涘簲鍟�
private String warehouse; // 浠撳簱
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index e93fc7e..73981af 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -17,15 +17,15 @@
private static final long serialVersionUID = 1L;
/**
- * 鐗╂枡
+ * 浜у搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "浜у搧")
private String matnr;
/**
- * 鐗╂枡鎻忚堪
+ * 浜у搧鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "浜у搧鎻忚堪")
private String maktx;
@@ -38,7 +38,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "浜у搧绫诲埆")
private String type;
/**
@@ -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..9e4b8bf 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -18,15 +18,15 @@
/**
- * 鐗╂枡
+ * 浜у搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "浜у搧")
private String matnr;
/**
- * 鐗╂枡鎻忚堪
+ * 浜у搧鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "浜у搧鎻忚堪")
private String maktx;
@@ -39,7 +39,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "浜у搧绫诲埆")
private String type;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetl.java b/src/main/java/com/zy/asrs/entity/WrkDetl.java
index 9a72f82..1514568 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -34,15 +34,15 @@
private Date ioTime;
/**
- * 鐗╂枡
+ * 浜у搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "浜у搧")
private String matnr;
/**
- * 鐗╂枡鎻忚堪
+ * 浜у搧鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "浜у搧鎻忚堪")
private String maktx;
@@ -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 0f663b5..d44e473 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -34,15 +34,15 @@
private Date ioTime;
/**
- * 鐗╂枡
+ * 浜у搧
*/
- @ApiModelProperty(value= "鐗╂枡")
+ @ApiModelProperty(value= "浜у搧")
private String matnr;
/**
- * 鐗╂枡鎻忚堪
+ * 浜у搧鎻忚堪
*/
- @ApiModelProperty(value= "鐗╂枡鎻忚堪")
+ @ApiModelProperty(value= "浜у搧鎻忚堪")
private String maktx;
@@ -55,7 +55,7 @@
/**
* 浠撳簱鍙�
*/
- @ApiModelProperty(value= "鐗╂枡绫诲埆")
+ @ApiModelProperty(value= "浜у搧绫诲埆")
private String type;
/**
diff --git a/src/main/java/com/zy/asrs/entity/param/CombParam.java b/src/main/java/com/zy/asrs/entity/param/CombParam.java
index 568b7e6..38107d1 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -14,10 +14,10 @@
public static class CombMat {
- // 鐗╂枡缂栧彿
+ // 浜у搧缂栧彿
private String matNo;
- // 鐗╂枡鏁伴噺
+ // 浜у搧鏁伴噺
private Double count;
public String getMatNo() {
diff --git a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
index 289ba63..560c73f 100644
--- a/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -13,15 +13,15 @@
// 绔欑偣缂栧彿
private Integer devpNo;
- // 鐗╂枡鍒楄〃鏁版嵁
+ // 浜у搧鍒楄〃鏁版嵁
private List<MatCodeStore> list;
public static class MatCodeStore {
- // 鐗╂枡缂栧彿
+ // 浜у搧缂栧彿
private String matNo;
- // 鐗╂枡鏁伴噺
+ // 浜у搧鏁伴噺
private Double count;
public String getMatNo() {
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..0fab9d0 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..6e9546c 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -10,7 +10,7 @@
// 鍑虹珯鍙�
private Integer outSite;
- // 鐗╂枡缂栧彿闆嗗悎
+ // 浜у搧缂栧彿闆嗗悎
private List<LocDetl> locDetls;
public Integer getOutSite() {
@@ -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..012cea8 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/service/WorkService.java b/src/main/java/com/zy/asrs/service/WorkService.java
index f639fba..52be78d 100644
--- a/src/main/java/com/zy/asrs/service/WorkService.java
+++ b/src/main/java/com/zy/asrs/service/WorkService.java
@@ -25,7 +25,7 @@
/**
* 鍑哄簱浣滀笟
* @param staNo 鐩爣绔欑偣
- * @param locDetls 寰呭嚭搴撶墿鏂�
+ * @param locDetls 寰呭嚭搴撲骇鍝�
* @param ioType 鍏ュ嚭搴撶被鍨�
*/
void stockOut(BasDevp staNo, List<LocDetlDto> locDetls, Integer ioType, Long userId);
diff --git a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
index d78a656..b61219b 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -43,7 +43,7 @@
for (CombParam.CombMat combMat : param.getCombMats()) {
MatCode matCode = matCodeService.selectById(combMat.getMatNo());
if (Cools.isEmpty(matCode)) {
- throw new CoolException("鐗╂枡鏁版嵁閿欒");
+ throw new CoolException("浜у搧鏁版嵁閿欒");
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.setZpallet(param.getBarcode()); // 鎵樼洏鐮�
diff --git a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
index 2069b21..1e4553b 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -148,7 +148,7 @@
// 鍚姩鍑哄簱寮�濮� 101.鍑哄簱
stockOut(staNo, locDetlDtos, null, userId);
} else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
}
}
@@ -384,7 +384,7 @@
// 鍚姩鍑哄簱寮�濮� 107.鐩樼偣鍑哄簱
stockOut(staNo, locDetlDtos, 107, userId);
} else {
- throw new CoolException("搴撲綅鐗╂枡涓嶅瓨鍦�");
+ throw new CoolException("搴撲綅浜у搧涓嶅瓨鍦�");
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
index 0273900..3f4e893 100644
--- a/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -32,7 +32,7 @@
for (MatCodeCountDto dto : matCodeCountDtos) {
MatCode matCode = matCodeService.selectById(dto.getMatNo());
if (Cools.isEmpty(matCode)){
- throw new CoolException("鐗╂枡鏉＄爜鏁版嵁涓虹┖");
+ throw new CoolException("浜у搧鏉＄爜鏁版嵁涓虹┖");
}
// 淇濇寔宸ヤ綔妗ｆ槑缁�
WrkDetl wrkDetl = new WrkDetl();
diff --git a/src/main/java/com/zy/asrs/utils/VersionUtils.java b/src/main/java/com/zy/asrs/utils/VersionUtils.java
index f79da50..5b97d69 100644
--- a/src/main/java/com/zy/asrs/utils/VersionUtils.java
+++ b/src/main/java/com/zy/asrs/utils/VersionUtils.java
@@ -14,51 +14,51 @@
// 涓氬姟 ----------------------------------------------------------------------
public static void setWrkDetl(WrkDetl wrkDetl, MatCode matCode) {
- wrkDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- wrkDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ wrkDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+ wrkDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
wrkDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
wrkDetl.setColor(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.setMatnr(locDetl.getMatnr()); // 浜у搧缂栧彿
+ wrkDetl.setMaktx(locDetl.getMaktx()); // 浜у搧鎻忚堪
wrkDetl.setLgnum(locDetl.getLgnum()); // 瑙勬牸
wrkDetl.setColor(locDetl.getColor()); // 鍔╄鐮�
- wrkDetl.setBname(locDetl.getBname()); // 瀹㈡埛
+ wrkDetl.setBname(locDetl.getBname()); // 搴撲綅鍚嶇О
wrkDetl.setAltme(locDetl.getAltme()); // 鍗曚綅
wrkDetl.setZpallet(locDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
public static void setLocDetl(LocDetl locDetl, MatCode matCode) {
- locDetl.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ locDetl.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+ locDetl.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
locDetl.setLgnum(matCode.getStr2()); // 瑙勬牸
locDetl.setColor(matCode.getStr3()); // 鍔╄鐮�
- locDetl.setBname(matCode.getStr4()); // 瀹㈡埛
+ locDetl.setBname(matCode.getStr4()); // 搴撲綅鍚嶇О
locDetl.setAltme(matCode.getStr1()); // 鍗曚綅
}
public static void setLocDetl(LocDetl locDetl, WrkDetl wrkDetl) {
- locDetl.setMatnr(wrkDetl.getMatnr()); // 鐗╂枡缂栧彿
- locDetl.setMaktx(wrkDetl.getMaktx()); // 鐗╂枡鎻忚堪
+ locDetl.setMatnr(wrkDetl.getMatnr()); // 浜у搧缂栧彿
+ locDetl.setMaktx(wrkDetl.getMaktx()); // 浜у搧鎻忚堪
locDetl.setLgnum(wrkDetl.getLgnum()); // 瑙勬牸
locDetl.setColor(wrkDetl.getColor()); // 鍔╄鐮�
- locDetl.setBname(wrkDetl.getBname()); // 瀹㈡埛
+ locDetl.setBname(wrkDetl.getBname()); // 搴撲綅鍚嶇О
locDetl.setAnfme(wrkDetl.getAnfme()); // 鏁伴噺
locDetl.setAltme(wrkDetl.getAltme()); // 鍗曚綅
locDetl.setZpallet(wrkDetl.getZpallet()); // 鎵樼洏鏉＄爜
}
public static void setWaitPakIn(WaitPakin waitPakIn, MatCode matCode) {
- waitPakIn.setMatnr(matCode.getMatNo()); // 鐗╂枡缂栧彿
- waitPakIn.setMaktx(matCode.getMatName()); // 鐗╂枡鎻忚堪
+ waitPakIn.setMatnr(matCode.getMatNo()); // 浜у搧缂栧彿
+ waitPakIn.setMaktx(matCode.getMatName()); // 浜у搧鎻忚堪
waitPakIn.setLgnum(matCode.getStr2()); // 瑙勬牸
waitPakIn.setColor(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 c67ed78..2e3af6e 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -85,7 +85,7 @@
* @param whsType 绫诲瀷 1:鍙屾繁寮忚揣鏋�
* @param staDescId 璺緞ID
* @param sourceStaNo 婧愮珯
- * @param matNos 鐗╂枡鍙烽泦鍚�
+ * @param matNos 浜у搧鍙烽泦鍚�
* @return locNo 妫�绱㈠埌鐨勫簱浣嶅彿
*/
public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, List<String> matNos) {
@@ -141,7 +141,7 @@
// }
// }
- // 濡傛灉娌℃湁鐩歌繎鐗╂枡锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
+ // 濡傛灉娌℃湁鐩歌繎浜у搧锛屽垯鎸夎鍒欒疆璇㈣揣鏋�
if (null == locMast) {
// 鑾峰彇鐩爣绔欐墍鍦ㄨ揣鏋舵帓鍙� todo:luxiaotao
if (curRow == sRow) {
diff --git a/src/main/java/com/zy/common/utils/IpTools.java b/src/main/java/com/zy/common/utils/IpTools.java
index 30a2592..b7aa5a5 100644
--- a/src/main/java/com/zy/common/utils/IpTools.java
+++ b/src/main/java/com/zy/common/utils/IpTools.java
@@ -76,7 +76,7 @@
}
}
- // 瀵逛簬閫氳繃澶氫釜浠ｇ悊鐨勬儏鍐碉紝绗竴涓狪P涓哄鎴风鐪熷疄IP,澶氫釜IP鎸夌収','鍒嗗壊"***.***.***.***".length()=15
+ // 瀵逛簬閫氳繃澶氫釜浠ｇ悊鐨勬儏鍐碉紝绗竴涓狪P涓哄簱浣嶅悕绉扮鐪熷疄IP,澶氫釜IP鎸夌収','鍒嗗壊"***.***.***.***".length()=15
if (ipAddress != null && ipAddress.length() > 15) {
if (ipAddress.indexOf(",") > 0) {
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 58e2130..08cb54b 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
@@ -1,33 +1,37 @@
package com.zy.common.utils.excel.matcode;
+import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
/**
* 0.A 1.B 2.C 3.D 4.E 5.F 6.G 7.H 8.I
* 9.J 10.K 11.L 12.M 13.N 14.O 15.P 16.Q 17.R 18.S
* 19.T 20.U 21.V 22.W 23.X 24.Y 25.Z
*/
+@Data
+@ExcelIgnoreUnannotated
public class MatCodeExcel {
- @ExcelProperty(value= "鐗╂枡缂栫爜", index = 1)
+ @ExcelProperty(value= "浜у搧浠ｅ彿*", index = 0)
private String matNo;
- @ExcelProperty(value= "鏉″舰鐮�", index = 4)
+// @ExcelProperty(value= "鏉″舰鐮�", index = 4)
private String barcode;
- @ExcelProperty(value= "鐗╂枡鍚嶇О", index = 2)
+ @ExcelProperty(value= "浜у搧鍚嶇О", index = 3)
private String matName;
- @ExcelProperty(value= "鐗╂枡鍗曚綅", index = 8)
+ @ExcelProperty(value= "鍩烘湰鍗曚綅", index = 12)
private String str1;
- @ExcelProperty(value= "鐗╂枡瑙勬牸", index = 3)
+ @ExcelProperty(value= "瑙勬牸鍨嬪彿", index = 5)
private String str2;
- @ExcelProperty(value= "棰滆壊", index = 5)
+ @ExcelProperty(value= "棰滆壊鍚嶇О", index = 28)
private String str3;
- @ExcelProperty(value= "瀹㈡埛", index = 6)
+ @ExcelProperty(value= "搴撲綅鍚嶇О", index = 14)
private String str4;
// @ExcelProperty(value= "鍔╄鐮�", index = 7)
@@ -87,7 +91,7 @@
// @ExcelProperty(value= "閿�鍞崟浣�", index = 31)
private String str23;
- @ExcelProperty(value= "閲嶉噺", index = 7)
+// @ExcelProperty(value= "閲嶉噺", index = 7)
private Double num1;
// @ExcelProperty(value= "鏈�浣庡簱瀛樻暟閲�")
@@ -142,259 +146,4 @@
this.num6 = num6;
}
- public String getMatNo() {
- return matNo;
- }
-
- public void setMatNo(String matNo) {
- this.matNo = matNo;
- }
-
- public String getBarcode() {
- return barcode;
- }
-
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
-
- public String getMatName() {
- return matName;
- }
-
- public void setMatName(String matName) {
- this.matName = matName;
- }
-
- public String getStr1() {
- return str1;
- }
-
- public void setStr1(String str1) {
- this.str1 = str1;
- }
-
- public String getStr2() {
- return str2;
- }
-
- public void setStr2(String str2) {
- this.str2 = str2;
- }
-
- public String getStr3() {
- return str3;
- }
-
- public void setStr3(String str3) {
- this.str3 = str3;
- }
-
- public String getStr4() {
- return str4;
- }
-
- public void setStr4(String str4) {
- this.str4 = str4;
- }
-
- public String getStr5() {
- return str5;
- }
-
- public void setStr5(String str5) {
- this.str5 = str5;
- }
-
- public String getStr6() {
- return str6;
- }
-
- public void setStr6(String str6) {
- this.str6 = str6;
- }
-
- public String getStr7() {
- return str7;
- }
-
- public void setStr7(String str7) {
- this.str7 = str7;
- }
-
- public String getStr8() {
- return str8;
- }
-
- public void setStr8(String str8) {
- this.str8 = str8;
- }
-
- public String getStr9() {
- return str9;
- }
-
- public void setStr9(String str9) {
- this.str9 = str9;
- }
-
- public String getStr10() {
- return str10;
- }
-
- public void setStr10(String str10) {
- this.str10 = str10;
- }
-
- public String getStr11() {
- return str11;
- }
-
- public void setStr11(String str11) {
- this.str11 = str11;
- }
-
- public String getStr12() {
- return str12;
- }
-
- public void setStr12(String str12) {
- this.str12 = str12;
- }
-
- public String getStr13() {
- return str13;
- }
-
- public void setStr13(String str13) {
- this.str13 = str13;
- }
-
- public String getStr14() {
- return str14;
- }
-
- public void setStr14(String str14) {
- this.str14 = str14;
- }
-
- public String getStr15() {
- return str15;
- }
-
- public void setStr15(String str15) {
- this.str15 = str15;
- }
-
- public String getStr16() {
- return str16;
- }
-
- public void setStr16(String str16) {
- this.str16 = str16;
- }
-
- public String getStr17() {
- return str17;
- }
-
- public void setStr17(String str17) {
- this.str17 = str17;
- }
-
- public String getStr18() {
- return str18;
- }
-
- public void setStr18(String str18) {
- this.str18 = str18;
- }
-
- public String getStr19() {
- return str19;
- }
-
- public void setStr19(String str19) {
- this.str19 = str19;
- }
-
- public String getStr20() {
- return str20;
- }
-
- public void setStr20(String str20) {
- this.str20 = str20;
- }
-
- public String getStr21() {
- return str21;
- }
-
- public void setStr21(String str21) {
- this.str21 = str21;
- }
-
- public String getStr22() {
- return str22;
- }
-
- public void setStr22(String str22) {
- this.str22 = str22;
- }
-
- public String getStr23() {
- return str23;
- }
-
- public void setStr23(String str23) {
- this.str23 = str23;
- }
-
- public Double getNum1() {
- return num1;
- }
-
- public void setNum1(Double num1) {
- this.num1 = num1;
- }
-
- public Double getNum2() {
- return num2;
- }
-
- public void setNum2(Double num2) {
- this.num2 = num2;
- }
-
- public Double getNum3() {
- return num3;
- }
-
- public void setNum3(Double num3) {
- this.num3 = num3;
- }
-
- public Double getNum4() {
- return num4;
- }
-
- public void setNum4(Double num4) {
- this.num4 = num4;
- }
-
- public Double getNum5() {
- return num5;
- }
-
- public void setNum5(Double num5) {
- this.num5 = num5;
- }
-
- public Double getNum6() {
- return num6;
- }
-
- public void setNum6(Double num6) {
- this.num6 = num6;
- }
}
diff --git a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
index b8636f2..a93ce19 100644
--- a/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
+++ b/src/main/java/com/zy/common/utils/excel/matcode/MatCodeExcelListener.java
@@ -78,7 +78,7 @@
*/
@Override
public void doAfterAllAnalysed(AnalysisContext ctx) {
- LOGGER.info("鏂板{}鏉＄墿鏂欎俊鎭紒", total);
+ LOGGER.info("鏂板{}鏉′骇鍝佷俊鎭紒", total);
}
public int getTotal() {
diff --git a/src/main/java/com/zy/common/web/FileController.java b/src/main/java/com/zy/common/web/FileController.java
index 37a78dd..f604b5f 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/java/com/zy/system/entity/OperateLog.java b/src/main/java/com/zy/system/entity/OperateLog.java
index abee522..049e1fd 100644
--- a/src/main/java/com/zy/system/entity/OperateLog.java
+++ b/src/main/java/com/zy/system/entity/OperateLog.java
@@ -35,7 +35,7 @@
private Long userId;
/**
- * 瀹㈡埛绔疘P
+ * 搴撲綅鍚嶇О绔疘P
*/
private String ip;
diff --git a/src/main/resources/UpdateThread.cs b/src/main/resources/UpdateThread.cs
index bf7d0f4..321e938 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);
@@ -1375,12 +1375,12 @@
}
/// <summary>
- /// 杞凡瀹屾垚鐗╂枡淇℃伅鍒板巻鍙叉。
+ /// 杞凡瀹屾垚浜у搧淇℃伅鍒板巻鍙叉。
/// </summary>
public void ProcMatCodeToLog(string seq)
{
string ls_error_memo = "", mat_no = "";
- DisplayInfo(seq, "N", "--澶勭悊宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗�......");
+ DisplayInfo(seq, "N", "--澶勭悊宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗�......");
try
{
string condition = " and mat_no not in (select mat_no from asr_loc_detl) and mat_no not in (select mat_no from asr_wrk_detl) ";
@@ -1389,7 +1389,7 @@
DataView dv = Common.ExecAsrsSelect(sql0);
if (dv.Count <= 0)
{
- DisplayInfo("", "N", " " + seq + ".1 鐗╂枡妗� [bas_mat_code] 娌℃湁璧勬枡澶勭悊!");
+ DisplayInfo("", "N", " " + seq + ".1 浜у搧妗� [bas_mat_code] 娌℃湁璧勬枡澶勭悊!");
return;
}
@@ -1428,7 +1428,7 @@
{
sqltrans.Rollback();
//sqlcommon.Close();
- ls_error_memo = " " + seq + ".1 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".1 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
finally
@@ -1440,7 +1440,7 @@
}
catch (Exception t)
{
- ls_error_memo = " " + seq + ".2 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｅけ璐�! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".2 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｅけ璐�! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
}
@@ -1539,7 +1539,7 @@
{
sqltrans1.Rollback();
//sqlcommon.Close();
- ls_error_memo = " " + seq + ".1 宸插畬鎴愮墿鏂欐暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
+ ls_error_memo = " " + seq + ".1 宸插畬鎴愪骇鍝佹暟鎹浆鍘嗗彶妗ｉ敊璇� ! 寮傚父:" + t.Message;
DisplayInfo("", "E", ls_error_memo);
}
finally
@@ -1707,7 +1707,7 @@
//鍫嗗灈鏈�&PLC鍛戒护杞巻鍙叉。
ProcDevCommandToLog("4"); // done
- //杞凡瀹屾垚鐗╂枡淇℃伅鍒板巻鍙叉。
+ //杞凡瀹屾垚浜у搧淇℃伅鍒板巻鍙叉。
//ProcMatCodeToLog("5");
//杞嚭搴撳畬鎴愬緟鍑哄簱妗ｆ暟鎹埌鍘嗗彶妗�
ProcCheckToWorkData("5");
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 80f8af8..a90bf96 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: 'matNo$', align: 'center',title: '鐗╂枡缂栧彿'}
+ ,{field: 'matNo$', align: 'center',title: '浜у搧缂栧彿'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
// ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 54c0590..ea844b6 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -155,7 +155,7 @@
}(this);
/*************************************************************************************************************/
-/********************************************** 鐗╂枡涓氬姟鎶借薄 ***************************************************/
+/********************************************** 浜у搧涓氬姟鎶借薄 ***************************************************/
/*************************************************************************************************************/
function arrRemove(arr, key, val) {
@@ -167,23 +167,23 @@
}
var matCols = [
- {field: 'matNo', align: 'center',title: '鐗╂枡缂栫爜'}
- ,{field: 'matName', align: 'center',title: '鐗╂枡鍚嶇О'}
- ,{field: 'str2', align: 'center',title: '鐗╂枡瑙勬牸'}
+ {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: 'num1', align: 'center',title: '鏁伴噺'}
+ ,{field: 'str1', 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: 'anfme', align: 'center',title: '鏁伴噺'}
+ // ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', 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/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
index bff82e3..7185f5a 100644
--- a/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/errorWrkMast/errorWrkMast.js
@@ -359,12 +359,12 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/operateLog/operateLog.js b/src/main/webapp/static/js/operateLog/operateLog.js
index d8c9acf..d657de3 100644
--- a/src/main/webapp/static/js/operateLog/operateLog.js
+++ b/src/main/webapp/static/js/operateLog/operateLog.js
@@ -22,7 +22,7 @@
{field: 'id', title: 'ID', sort: true,align: 'center', width: 80}
,{field: 'userId$', align: 'center',title: '鐢ㄦ埛'}
,{field: 'action', align: 'center',title: '鎿嶄綔鍐呭'}
- ,{field: 'ip', align: 'center',title: '瀹㈡埛绔疘P'}
+ ,{field: 'ip', align: 'center',title: '搴撲綅鍚嶇О绔疘P'}
,{field: 'request', align: 'center',title: '璇锋眰鏁版嵁'}
,{field: 'response', align: 'center',title: '鍝嶅簲鏁版嵁'}
,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/pakStore/locCheckOut.js b/src/main/webapp/static/js/pakStore/locCheckOut.js
index e3e95c4..f2840c3 100644
--- a/src/main/webapp/static/js/pakStore/locCheckOut.js
+++ b/src/main/webapp/static/js/pakStore/locCheckOut.js
@@ -40,7 +40,7 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -140,7 +140,7 @@
}
})
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
diff --git a/src/main/webapp/static/js/pakStore/locMove.js b/src/main/webapp/static/js/pakStore/locMove.js
index 8625246..3db5205 100644
--- a/src/main/webapp/static/js/pakStore/locMove.js
+++ b/src/main/webapp/static/js/pakStore/locMove.js
@@ -60,7 +60,7 @@
});
-// 鎼滅储搴撲綅鐗╂枡
+// 鎼滅储搴撲綅浜у搧
function getLoc(el) {
tableIns.reload({
url: baseUrl+'/locDetl/list/auth'
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index d40dd18..55db1b3 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -44,12 +44,12 @@
var data = checkStatus.data;
switch(obj.event) {
case 'comb':
- // 鍒ゆ柇鏄惁瀛樺湪鐗╂枡
+ // 鍒ゆ柇鏄惁瀛樺湪浜у搧
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛娣诲姞浜у搧");
return;
}
- // 鍒ゆ柇鐗╂枡鏁伴噺鏄惁瀛樺湪寮傚父
+ // 鍒ゆ柇浜у搧鏁伴噺鏄惁瀛樺湪寮傚父
for (var i=0;i<matCodeData.length;i++){
if (isNaN(matCodeData[i].count)) {
layer.msg("璇疯緭鍏ユ暟瀛�");
@@ -159,12 +159,12 @@
});
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇浜у搧',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index cb4e143..8a429d3 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -48,7 +48,7 @@
return;
}
if (matCodeData.length === 0) {
- layer.msg("璇峰厛娣诲姞鐗╂枡");
+ layer.msg("璇峰厛娣诲姞浜у搧");
return;
}
for (var i=0;i<matCodeData.length;i++){
@@ -194,7 +194,7 @@
}
})
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
var matCodeLayerIdx;
function getMat() {
if (isEmpty(currLocNo)) {
@@ -204,7 +204,7 @@
}
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇浜у搧',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
diff --git a/src/main/webapp/static/js/pakStore/stockOut.js b/src/main/webapp/static/js/pakStore/stockOut.js
index 4018a87..6c08a87 100644
--- a/src/main/webapp/static/js/pakStore/stockOut.js
+++ b/src/main/webapp/static/js/pakStore/stockOut.js
@@ -2,13 +2,13 @@
var locDetlData = [];
function getCol() {
var cols = [
- {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
- ,{field: 'anfme', align: 'center',title: '鍘熸暟閲�'}
+ // {field: 'count', align: 'center',title: '鍑哄簱鏁伴噺', edit:'text', width: 130, style:'color: blue;font-weight: bold'}
+ {field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
];
arrRemove(detlCols, 'field', 'anfme');
cols.push.apply(cols, detlCols);
- cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
+ // cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:80})
return cols;
}
@@ -43,7 +43,7 @@
switch (obj.event) {
case 'outbound':
if (data.length === 0){
- layer.msg('璇峰厛娣诲姞搴撲綅鐗╂枡');
+ layer.msg('璇峰厛娣诲姞搴撲綅浜у搧');
} else {
var staNo = $("#staNoSelect").val();
if (staNo === "" || staNo === null){
@@ -142,7 +142,7 @@
}
})
-// 鎻愬彇鐗╂枡
+// 鎻愬彇浜у搧
var locDetlLayerIdx;
function getLocDetl() {
locDetlLayerIdx = layer.open({
diff --git a/src/main/webapp/static/js/report/locMap.js b/src/main/webapp/static/js/report/locMap.js
index 5475a00..4f8720d 100644
--- a/src/main/webapp/static/js/report/locMap.js
+++ b/src/main/webapp/static/js/report/locMap.js
@@ -69,7 +69,7 @@
} else {
layer.open({
type: 2,
- title: '搴撲綅鐗╂枡',
+ title: '搴撲綅浜у搧',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index b4d33f4..8c946b5 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -161,7 +161,7 @@
|| data.locSts.trim() === 'S'
|| data.locSts.trim() === 'D'
|| data.locSts.trim() === 'O') {
- layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪鐗╂枡");
+ layer.msg("姝ゅ簱浣嶇殑鐘舵�佷笉瀛樺湪浜у搧");
return;
}
locDetlToLayer(data.locNo);
@@ -169,7 +169,7 @@
}
});
- // iframe鐗╂枡璇︽儏
+ // iframe浜у搧璇︽儏
function locDetlToLayer(val) {
locNo = val;
layer.open({
@@ -183,7 +183,7 @@
}
});
}
- // div鐗╂枡璇︽儏
+ // div浜у搧璇︽儏
var pageCur;
function locDetl(locNo){
$('#detlTable').css("display", 'block');
@@ -201,12 +201,12 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 183c81f..28dfac5 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -563,12 +563,12 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: '鐗╂枡'}
+ ,{field: 'matnr', align: 'center',title: '浜у搧'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
- ,{field: 'zmatid', align: 'center',title: '鐗╂枡鏍囩ID'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鎻忚堪'}
+ ,{field: 'zmatid', align: 'center',title: '浜у搧鏍囩ID'}
+ ,{field: 'maktx', align: 'center',title: '浜у搧鎻忚堪'}
,{field: 'werks', align: 'center',title: '宸ュ巶'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'altme', align: 'center',title: '鍗曚綅'}
diff --git a/src/main/webapp/static/layuiadmin/json/menu1.js b/src/main/webapp/static/layuiadmin/json/menu1.js
index d378ec9..c3ac057 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 e031875..bad7405 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/adjDetl/adjDetl.html b/src/main/webapp/views/adjDetl/adjDetl.html
index 6e62391..db35ef2 100644
--- a/src/main/webapp/views/adjDetl/adjDetl.html
+++ b/src/main/webapp/views/adjDetl/adjDetl.html
@@ -21,7 +21,7 @@
</div>
<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/adjDetl/adjDetl_detail.html b/src/main/webapp/views/adjDetl/adjDetl_detail.html
index 0fbbb3d..77335d0 100644
--- a/src/main/webapp/views/adjDetl/adjDetl_detail.html
+++ b/src/main/webapp/views/adjDetl/adjDetl_detail.html
@@ -42,7 +42,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栧彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栧彿锛�</label>
<div class="layui-input-inline cool-auto-complete">
<input id="matNo" class="layui-input" type="text" lay-verify="required" style="display: none">
<input id="matNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="璇疯緭鍏�..." onfocus=this.blur()>
diff --git a/src/main/webapp/views/errorWrkMast/errorWrkMast.html b/src/main/webapp/views/errorWrkMast/errorWrkMast.html
index 2d5507b..d464bf5 100644
--- a/src/main/webapp/views/errorWrkMast/errorWrkMast.html
+++ b/src/main/webapp/views/errorWrkMast/errorWrkMast.html
@@ -98,7 +98,7 @@
<!--鏄庣粏琛�-->
<div id="detlTable" style="display: none">
<div class="layui-inline" style="width:90%;margin-top: 10px;margin-left: 20px">
- <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅伐浣滄祦鐨勭墿鏂欐槑缁�</span>
+ <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅伐浣滄祦鐨勪骇鍝佹槑缁�</span>
</div>
<table class="layui-hide" id="wrkDetlByMap" lay-filter="wrkDetlByMap"></table>
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index f866f55..f68af26 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/locDetl/locDetl_detail.html b/src/main/webapp/views/locDetl/locDetl_detail.html
index 7684ede..e7b17ed 100644
--- a/src/main/webapp/views/locDetl/locDetl_detail.html
+++ b/src/main/webapp/views/locDetl/locDetl_detail.html
@@ -60,13 +60,13 @@
</div>
</div>
<div class="layui-inline" style="width:31%;display: none">
- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
+ <label class="layui-form-label" style="font-size: x-small">浜у搧鏍囩ID锛�</label>
<div class="layui-input-inline">
<input id="zmatid" class="layui-input" type="text" >
</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="maktx" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/matCode/matCode.html b/src/main/webapp/views/matCode/matCode.html
index 16ed851..0a35bca 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>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -159,7 +159,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;">
@@ -168,7 +168,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>
@@ -180,11 +180,11 @@
<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">
- <td align="center" width="20%">鐗╂枡鍗曚綅</td>
+ <td align="center" width="20%">鍩烘湰鍗曚綅</td>
<td align="center" width="80%">xxxxxxxx</td>
</tr>
<tr style="height: 75px;">
@@ -202,7 +202,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%">
@@ -212,7 +212,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
+ <td align="center" colspan="1">鍩烘湰鍗曚綅</td>
<td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">xxxxxxx</td>
</tr>
</table>
@@ -238,7 +238,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">
@@ -247,7 +247,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>
@@ -260,11 +260,11 @@
{{#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">
- <td align="center" width="20%">鐗╂枡鍗曚綅</td>
+ <td align="center" width="20%">鍩烘湰鍗曚綅</td>
<td align="center" width="80%">{{this.str1}}</td>
</tr>
<tr style="height: 79px;">
@@ -283,7 +283,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;
@@ -306,7 +306,7 @@
</td>
</tr>
<tr style="height: 74px">
- <td align="center" colspan="1">鐗╂枡鍗曚綅</td>
+ <td align="center" colspan="1">鍩烘湰鍗曚綅</td>
<td align="center" colspan="1" style="overflow:hidden; white-space:nowrap; text-overflow:ellipsis;">{{this.str1}}</td>
</tr>
</table>
diff --git a/src/main/webapp/views/matCode/matCode_detail.html b/src/main/webapp/views/matCode/matCode_detail.html
index 146c560..0052667 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,19 +36,19 @@
</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>
</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="str1" class="layui-input" type="text">
</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/operateLog/operateLog_detail.html b/src/main/webapp/views/operateLog/operateLog_detail.html
index 73ccb9f..94b8bb0 100644
--- a/src/main/webapp/views/operateLog/operateLog_detail.html
+++ b/src/main/webapp/views/operateLog/operateLog_detail.html
@@ -40,9 +40,9 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>瀹㈡埛绔疘P锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>搴撲綅鍚嶇О绔疘P锛�</label>
<div class="layui-input-inline">
- <input id="ip" class="layui-input" type="text" placeholder="瀹㈡埛绔疘P" lay-verify="required" >
+ <input id="ip" class="layui-input" type="text" placeholder="搴撲綅鍚嶇О绔疘P" lay-verify="required" >
</div>
</div>
<div class="layui-inline" style="width:31%;">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 04c577a..7ba5f5f 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -52,12 +52,12 @@
</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">
<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/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index 798b065..1b1f7ce 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -51,12 +51,12 @@
</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">
<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>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -141,14 +141,8 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
- form.on('checkbox(tableCheckbox)', function (data) {
- var _index = $(data.elem).attr('table-index')||0;
- if(data.elem.checked){
- res.data[_index][data.value] = 'Y';
- }else{
- res.data[_index][data.value] = 'N';
- }
- });
+ $('.layui-form-checkbox').css("pointer-events", "none");
+ $('td[data-field="0').css("cursor", "pointer")
}
});
@@ -162,6 +156,26 @@
layer.msg("璇烽�夋嫨鏁版嵁");
return;
}
+ var locNos = [];
+ data.forEach(function(elem) {
+ locNos.push(elem.locNo);
+ });
+ $.ajax({
+ url: baseUrl+"/locDetl/auth",
+ headers: {'token': localStorage.getItem('token')},
+ data: {locNos:locNos},
+ method: 'POST',
+ async: false,
+ success: function (res) {
+ if (res.code === 200) {
+ data = res.data;
+ } else if (res.code === 403) {
+ top.location.href = baseUrl + "/";
+ } else {
+ layer.msg(res.msg)
+ }
+ }
+ })
parent.addTableData(data);
break;
}
@@ -187,6 +201,20 @@
});
})
+ var b = true;
+ $(function(){
+ $(document.body).on('click','td[data-field="0"]',function(){
+ var locNo = $(this).next().children("div").html();
+ if (b) {
+ b = false;
+ $("tr td[data-field=locNo\\$] div:contains("+ locNo +")").parent().prev().children().children("div").click();
+ setTimeout(function () {
+ b = true;
+ }, 200)
+ }
+ });
+ })
+
function tableReload(child) {
var searchData = {};
$.each($('#search-box [name]').serializeArray(), function() {
@@ -202,15 +230,8 @@
top.location.href = baseUrl+"/";
}
pageCurr=curr;
- if (res.data.length === 0 && count !== 0) {
- locDetlTableIns.reload({
- where: searchData,
- page: {
- curr: pageCurr-1
- }
- });
- pageCurr -= 1;
- }
+ $('.layui-form-checkbox').css("pointer-events", "none");
+ $('td[data-field="0').css("cursor", "pointer")
}
});
}
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index ebe1d3f..7086f9d 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>
<!-- 鏃ユ湡鑼冨洿 -->
@@ -85,7 +85,7 @@
var layer = layui.layer;
var layDate = layui.laydate;
var form = layui.form;
- // 鐗╂枡鏌ヨ鏁版嵁琛�
+ // 浜у搧鏌ヨ鏁版嵁琛�
matQueryTable = table.render({
elem: '#matCode',
headers: {token: localStorage.getItem('token')},
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index c3931c3..5d0dddb 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) {
}
@@ -77,7 +77,7 @@
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鎻愬彇鐗╂枡',
+ title: '鎻愬彇浜у搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
@@ -131,7 +131,7 @@
return;
}
if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
+ tips("璇锋彁鍙栦骇鍝�", true);
return;
}
$.ajax({
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 1ec5114..dfdef87 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..677bf14 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, target-densitydpi=high-dpi, initial-scale=1.0, user-scalable=no"/>
- <title>鐗╂枡鎻愬彇</title>
+ <title>浜у搧鎻愬彇</title>
<link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
@@ -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..ccc4650 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) {
@@ -160,12 +160,12 @@
})
}
- // 鎻愬彇鐗╂枡
+ // 鎻愬彇浜у搧
var matCodeLayerIdx;
function getMat() {
matCodeLayerIdx = layer.open({
type: 2,
- title: '鐗╂枡',
+ title: '浜у搧',
shade: [0.3,'#000'],
area: ['90%', '80%'],
content: 'matQuery.html',
@@ -221,7 +221,7 @@
return;
}
if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
+ tips("璇锋彁鍙栦骇鍝�", true);
return;
}
// var site = $('input:radio[name="site"]:checked').next("span").html();
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 87a39e0..9df140b 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -31,7 +31,7 @@
</div>
<div class="layui-input-inline">
- <label class="layui-form-label">鐗╂枡</label>
+ <label class="layui-form-label">浜у搧</label>
<div class="layui-input-block">
<input class="layui-input" type="text" id="matNo" onkeyup="findByMatNo(this)" autocomplete="off">
</div>
@@ -77,7 +77,7 @@
}
/**
- * 鏍规嵁鐗╂枡鍙锋煡鎵惧簱瀛樻槑缁�
+ * 鏍规嵁浜у搧鍙锋煡鎵惧簱瀛樻槑缁�
*/
function findByMatNo(el){
if (isEmpty(el.value)) {
@@ -196,7 +196,7 @@
function pakOut() {
var tableData = layui.table.checkStatus('tableIdx').data;
if (tableData.length === 0) {
- tips("璇烽�夋嫨鐗╂枡", true);
+ tips("璇烽�夋嫨浜у搧", true);
return;
}
var site = $('#staNoSelect').val();
diff --git a/src/main/webapp/views/pdaCe/index.html b/src/main/webapp/views/pdaCe/index.html
index ae2e4cb..00350a5 100644
--- a/src/main/webapp/views/pdaCe/index.html
+++ b/src/main/webapp/views/pdaCe/index.html
@@ -119,7 +119,7 @@
<input type="text" id="code">
</div>
<div>
- <span>鐗╂枡</span>
+ <span>浜у搧</span>
<input type="text" id="matNo" onkeyup="find(this)" autocomplete="off">
<button onclick="find()">鏌ヨ</button>
</div>
@@ -239,7 +239,7 @@
return;
}
if (matData.length === 0) {
- tips("璇锋彁鍙栫墿鏂�", true);
+ tips("璇锋彁鍙栦骇鍝�", true);
return;
}
httpRequest({
@@ -487,7 +487,7 @@
function help() {
window.alert("鈶� 鎸塅1杈撳叆鏉＄爜\n" +
- "鈶� 鎸塅2杈撳叆鐗╂枡鍙凤紝鎸塃NTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
+ "鈶� 鎸塅2杈撳叆浜у搧鍙凤紝鎸塃NTER鏌ヨ锛岄�夋嫨鏁伴噺鍚庢彁鍙朶n" +
"鈶� 鎸塅3寮�濮嬬粍鎵榎n" +
"鍏跺畠锛氭寜F5鍒锋柊椤甸潰");
}
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 020c173..1a2d10c 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..6828e88 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/stoMan/stoQue.html b/src/main/webapp/views/stoMan/stoQue.html
index 936047c..adc66c0 100644
--- a/src/main/webapp/views/stoMan/stoQue.html
+++ b/src/main/webapp/views/stoMan/stoQue.html
@@ -60,7 +60,7 @@
<!--鏄庣粏琛�-->
<div id="detlTable" style="display: none">
<div class="layui-inline" style="width:90%;margin-top: 10px;margin-left: 20px">
- <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅簱浣嶇殑鐗╂枡鏄庣粏</span>
+ <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅簱浣嶇殑浜у搧鏄庣粏</span>
</div>
<table class="layui-hide" id="locDetlByMap" lay-filter="locDetlByMap"></table>
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 2629772..0211803 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..0086f2f 100644
--- a/src/main/webapp/views/waitPakin/waitPakin_detail.html
+++ b/src/main/webapp/views/waitPakin/waitPakin_detail.html
@@ -36,13 +36,13 @@
</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>
</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="maktx" 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..25b198c 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html
@@ -42,13 +42,13 @@
</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>
</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="maktx" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
index d4703a4..8869010 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl_detail.html
@@ -52,13 +52,13 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>鐗╂枡鏍囩ID锛�</label>
+ <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>浜у搧鏍囩ID锛�</label>
<div class="layui-input-inline">
<input id="zmatid" class="layui-input" type="text" lay-verify="required" >
</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="maktx" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
index 72bf6f1..a614eec 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog_detail.html
@@ -36,7 +36,7 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label"><span class="not-null">*</span>鐗╂枡缂栧彿锛�</label>
+ <label class="layui-form-label"><span class="not-null">*</span>浜у搧缂栧彿锛�</label>
<div class="layui-input-inline">
<input id="matnr" class="layui-input" type="text" lay-verify="required" >
</div>
@@ -60,13 +60,13 @@
</div>
</div>
<div class="layui-inline" style="width:31%;">
- <label class="layui-form-label" style="font-size: x-small">鐗╂枡鏍囩ID锛�</label>
+ <label class="layui-form-label" style="font-size: x-small">浜у搧鏍囩ID锛�</label>
<div class="layui-input-inline">
<input id="zmatid" class="layui-input" type="text">
</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="maktx" class="layui-input" type="text">
</div>
diff --git a/src/main/webapp/views/wrkMast/wrkMast.html b/src/main/webapp/views/wrkMast/wrkMast.html
index cc13271..d9a509d 100644
--- a/src/main/webapp/views/wrkMast/wrkMast.html
+++ b/src/main/webapp/views/wrkMast/wrkMast.html
@@ -106,7 +106,7 @@
<!--鏄庣粏琛�-->
<div id="detlTable" style="display: none">
<div class="layui-inline" style="width:90%;margin-top: 10px;margin-left: 20px">
- <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅伐浣滄祦鐨勭墿鏂欐槑缁�</span>
+ <span style=" color: indianred">浠ヤ笅涓哄綋鍓嶅伐浣滄祦鐨勪骇鍝佹槑缁�</span>
</div>
<table class="layui-hide" id="wrkDetlByMap" lay-filter="wrkDetlByMap"></table>
--
Gitblit v1.9.1