From 65d4a072e6a382b9583cae85d5c6e59685c2c1c5 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@63.com>
Date: 星期二, 13 十二月 2022 16:39:01 +0800
Subject: [PATCH] #
---
src/main/webapp/views/locDetl/locDetl.html | 2
src/main/webapp/views/pda/stockIn.html | 2
src/main/java/com/zy/asrs/entity/DocLog.java | 6
src/main/webapp/views/locDetlStatis/locDetlStatis.html | 2
src/main/resources/mapper/LocDetlMapper.xml | 2
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/java/com/zy/asrs/service/OrderDetlService.java | 2
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 6 -
src/main/java/com/zy/asrs/entity/Mat.java | 8
src/main/java/com/zy/asrs/entity/WrkDetl.java | 2
src/main/webapp/static/js/common.js | 8
src/main/webapp/static/js/report/workCountIn.js | 2
src/main/webapp/views/pack/pack.html | 2
src/main/java/com/zy/asrs/entity/OrderDetl.java | 4
src/main/java/com/zy/asrs/service/LocDetlService.java | 2
src/main/java/com/zy/common/service/erp/task/ErpScheduler.java | 77 ++++++++++----
src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java | 2
src/main/webapp/views/report/viewWorkIn.html | 2
src/main/webapp/views/pakStore/matQuery.html | 2
src/main/webapp/views/pda/locDetlIframe.html | 2
src/main/webapp/views/report/viewWorkCountIn.html | 2
src/main/webapp/views/pda/matQuery.html | 2
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 4
src/main/webapp/static/js/order/order.js | 4
src/main/webapp/views/order/out.html | 4
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 4
src/main/java/com/zy/asrs/entity/AdjDetl.java | 4
src/main/webapp/static/js/pack/pack.js | 2
src/main/java/com/zy/asrs/utils/MatExcelListener.java | 2
src/main/webapp/views/mat/mat.html | 8
src/main/webapp/views/pakStore/locDetlQuery.html | 2
src/main/webapp/views/pda/comb.html | 2
src/main/java/com/zy/common/web/WcsController.java | 17 ++
src/main/webapp/static/js/orderDetl/orderDetl.js | 2
src/main/webapp/views/order/order.html | 2
src/main/webapp/static/js/order/out.js | 4
src/main/java/com/zy/asrs/entity/param/StockOutParam.java | 2
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/java/com/zy/asrs/entity/ViewWorkInBean.java | 2
src/main/webapp/views/waitPakinLog/waitPakinLog_detail.html | 2
src/main/java/com/zy/asrs/entity/Pack.java | 6
src/main/java/com/zy/asrs/entity/WrkDetlLog.java | 2
src/main/webapp/static/js/report/workCountOut.js | 2
src/main/java/com/zy/asrs/controller/OrderController.java | 2
src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java | 6
src/main/webapp/static/js/locDetl/locDetl.js | 2
src/main/webapp/views/waitPakin/waitPakin_detail.html | 2
src/main/webapp/views/report/viewWorkCountOut.html | 2
src/main/java/com/zy/asrs/entity/MatCodePrint.java | 2
src/main/java/com/zy/asrs/entity/WaitPakin.java | 2
src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java | 2
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2
src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java | 21 ++--
src/main/webapp/views/orderDetl/orderDetl.html | 2
src/main/webapp/views/waitPakin/waitPakin.html | 2
src/main/java/com/zy/common/model/MesPakoutParam.java | 18 ---
57 files changed, 153 insertions(+), 134 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OrderController.java b/src/main/java/com/zy/asrs/controller/OrderController.java
index 4ccd232..da6c2d0 100644
--- a/src/main/java/com/zy/asrs/controller/OrderController.java
+++ b/src/main/java/com/zy/asrs/controller/OrderController.java
@@ -443,7 +443,7 @@
String uuid = dataFormatter.formatCellValue(row.getCell(0));
// 鐗╂枡鍙�
String maktx = dataFormatter.formatCellValue(row.getCell(1));
- // 鍗曟嵁鍙�
+ // 鐗╂枡鍙�
String matnr = dataFormatter.formatCellValue(row.getCell(2));
// 鏁伴噺
Double anfme = Double.parseDouble(dataFormatter.formatCellValue(row.getCell(3)));
diff --git a/src/main/java/com/zy/asrs/entity/AdjDetl.java b/src/main/java/com/zy/asrs/entity/AdjDetl.java
index 3dc0dc0..c76f4be 100644
--- a/src/main/java/com/zy/asrs/entity/AdjDetl.java
+++ b/src/main/java/com/zy/asrs/entity/AdjDetl.java
@@ -38,9 +38,9 @@
private String locNo;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
diff --git a/src/main/java/com/zy/asrs/entity/DocLog.java b/src/main/java/com/zy/asrs/entity/DocLog.java
index d5bd63b..08204c0 100644
--- a/src/main/java/com/zy/asrs/entity/DocLog.java
+++ b/src/main/java/com/zy/asrs/entity/DocLog.java
@@ -46,9 +46,9 @@
private String docName;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
@@ -94,7 +94,7 @@
// null, // 鍗曟嵁缂栧彿
// null, // 鍗曟嵁绫诲瀷
// null, // 鍗曟嵁鍚嶇О
-// null, // 鍗曟嵁鍙�
+// null, // 鐗╂枡鍙�
// null, // 涓婃姤鏁伴噺
// null, // 缁撴灉
// null, // 涓婃姤鏃堕棿
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index be9a529..47dd290 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -35,8 +35,8 @@
@ExcelProperty("鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- @ExcelProperty("鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty("鐗╂枡鍙�")
private String matnr;
@ApiModelProperty(value= "鐗╂枡鍙�")
diff --git a/src/main/java/com/zy/asrs/entity/Mat.java b/src/main/java/com/zy/asrs/entity/Mat.java
index 1ce8414..f81ea9c 100644
--- a/src/main/java/com/zy/asrs/entity/Mat.java
+++ b/src/main/java/com/zy/asrs/entity/Mat.java
@@ -56,10 +56,10 @@
private Long tagId;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
- @ExcelProperty(value = "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
+ @ExcelProperty(value = "鐗╂枡鍙�")
private String matnr;
@@ -351,7 +351,7 @@
// Mat mat = new Mat(
// 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 3e7848e..124c618 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;
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java
index 05abc92..aafcf23 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetl.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java
@@ -62,9 +62,9 @@
private Double qty;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
diff --git a/src/main/java/com/zy/asrs/entity/Pack.java b/src/main/java/com/zy/asrs/entity/Pack.java
index b00ade2..60eef82 100644
--- a/src/main/java/com/zy/asrs/entity/Pack.java
+++ b/src/main/java/com/zy/asrs/entity/Pack.java
@@ -43,9 +43,9 @@
private String barcode;
/**
- * 鍗曟嵁鍙�
+ * 鐗╂枡鍙�
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
@@ -119,7 +119,7 @@
// Pack pack = new Pack(
// null, // 鏉＄爜[闈炵┖]
-// null, // 鍗曟嵁鍙�
+// null, // 鐗╂枡鍙�
// null, // 搴忓垪鐮�
// null, // 璁㈠崟鐘舵��
// null, // 鐘舵��
diff --git a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
index 6e6aafd..0e9b6ab 100644
--- a/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewStayTimeBean.java
@@ -38,7 +38,7 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
@ApiModelProperty(value= "鐗╂枡鍙�")
diff --git a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
index 8e5416a..ec3c79a 100644
--- a/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
+++ b/src/main/java/com/zy/asrs/entity/ViewWorkInBean.java
@@ -48,7 +48,7 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
@ApiModelProperty(value= "鐗╂枡鍙�")
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index 93e57dc..5692c8d 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -27,7 +27,7 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
@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 b62b226..4d1eafc 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
@@ -26,7 +26,7 @@
@TableField("loc_no")
private String locNo;
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
@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 3a7806c..ae755c0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetl.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetl.java
@@ -49,7 +49,7 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
diff --git a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
index 05fc954..c283e3d 100644
--- a/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkDetlLog.java
@@ -48,7 +48,7 @@
/**
* 鐗╂枡
*/
- @ApiModelProperty(value= "鍗曟嵁鍙�")
+ @ApiModelProperty(value= "鐗╂枡鍙�")
private String matnr;
/**
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 5108e8b..c654988 100644
--- a/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/LocDetlAdjustParam.java
@@ -21,7 +21,7 @@
@Data
public static class LocDetlAdjust {
- // 鍗曟嵁鍙�
+ // 鐗╂枡鍙�
private String matnr;
// 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
index 5074631..e864f9b 100644
--- a/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/StockOutParam.java
@@ -22,7 +22,7 @@
// 搴撲綅鍙�
private String locNo;
- // 鍗曟嵁鍙�
+ // 鐗╂枡鍙�
private String matnr;
// 搴忓垪鐮�
diff --git a/src/main/java/com/zy/asrs/service/LocDetlService.java b/src/main/java/com/zy/asrs/service/LocDetlService.java
index 42b8a96..4acbc45 100644
--- a/src/main/java/com/zy/asrs/service/LocDetlService.java
+++ b/src/main/java/com/zy/asrs/service/LocDetlService.java
@@ -30,7 +30,7 @@
/**
* 鑾峰彇褰撳ぉ鐩稿悓瑙勬牸璐х墿鐨勬繁搴撲綅鍙�
- * @param matnr 鍗曟嵁鍙�
+ * @param matnr 鐗╂枡鍙�
* @return locNo 搴撲綅鍙�
*/
List<String> getSameDetlToday(String matnr, Integer start, Integer end);
diff --git a/src/main/java/com/zy/asrs/service/OrderDetlService.java b/src/main/java/com/zy/asrs/service/OrderDetlService.java
index 12e102e..cf82d5d 100644
--- a/src/main/java/com/zy/asrs/service/OrderDetlService.java
+++ b/src/main/java/com/zy/asrs/service/OrderDetlService.java
@@ -28,6 +28,6 @@
List<OrderDetl> selectRemainder(Long orderId);
- OrderDetl selectByMatnr(String matnr);
+ OrderDetl selectContainBatch(String batch);
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index e6aef59..ff23ab5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -337,7 +337,7 @@
Date now = new Date();
pack = new Pack(
param.getBarcode(), // 鏉＄爜[闈炵┖]
- analyse.getMatnr(), // 鍗曟嵁鍙�
+ analyse.getMatnr(), // 鐗╂枡鍙�
analyse.getBarcode(), // 搴忓垪鐮�
1L, // 璁㈠崟鐘舵��
1, // 鐘舵��
@@ -433,7 +433,7 @@
if (!matService.insert(mat)) {
throw new CoolException("鏈嶅姟鍣ㄥ唴閮ㄩ敊璇紝璇疯仈绯荤鐞嗗憳");
} else {
- log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鍗曟嵁鍙凤細{}]", mat.getMatnr());
+ log.info("鎵撳寘涓婄嚎娣诲姞鏂扮墿鏂橻鐗╂枡鍙凤細{}]", mat.getMatnr());
}
}
}
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
index aa0f93e..db0b708 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderDetlServiceImpl.java
@@ -81,16 +81,17 @@
}
@Override
- public OrderDetl selectByMatnr(String matnr) {
- List<OrderDetl> orderDetls = this.baseMapper.selectByMatnr(matnr);
- if (!Cools.isEmpty(orderDetls)) {
- if (orderDetls.size() > 1) {
- log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
- } else {
- return orderDetls.get(0);
- }
- }
- return null;
+ public OrderDetl selectContainBatch(String batch) {
+ OrderDetl orderDetl = this.selectOne(new EntityWrapper<OrderDetl>().like("batch", batch));
+ return orderDetl;
+// if (!Cools.isEmpty(orderDetls)) {
+// if (orderDetls.size() > 1) {
+// log.error("{}鏉＄爜鍚屾椂瀛樺湪澶氱瑪璁㈠崟锛岃娉ㄦ剰鏌ョ湅锛�", matnr);
+// } else {
+// return orderDetls.get(0);
+// }
+// }
+// return null;
}
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 a002055..d18b33a 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -951,11 +951,7 @@
@Override
public StartupDto createWaitPainWrkMastStart(List<WaitPakin> list, Long userId) {
- if (Cools.isEmpty(list)) {
- throw new CoolException("鍏ュ簱閫氱煡妗ｄ笉鑳戒负绌�");
- }
- LocTypeDto locTypeDto = new LocTypeDto();
- return wcsController.startupFullPutStore(301, list.get(0).getZpallet(), locTypeDto, null);
+ return null;
}
@Override
diff --git a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
index 6b98436..3ad331c 100644
--- a/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/WorkLogHandler.java
@@ -74,16 +74,16 @@
if (!Cools.isEmpty(wrkDetls)) {
for (WrkDetl wrkDetl : wrkDetls) {
// Goods 琛�
- Goods goods = erpService.selectGoodsOne(wrkDetl.getMatnr());
+ Goods goods = erpService.selectGoodsOne(wrkDetl.getBatch());
if (!Cools.isEmpty(goods)) {
if (!erpService.updateStateAndLocForGoods(goods.getBarCode(), 3, wrkMast.getLocNo())) {
log.error("{}鏉＄爜鍦╡rp鏁版嵁搴撲腑鏇存柊澶辫触锛�", goods.getBarCode());
}
} else {
- log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getMatnr());
+ log.error("{}鏉＄爜涓嶅湪erp鏁版嵁搴撲腑锛�", wrkDetl.getBatch());
}
// OrderDetl 琛�
- OrderDetl orderDetl = orderDetlService.selectByMatnr(wrkDetl.getMatnr());
+ OrderDetl orderDetl = orderDetlService.selectContainBatch(wrkDetl.getMatnr());
if (!Cools.isEmpty(orderDetl)) {
Order order = orderService.selectById(orderDetl.getOrderId());
DocType docType = docTypeService.selectById(order.getDocType());
diff --git a/src/main/java/com/zy/asrs/utils/MatExcelListener.java b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
index e2e7ebd..a16e06d 100644
--- a/src/main/java/com/zy/asrs/utils/MatExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/MatExcelListener.java
@@ -132,7 +132,7 @@
mat = excel;
mat.setTagId(tagId);
if (!matService.insert(mat)) {
- throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛屽崟鎹彿锛�" + excel.getMatnr());
+ throw new CoolException("淇濆瓨鍟嗗搧淇℃伅澶辫触锛岀墿鏂欏彿锛�" + excel.getMatnr());
}
total++;
}
diff --git a/src/main/java/com/zy/common/model/MesPakoutParam.java b/src/main/java/com/zy/common/model/MesPakoutParam.java
index 2b76e0d..5abc005 100644
--- a/src/main/java/com/zy/common/model/MesPakoutParam.java
+++ b/src/main/java/com/zy/common/model/MesPakoutParam.java
@@ -1,11 +1,8 @@
package com.zy.common.model;
-import com.alibaba.fastjson.JSON;
-import com.core.common.DateUtils;
import lombok.Data;
import java.util.ArrayList;
-import java.util.Date;
import java.util.List;
/**
@@ -52,20 +49,5 @@
}
}
- public static void main(String[] args) {
- MesPakoutParam param = new MesPakoutParam();
- param.setTag(true);
- param.setOrderNo("8135998");
- param.setPakoutTime(DateUtils.convert(new Date()));
- param.setLgortFrom("5006");
- param.setLgortTo("1111");
-
-
- Detl detl = new Detl(); param.getList().add(detl);
- detl.setBarcode("1100146-10000-23132132");
- detl.setAnfme(1.0D);
-
- System.out.println(JSON.toJSONString(param));
- }
}
diff --git a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
index 790f9ea..499fda5 100644
--- a/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
+++ b/src/main/java/com/zy/common/service/erp/task/ErpScheduler.java
@@ -56,12 +56,12 @@
Date now = new Date();
if (!Cools.isEmpty(goods)) {
for (Goods good : goods) {
- Mat mat = matService.selectByMatnr(good.getBarCode());
+ Mat mat = matService.selectByMatnr(good.getMaterialNO());
if (mat == null) {
mat = new Mat();
mat.setTagId(top.getId());
- mat.setMatnr(good.getBarCode());
- mat.setMaktx(good.getMaterialNO());
+ mat.setMatnr(good.getMaterialNO());
+// mat.setMaktx(good.getBarCode());
mat.setSpecs(good.getProdSpec());
mat.setModel(good.getBatch());
mat.setWeight(good.getNWT());
@@ -144,30 +144,61 @@
if (!orderService.insert(order)) {
throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁涓绘。澶辫触锛岃鑱旂郴绠＄悊鍛�");
}
- for (VoucherDetail detail : dto.getDetails()) {
- Mat mat = matService.selectByMatnr(detail.getBarcode());
- if (mat == null) {
- throw new CoolException(detail.getBarcode() + "鍗曟嵁鍙蜂笉瀛樺湪");
- }
- OrderDetl orderDetl = new OrderDetl();
- orderDetl.sync(mat);
-// orderDetl.setBatch(detlDto.getBatch());
- orderDetl.setAnfme(1.0D);
- orderDetl.setOrderId(order.getId());
- orderDetl.setOrderNo(order.getOrderNo());
- orderDetl.setCreateBy(9527L);
- orderDetl.setCreateTime(now);
- orderDetl.setUpdateBy(9527L);
- orderDetl.setUpdateTime(now);
- orderDetl.setStatus(1);
- orderDetl.setQty(0.0D);
- if (!orderDetlService.insert(orderDetl)) {
- throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
- }
+ Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+ if (mat == null) {
+ throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
}
+ OrderDetl orderDetl = new OrderDetl();
+ orderDetl.sync(mat);
+ StringBuilder sb = new StringBuilder();
+ if (!Cools.isEmpty(dto.getDetails())) {
+ for (VoucherDetail detail : dto.getDetails()) {
+ sb.append(detail.getBarcode()).append(",");
+ }
+ orderDetl.setBatch(sb.toString());
+ }
+ orderDetl.setAnfme(voucher.getExpectedWeight());
+ orderDetl.setOrderId(order.getId());
+ orderDetl.setOrderNo(order.getOrderNo());
+ orderDetl.setCreateBy(9527L);
+ orderDetl.setCreateTime(now);
+ orderDetl.setUpdateBy(9527L);
+ orderDetl.setUpdateTime(now);
+ orderDetl.setStatus(1);
+ orderDetl.setQty(0.0D);
+ if (!orderDetlService.insert(orderDetl)) {
+ throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+ }
+
+// else {
+// for (VoucherDetail detail : dto.getDetails()) {
+//
+// Mat mat = matService.selectByMatnr(voucher.getMaterialNO());
+// if (mat == null) {
+// throw new CoolException(voucher.getMaterialNO() + "鐗╂枡鍙蜂笉瀛樺湪");
+// }
+//
+// OrderDetl orderDetl = new OrderDetl();
+// orderDetl.sync(mat);
+//// orderDetl.setBatch(detlDto.getBatch());
+// orderDetl.setAnfme(1.0D);
+// orderDetl.setOrderId(order.getId());
+// orderDetl.setOrderNo(order.getOrderNo());
+// orderDetl.setCreateBy(9527L);
+// orderDetl.setCreateTime(now);
+// orderDetl.setUpdateBy(9527L);
+// orderDetl.setUpdateTime(now);
+// orderDetl.setStatus(1);
+// orderDetl.setQty(0.0D);
+// if (!orderDetlService.insert(orderDetl)) {
+// throw new CoolException(order.getOrderNo() + "鐢熸垚鍗曟嵁鏄庣粏澶辫触锛岃鑱旂郴绠＄悊鍛�");
+// }
+// }
+// }
+
// erp 鍚屾
int state = 1;
if (!erpService.updateStateForVoucher(voucher.getVoucherID(), state)) {
diff --git a/src/main/java/com/zy/common/web/WcsController.java b/src/main/java/com/zy/common/web/WcsController.java
index ca4de1f..008c2de 100644
--- a/src/main/java/com/zy/common/web/WcsController.java
+++ b/src/main/java/com/zy/common/web/WcsController.java
@@ -9,6 +9,8 @@
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.StartupDto;
import com.zy.common.service.CommonService;
+import com.zy.common.service.erp.ErpService;
+import com.zy.common.service.erp.entity.Goods;
import com.zy.common.web.param.SearchLocParam;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -44,6 +46,8 @@
private LocDetlService locDetlService;
@Autowired
private MatService matService;
+ @Autowired
+ private ErpService erpService;
@PostMapping("/pakin/loc/v1")
@ResponseBody
@@ -60,9 +64,13 @@
if (Cools.isEmpty(param.getBarcode())) {
return R.error("鏉＄爜涓嶈兘涓虹┖");
}
- mat = matService.selectByMatnr(param.getBarcode());
+ Goods goods = erpService.selectGoodsOne(param.getBarcode());
+ if (Cools.isEmpty(goods)) {
+ return R.error(param.getBarcode() + "鏉＄爜涓嶅瓨鍦紝璇锋鏌RP鏁版嵁锛�");
+ }
+ mat = matService.selectByMatnr(goods.getMaterialNO());
if (Cools.isEmpty(mat)) {
- return R.error(param.getBarcode() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
+ return R.error(goods.getMaterialNO() + "鏉＄爜鍟嗗搧璧勬枡涓嶅瓨鍦紝璇峰厛娣诲姞锛�");
}
// waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()));
// if (Cools.isEmpty(waitPakins)) {
@@ -90,7 +98,7 @@
switch (param.getIoType()) {
case 1://婊℃墭鐩樺叆搴�
assert mat != null;
- dto = startupFullPutStore(param.getSourceStaNo(), null, locTypeDto, mat);
+ dto = startupFullPutStore(param.getSourceStaNo(), param.getBarcode(), locTypeDto, mat);
break;
case 10://绌烘墭鐩樺叆搴�
dto = emptyPlateIn(param.getSourceStaNo(), locTypeDto, null);
@@ -117,7 +125,7 @@
BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
// 妫�绱㈠簱浣�
List<Mat> mats = Collections.singletonList(mat);
- List<String> matnrList = mats.stream().map(Mat::getMaktx).distinct().collect(Collectors.toList());
+ List<String> matnrList = mats.stream().map(Mat::getMatnr).distinct().collect(Collectors.toList());
StartupDto dto = commonService.getLocNo(1, 1, devpNo, matnrList, locTypeDto,0);
int workNo = dto.getWorkNo();
Date now = new Date();
@@ -152,6 +160,7 @@
WrkDetl wrkDetl = new WrkDetl();
wrkDetl.sync(mat);
wrkDetl.setAnfme(mat.getWeight());
+ wrkDetl.setBatch(barcode);
// wrkDetl.setAnfme(1.0D);
wrkDetl.setWrkNo(wrkMast.getWrkNo());
wrkDetl.setIoTime(wrkMast.getIoTime());
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index e9c9466..aa3488a 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -314,7 +314,7 @@
group by loc_no
) dual on dual.loc_no = lm.loc_no
WHERE 1 = 1
- AND ld.maktx = #{matnr}
+ AND ld.matnr = #{matnr}
AND (lm.row1 >= #{start} AND lm.row1 <= #{end})
AND (lm.loc_sts = 'F')
AND dual.count = 1
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index ba2856e..299230f 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -22,7 +22,7 @@
// ,{field: 'id', title: 'ID', sort: true,align: 'center', fixed: 'left', width: 80}
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 101c3fb..945ee0f 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,9 +181,9 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 180}
+ {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 180}
,{field: 'name', align: 'center',title: '绉诲姩绫诲瀷'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 150}
+ // ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 150}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鎵规', hide: false}
,{field: 'manuDate', align: 'center',title: '鍗曟嵁鏃堕棿', hide: false}
@@ -220,9 +220,9 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 180}
+ {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 180}
,{field: 'name', align: 'center',title: '绉诲姩绫诲瀷'}
- ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
+ // ,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
,{field: 'model', align: 'center',title: '鎵规', hide: true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index c071769..34bdbae 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', sort:true}
+ {field: 'matnr', align: 'center',title: '鐗╂枡鍙�', sort:true}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', width: 300, sort:true}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index d0178b6..9b5476b 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -129,7 +129,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: '鍗曟嵁鍙�', width: 160},
+ {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
{field: 'maktx', title: '鐗╂枡鍙�', width: 160},
{field: 'batch', title: '搴忓垪鐮�'},
{field: 'anfme', title: '鏁伴噺'},
@@ -236,7 +236,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: '鍗曟嵁鍙�', width: 160},
+ {field: 'matnr', title: '鐗╂枡鍙�', width: 160},
{field: 'maktx', title: '鐗╂枡鍙�', width: 200},
{field: 'batch', title: '搴忓垪鐮�', edit: true},
{field: 'specs', title: '瑙勬牸'},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index a96fd48..dbb2dad 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -32,7 +32,7 @@
{type: 'checkbox'}
,{type: 'numbers', title: '#'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', width: 160}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', width: 160}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
@@ -385,7 +385,7 @@
cellMinWidth: 100,
cols: [[
{type: 'checkbox'},
- {field: 'matnr', title: '鍗曟嵁鍙�', align: 'center', width: 350},
+ {field: 'matnr', title: '鐗╂枡鍙�', align: 'center', width: 350},
{field: 'maktx', title: '鐗╂枡鍙�', align: 'center'},
{field: 'specs', title: '瑙勬牸', align: 'center'},
{field: 'batch', title: '鎵瑰彿', align: 'center'},
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 1117f77..1a0cb04 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -25,7 +25,7 @@
,{field: 'id', align: 'center',title: 'ID'}
,{field: 'orderId$', align: 'center',title: '璁㈠崟鍐呯爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index 4ecb8c4..76d9fca 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -24,7 +24,7 @@
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�', minWidth: 250, width: 250}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�', minWidth: 250, width: 250}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index f52174e..819e115 100644
--- a/src/main/webapp/static/js/report/workCountIn.js
+++ b/src/main/webapp/static/js/report/workCountIn.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/report/workCountOut.js b/src/main/webapp/static/js/report/workCountOut.js
index ed0ee3c..b5a0798 100644
--- a/src/main/webapp/static/js/report/workCountOut.js
+++ b/src/main/webapp/static/js/report/workCountOut.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'oneday', align: 'center', title: '鍏ュ簱鏃ユ湡', width: 200}
- ,{field: 'matnr', align: 'center',title: '鍗曟嵁鍙�'}
+ ,{field: 'matnr', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'maktx', align: 'center',title: '鐗╂枡鍙�'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index bd570e8..8ddbe26 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -26,7 +26,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/locDetlStatis/locDetlStatis.html b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
index f87358d..38f95af 100644
--- a/src/main/webapp/views/locDetlStatis/locDetlStatis.html
+++ b/src/main/webapp/views/locDetlStatis/locDetlStatis.html
@@ -16,7 +16,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<!-- 寰呮坊鍔� -->
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 128f3c5..f5b5767 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -86,7 +86,7 @@
<!-- 琛ㄦ牸宸ュ叿鏍�2 -->
<div id="search-box" class="layui-form toolbar" style="padding-top: 5px">
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鍗曟嵁鍙�:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鐗╂枡鍙�:</label>
<div class="layui-input-inline">
<input name="matnr" class="layui-input" placeholder="杈撳叆鍟嗗搧缂栧彿"/>
</div>
@@ -228,7 +228,7 @@
<div class="layui-col-md6">
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">鍗曟嵁鍙�</label>
+ <label class="layui-form-label layui-form-required">鐗╂枡鍙�</label>
<div class="layui-input-block">
<input id="matnr" name="matnr" placeholder="璇疯緭鍏ュ崟鎹彿" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
</div>
@@ -290,7 +290,7 @@
<div id="template-preview-1" class="template-preview" style="display: inline-block">
<table class="contain" width="280" style="overflow: hidden;font-size: xx-small;table-layout: fixed;">
<tr style="height: 74px">
- <td colspan="3" align="center" scope="col">鍗曟嵁鍙�</td>
+ <td colspan="3" align="center" scope="col">鐗╂枡鍙�</td>
<td class="barcode" colspan="9" align="center" scope="col">
<img class="template-code template-barcode" src="" width="90%;">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
@@ -369,7 +369,7 @@
{{#each data}}
<table class="contain" width="280" style="overflow: hidden;font-size: small;table-layout: fixed;">
<tr style="height: 74px">
- <td align="center" colspan="3" scope="col">鍗曟嵁鍙�</td>
+ <td align="center" colspan="3" scope="col">鐗╂枡鍙�</td>
<td align="center" class="barcode" colspan="9" scope="col">
<img class="template-code" src="{{this.barcodeUrl}}" width="90%">
<div style="letter-spacing: 2px;margin-top: 1px; text-align: center">
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 28221e7..299529b 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -261,7 +261,7 @@
<thead>
<tr style="background: none">
<td>No.</td>
- <td>鍗曟嵁鍙�</td>
+ <td>鐗╂枡鍙�</td>
<td>鏁伴噺</td>
</tr>
</thead>
diff --git a/src/main/webapp/views/order/out.html b/src/main/webapp/views/order/out.html
index 3bd1358..4b917b6 100644
--- a/src/main/webapp/views/order/out.html
+++ b/src/main/webapp/views/order/out.html
@@ -98,9 +98,9 @@
<form class="layui-form toolbar">
<div class="layui-form-item">
<div class="layui-inline">
- <label class="layui-form-label">鍗曟嵁鍙�:</label>
+ <label class="layui-form-label">鐗╂枡鍙�:</label>
<div class="layui-input-inline">
- <input name="matnr" class="layui-input" placeholder="鍗曟嵁鍙�"/>
+ <input name="matnr" class="layui-input" placeholder="鐗╂枡鍙�"/>
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index a10a654..ce8f79f 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -82,7 +82,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁鍙�: </label>
+ <label class="layui-form-label">鐗╂枡鍙�: </label>
<div class="layui-input-block">
<input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鐮�">
</div>
diff --git a/src/main/webapp/views/pack/pack.html b/src/main/webapp/views/pack/pack.html
index d90c0e5..aaf76e9 100644
--- a/src/main/webapp/views/pack/pack.html
+++ b/src/main/webapp/views/pack/pack.html
@@ -97,7 +97,7 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曟嵁鍙�: </label>
+ <label class="layui-form-label">鐗╂枡鍙�: </label>
<div class="layui-input-block">
<input class="layui-input" name="matnr" placeholder="璇疯緭鍏ュ晢鍝佺紪鍙�">
</div>
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index 2207764..9245b3f 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -53,7 +53,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pakStore/locDetlQuery.html b/src/main/webapp/views/pakStore/locDetlQuery.html
index aeabb05..c23ef35 100644
--- a/src/main/webapp/views/pakStore/locDetlQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlQuery.html
@@ -53,7 +53,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pakStore/matQuery.html b/src/main/webapp/views/pakStore/matQuery.html
index fa90969..433d45c 100644
--- a/src/main/webapp/views/pakStore/matQuery.html
+++ b/src/main/webapp/views/pakStore/matQuery.html
@@ -30,7 +30,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 3095974..ea35335 100644
--- a/src/main/webapp/views/pda/comb.html
+++ b/src/main/webapp/views/pda/comb.html
@@ -55,7 +55,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍗曟嵁鍙�'},
+ {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
{field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/locDetlIframe.html b/src/main/webapp/views/pda/locDetlIframe.html
index 52bee46..70a1d63 100644
--- a/src/main/webapp/views/pda/locDetlIframe.html
+++ b/src/main/webapp/views/pda/locDetlIframe.html
@@ -79,7 +79,7 @@
<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">
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index f080461..02e31f5 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -77,7 +77,7 @@
<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">
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 8d86b26..0ebaad4 100644
--- a/src/main/webapp/views/pda/stockIn.html
+++ b/src/main/webapp/views/pda/stockIn.html
@@ -120,7 +120,7 @@
cellMinWidth: 50,
cols: [[
{fixed: 'left', align: 'center', field: 'count', title: '鏁伴噺', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: '鍗曟嵁鍙�'},
+ {field: 'matnr', align: 'center', title: '鐗╂枡鍙�'},
{field: 'maktx', align: 'center', title: '鐗╂枡鍙�'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/report/viewWorkCountIn.html b/src/main/webapp/views/report/viewWorkCountIn.html
index dc60af2..fd8a55a 100644
--- a/src/main/webapp/views/report/viewWorkCountIn.html
+++ b/src/main/webapp/views/report/viewWorkCountIn.html
@@ -20,7 +20,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkCountOut.html b/src/main/webapp/views/report/viewWorkCountOut.html
index b872981..197c32a 100644
--- a/src/main/webapp/views/report/viewWorkCountOut.html
+++ b/src/main/webapp/views/report/viewWorkCountOut.html
@@ -21,7 +21,7 @@
<div id="search-box" class="layui-form layui-card-header">
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="matnr" placeholder="鍗曟嵁鍙�" autocomplete="off">
+ <input class="layui-input" type="text" name="matnr" placeholder="鐗╂枡鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline" style="width: 300px">
diff --git a/src/main/webapp/views/report/viewWorkIn.html b/src/main/webapp/views/report/viewWorkIn.html
index 4e93e0f..63930ca 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 b4572a5..a115e3c 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 772715d..fb700ef 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 f12604c..a868752 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 0f32b40..9d0812e 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