From 03f1f29582355afad2a83a0cde339e562f589eb1 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 17 八月 2024 14:50:43 +0800
Subject: [PATCH] #界面
---
src/main/webapp/static/js/pack/pack.js | 2
src/main/webapp/views/locDetl/locDetl.html | 6
src/main/webapp/views/wrkDetl/wrkDetl.html | 4
src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js | 54 +++++-----
src/main/webapp/views/mat/mat.html | 8
src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java | 4
src/main/webapp/static/js/saas/locDetl.js | 20 ++--
src/main/webapp/static/js/orderDetl/orderDetl.js | 6
src/main/webapp/views/order/order.html | 2
src/main/webapp/static/js/saas/stockAdjust.js | 2
src/main/webapp/views/wrkDetlLog/wrkDetlLog.html | 6
src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js | 2
src/main/webapp/views/pakStore/stockOutOrder.html | 6
src/main/webapp/views/report/viewWorkOut.html | 2
src/main/webapp/static/js/matTurn/matTurn.js | 2
src/main/webapp/views/matTurn/turnOverQuery.html | 2
src/main/webapp/static/js/order/out.js | 12 +-
src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java | 2
src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java | 2
src/main/webapp/static/js/adjDetl/adjDetl.js | 4
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 8
src/main/webapp/static/js/common.js | 36 +++---
src/main/java/com/zy/common/service/CommonService.java | 2
src/main/webapp/static/js/pakStore/pakStore.js | 2
src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html | 4
src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java | 2
src/main/webapp/views/report/locDetl.html | 2
src/main/webapp/static/js/pakStore/stockAdjust.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 16 +-
src/main/java/com/zy/asrs/entity/param/TrussCombParam.java | 2
src/main/webapp/views/pda/matQuery.html | 2
src/main/webapp/static/js/locDetl/locDetl.js | 18 +-
src/main/webapp/views/waitPakinLog/waitPakinLog.html | 4
src/main/java/com/zy/asrs/entity/LocDetl.java | 6
src/main/webapp/views/pakStore/locDetlCheckQuery.html | 2
src/main/webapp/static/js/order/order.js | 14 +-
src/main/webapp/views/orderDetl/orderDetl.html | 2
src/main/webapp/views/waitPakin/waitPakin.html | 4
src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | 8
src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html | 2
40 files changed, 143 insertions(+), 143 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 34bae21..8ae131b 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -49,8 +49,8 @@
@ApiModelProperty(value= "鎺ュご")
private String specs;
- @ApiModelProperty(value= "绠卞彿")
-// @ExcelProperty("绠卞彿")
+ @ApiModelProperty(value= "鎵规")
+// @ExcelProperty("鎵规")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -58,7 +58,7 @@
@TableField("order_no")
private String orderNo;
- @ApiModelProperty(value= "鍗峰彿")
+ @ApiModelProperty(value= "MES宸ヤ綔鍙�")
private String model;
@ApiModelProperty(value= "棰滆壊")
diff --git a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
index 6739620..50812af 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetlRullUpDetail.java
@@ -30,9 +30,9 @@
private Long uuid;
/**
- * 鍗峰彿
+ * MES宸ヤ綔鍙� //鐓滄槦
*/
- @ApiModelProperty(value= "鍗峰彿")
+ @ApiModelProperty(value= "MES宸ヤ綔鍙�")
@TableField("roll_no")
private String rollNo;
diff --git a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
index c7ae086..0ba40b7 100644
--- a/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/TrussCombParam.java
@@ -41,7 +41,7 @@
private String position;// 鏄� 瀛楃涓� 鏈ㄧ浣嶇疆锛堟媶鍨涙椂闇�瑕侊級 origin //涓婁紶
private Double weight;// 鏄� 灏忔暟鍨� 閲嶉噺 //涓婁紶
private Integer anfme;// 鏁板瓧鍨� 鏈ㄧ涓摐绠旀暟閲� //涓婁紶
- private String batch;// 瀛楃涓� 绠卞彿 //PDA
+ private String batch;// 瀛楃涓� 鎵规 //PDA
private String specs;// 瀛楃涓� 瑙勬牸
private String model;// 瀛楃涓� 瑙勬牸
// private String standby4;// 鍗蜂俊鎭疘d //涓婁紶
diff --git a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
index 1f6b3cf..78be335 100644
--- a/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
+++ b/src/main/java/com/zy/asrs/entity/result/OutLocBoxVo.java
@@ -11,7 +11,7 @@
@Data
public class OutLocBoxVo {
- @ExcelProperty(value = "绠卞彿")
+ @ExcelProperty(value = "鎵规")
private String batch;
@ExcelProperty(value = "璁㈠崟鍙�")
private String orderNo;
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 edfa3be..50ea838 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -255,7 +255,7 @@
List<String> matListBoxNoList = new ArrayList<>();
for (TrussCombParam.MatList matList: param.getMatList()){
if (!orderBoxNoList.contains(matList.getBatch())){
- throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 绠卞彿锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
+ throw new CoolException("鍗曞彿锛�"+param.getOrderNo()+" 鎵规锛�"+matList.getBatch()+"涓嶅睘浜庢璁㈠崟鎴栬�呭凡缁忓叆搴�");
}else {
matListBoxNoList.add(matList.getBatch());
}
@@ -302,7 +302,7 @@
waitPakin.setWeight(orderDetl.getWeight()); //鍑�閲�
waitPakin.setVolume(orderDetl.getVolume()); //姣涢噸
waitPakin.setPrice(orderDetl.getPrice()); //闀垮害
- waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs())); //鎺ュご
+ waitPakin.setSpecs(String.valueOf(orderDetl.getSpecs())); //鎺ュご MES璁㈠崟鍙�
waitPakin.setOrigin("1"); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(orderDetl.getAnfme()); // 鏈ㄧ涓摐绠旀暟閲�
@@ -533,7 +533,7 @@
matnr = matList.getMatnr();
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 鎵规
waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
@@ -541,7 +541,7 @@
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
- waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
+ waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご MES璁㈠崟鍙�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
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 e4767f4..401d9c5 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -813,7 +813,7 @@
}
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
- waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
+ waitPakin.setBatch(matList.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 鎵规
waitPakin.setModel(matList.getModel()); //鍗峰彿 鍞竴鍊�
waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(param.getBarcode()); //鎵樼洏鐮�
@@ -821,7 +821,7 @@
waitPakin.setWeight(matList.getWeight()); //鍑�閲�
waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
waitPakin.setPrice(matList.getRollExtent()); //闀垮害
- waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご
+ waitPakin.setSpecs(String.valueOf(matList.getJoint())); //鎺ュご MES璁㈠崟鍙�
waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
@@ -1153,14 +1153,14 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(mat);
waitPakin.setBatch(param.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
- waitPakin.setModel(param.getTaskNo()); //鍗峰彿 鍞竴鍊�
+ waitPakin.setModel(param.getTaskNo()); //鍗峰彿 鍞竴鍊� 宸ヤ綔鍙�
// waitPakin.setBrand(param.getBoxType()); //鏈ㄧ绫诲瀷
waitPakin.setZpallet(basDevp.getBarcode()); //鎵樼洏鐮�
// waitPakin.setOrigin(matList.getPosition()); //鏈ㄧ鍦ㄦ墭鐩樹笂鐨勪綅缃�
waitPakin.setWeight(param.getWeight()); //鍑�閲�
// waitPakin.setVolume(matList.getRoughWeight()); //姣涢噸
// waitPakin.setPrice(matList.getRollExtent()); //闀垮害
- waitPakin.setSpecs(param.getOrderNo()); //鍗曞彿 鍊熺敤
+ waitPakin.setSpecs(param.getOrderNo()); //MES璁㈠崟鍙� 鍊熺敤瑙勬牸
// waitPakin.setIoStatus("N"); // 鍏ュ嚭鐘舵��
// waitPakin.setAnfme(matList.getAnfme()); // 鏁伴噺
waitPakin.setColor(param.getColor()); // 棰滆壊
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 b8542e2..481fdfd 100644
--- a/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java
@@ -345,7 +345,7 @@
WaitPakin waitPakin = new WaitPakin();
waitPakin.sync(locDetl);
waitPakin.setBatch(locDetl.getBatch()); //鏈ㄧ缂栫爜 //鎵规 鍞竴鍊� 绠卞彿
- waitPakin.setModel(locDetl.getModel()); //鍗峰彿 鍞竴鍊�
+ waitPakin.setModel(locDetl.getModel()); //MES宸ヤ綔鍙� 鍞竴鍊�
waitPakin.setIoStatus("Y"); // 鍏ュ嚭鐘舵��
waitPakin.setAnfme(locDetl.getAnfme()); // 鏁伴噺
waitPakin.setStatus("Y"); // 鐘舵��
diff --git a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
index fa007b5..30d6867 100644
--- a/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
+++ b/src/main/java/com/zy/asrs/utils/OutLocBoxExcelListener.java
@@ -94,7 +94,7 @@
if (!outLocBoxCNew.contains(outLocBoxC[0])){
LocDetl locDetlSou = locDetlService.selectOne(new EntityWrapper<LocDetl>().eq("batch", outLocBoxC[0]));
if (Cools.isEmpty(locDetlSou)){
- throw new CoolException("绠卞彿锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
+ throw new CoolException("鎵规锛�"+outLocBoxC[0]+" 鏈煡璇㈠埌鏁版嵁锛侊紒锛�");
}
List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>()
.eq("loc_no", locDetlSou.getLocNo()).eq("origin", locDetlSou.getOrigin()));
diff --git a/src/main/java/com/zy/common/service/CommonService.java b/src/main/java/com/zy/common/service/CommonService.java
index 6f13a62..a752437 100644
--- a/src/main/java/com/zy/common/service/CommonService.java
+++ b/src/main/java/com/zy/common/service/CommonService.java
@@ -137,7 +137,7 @@
if (Cools.isEmpty(matnr)) { //鐗╂枡鍙�
matnr = "";
}
- if (Cools.isEmpty(batch)) { //绠卞彿
+ if (Cools.isEmpty(batch)) { //鎵规
batch = "";
}
if (Cools.isEmpty(grade)) { //澶囩敤
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index 92e646c..f60740a 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -24,13 +24,13 @@
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'}
,{field: 'matnrOld', align: 'center',title: '鍘熻鏍�'}
,{field: 'matnr', align: 'center',title: '褰撳墠瑙勬牸'}
- ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
// ,{field: 'oriCtns', align: 'center',title: '鍘熺鏁�'}
,{field: 'oriQty', align: 'center',title: '鍘熸暟閲�'}
// ,{field: 'oriWt', align: 'center',title: '鍘熼噸閲�'}
// ,{field: 'adjCtns', align: 'center',title: '鍙樻洿绠辨暟'}
,{field: 'adjQty', align: 'center',title: '鍙樻洿鏁伴噺'}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆',hide:true}
// ,{field: 'adjWt', align: 'center',title: '鍙樻洿閲嶉噺'}
,{field: 'memo', align: 'center',title: '澶囨敞',hide:true}
,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index c214967..f749069 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -187,24 +187,24 @@
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О锛堝搧鍚嶏級', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�', hide: false}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
- ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: false}
- ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
- ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight$', align: 'center',title: '鍑�閲�', hide: false}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
@@ -226,28 +226,28 @@
{field: 'matnr', align: 'center',title: '瑙勬牸', sort:false, hide: false}
,{field: 'maktx', align: 'center',title: '鍝佸悕', sort:true, hide: true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '绠卞彿', hide: false, sort:true}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'batch', align: 'center',title: '鎵规', hide: false, sort:true}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true, sort:true}
- ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false, sort:true}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true, sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: true, sort:true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'specs', align: 'center',title: '鎺ュご', hide: false}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: false, sort:true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false, sort:true}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index 9bfb532..e404b7e 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -8,27 +8,27 @@
,{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
- ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
+ ,{field: 'batch', align: 'center',title: '鎵规', width: 300, sort:true}
+ ,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: true}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�', hide: false}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
- ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: true}
,{field: 'sku', align: 'center',title: 'sku', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js b/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
index 5f3f1f2..cdfcc5f 100644
--- a/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
+++ b/src/main/webapp/static/js/locDetlRullUpDetail/locDetlRullUpDetail.js
@@ -27,7 +27,7 @@
// {type: 'checkbox'},
{field: 'id', align: 'center',title: 'ID',hide : true}
,{field: 'uuid', align: 'center',title: '缂栧彿',hide : true}
- ,{field: 'rollNo', align: 'center',title: '鍗峰彿',hide : false}
+ ,{field: 'rollNo', align: 'center',title: 'MES宸ヤ綔鍙�',hide : false}
,{field: 'rollWeight', align: 'center',title: '閲嶉噺',hide : false}
,{field: 'rollLength', align: 'center',title: '闀垮害',hide : false}
,{field: 'rollWidth', align: 'center',title: '瀹藉害',hide : false}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 7744711..8e628d7 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -5,17 +5,17 @@
{field: 'matnr', align: 'center',title: '瑙勬牸', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '绠卞彿', width: 300, sort:true}
+ ,{field: 'batch', align: 'center',title: '鎵规', width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
//,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�', hide: false}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
- ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
- ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜',hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
@@ -23,9 +23,9 @@
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/matTurn/matTurn.js b/src/main/webapp/static/js/matTurn/matTurn.js
index 60ca431..5628d9e 100644
--- a/src/main/webapp/static/js/matTurn/matTurn.js
+++ b/src/main/webapp/static/js/matTurn/matTurn.js
@@ -11,7 +11,7 @@
style: 'color: blue;font-weight: bold'
}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
- , {field: 'specs', align: 'center', title: '鎺ュご'}
+ , {field: 'specs', align: 'center', title: 'MES璁㈠崟鍙�', hide: false}
];
}
diff --git a/src/main/webapp/static/js/order/order.js b/src/main/webapp/static/js/order/order.js
index 532fc96..01f9794 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -247,7 +247,7 @@
{type: 'numbers'},
{field: 'matnr', title: '瑙勬牸', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
- {field: 'batch', title: '绠卞彿'},
+ {field: 'batch', title: '鎵规'},
{field: 'anfme', title: '鏁伴噺'},
// {field: 'workQty', title: '浣滀笟鏁伴噺'},
@@ -259,7 +259,7 @@
// },
// {field: 'inQty', title: '宸插叆搴撻噺'},
// {field: 'color', title: '棰滆壊'},
- {field: 'specs', title: '鎺ュご'},
+ {field: 'specs', title: 'MES璁㈠崟鍙�'},
{field: 'qty$', title: '鐘舵��', style: 'font-weight: bold'},
{field: 'source$', title: '鏄惁纭', style: 'font-weight: bold'}
]],
@@ -361,8 +361,8 @@
{type: 'numbers', title: '#'},
{field: 'matnr', title: '瑙勬牸', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 200},
- {field: 'batch', title: '绠卞彿', edit: true},
- {field: 'specs', title: '鎺ュご'},
+ {field: 'batch', title: '鎵规', edit: true},
+ {field: 'specs', title: 'MES璁㈠崟鍙�'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
@@ -708,9 +708,9 @@
// {field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', align: 'center', width: 350},
// {field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '绠卞彿', align: 'center'},
- {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
- {field: 'specs', title: '鎺ュご', align: 'center'},
+ {field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'model', title: 'MES宸ヤ綔鍙�', align: 'center', hide: false},
+ {field: 'specs', title: 'MES璁㈠崟鍙�', align: 'center'},
// {field: 'brand', title: '鏈ㄧ绫诲瀷', align: 'center'},
{field: 'brand$', title: '鏈ㄧ绫诲瀷', align: 'center'},
{field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
diff --git a/src/main/webapp/static/js/order/out.js b/src/main/webapp/static/js/order/out.js
index 1ec550c..fc8df84 100644
--- a/src/main/webapp/static/js/order/out.js
+++ b/src/main/webapp/static/js/order/out.js
@@ -34,13 +34,13 @@
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl', 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: '鎺ュご'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�'}
// ,{field: 'anfme', align: 'center',title: '鏁伴噺'}
// ,{field: 'qty', align: 'center',title: '浣滀笟鏁伴噺', style: 'font-weight: bold'}
,{field: 'enableQty', align: 'center',title: '寰呭嚭鏁伴噺', style: 'font-weight: bold'}
// ,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜', hide: true}
// ,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
@@ -159,9 +159,9 @@
// {type: 'checkbox', merge: ['orderNo']},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', merge: true, align: 'center'},
{field: 'title', title: '鍟嗗搧', merge: true, align: 'center', width: 350},
- {field: 'batch', title: '绠卞彿', align: 'center'},
- {field: 'model', title: '鍗峰彿', align: 'center', hide: false},
- {field: 'specs', title: '鎺ュご', align: 'center'},
+ {field: 'batch', title: '鎵规', align: 'center'},
+ {field: 'model', title: 'MES宸ヤ綔鍙�', align: 'center', hide: false},
+ {field: 'specs', title: 'MES璁㈠崟鍙�', align: 'center'},
{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true},
{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false},
{field: 'zpallet', title: '鎵樼洏鐮�', align: 'center'},
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index 78e537b..c10feca 100644
--- a/src/main/webapp/static/js/orderDetl/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetl/orderDetl.js
@@ -28,9 +28,9 @@
,{field: 'matnr', align: 'center',title: '瑙勬牸'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'name', align: 'center',title: '鍚嶇О'}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�'}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'unit', align: 'center',title: '鍗曚綅'}
,{field: 'barcode', align: 'center',title: '鍟嗗搧鏉＄爜'}
,{field: 'supplier', align: 'center',title: '渚涘簲鍟�'}
diff --git a/src/main/webapp/static/js/pack/pack.js b/src/main/webapp/static/js/pack/pack.js
index fa2da6d..ead11f7 100644
--- a/src/main/webapp/static/js/pack/pack.js
+++ b/src/main/webapp/static/js/pack/pack.js
@@ -25,7 +25,7 @@
// ,{field: 'id', align: 'center',title: 'ID'}
,{field: 'barcode',title: '鏉＄爜'}
,{field: 'matnr', align: 'center',title: '瑙勬牸', minWidth: 250, width: 250}
- ,{field: 'batch', align: 'center',title: '绠卞彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵规', hide: true}
,{field: 'settle$', align: 'center',title: '鐘舵��', templet: '#settleTpl', minWidth: 160, width: 160}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
diff --git a/src/main/webapp/static/js/pakStore/pakStore.js b/src/main/webapp/static/js/pakStore/pakStore.js
index 166c63e..86ec6e8 100644
--- a/src/main/webapp/static/js/pakStore/pakStore.js
+++ b/src/main/webapp/static/js/pakStore/pakStore.js
@@ -4,7 +4,7 @@
function getCol() {
var cols = [
{fixed: 'left', field: 'anfme', title: '鏁伴噺锛堝繀濉級', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
- {field: 'batch', title: '绠卞彿锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
+ {field: 'batch', title: '鎵规锛堥�夊～锛�', align: 'center', edit:'text', width: 200, style:'color: block;font-weight: bold'}
];
cols.push.apply(cols, matCols);
cols.push({fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width: 80})
diff --git a/src/main/webapp/static/js/pakStore/stockAdjust.js b/src/main/webapp/static/js/pakStore/stockAdjust.js
index 1791bf9..587bb66 100644
--- a/src/main/webapp/static/js/pakStore/stockAdjust.js
+++ b/src/main/webapp/static/js/pakStore/stockAdjust.js
@@ -7,7 +7,7 @@
var cols = [
{fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'batch', align: 'center',title: '绠卞彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
+ ,{field: 'batch', align: 'center',title: '鎵规锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "anfme");
arrRemove(detlCols, "field", "batch");
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index 4358fc9..4cd19f8 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -4,29 +4,29 @@
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
{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 , hide: true}
+ ,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
+ ,{field: 'batch', align: 'center',title: '鎵规', width: 300, sort:true , hide: true}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: true}
- ,{field: 'specs', align: 'center',title: '鎺ュご' , hide: false}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�' , hide: false}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
- ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
+ ,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '闀垮害', hide: false}
- ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: false}
+ ,{field: 'price', align: 'center',title: '闀垮害', hide: true}
+ ,{field: 'sku', align: 'center',title: '鏈ㄧ缂栫爜', hide: true}
,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: false}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆', hide: true}
,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
+ ,{field: 'weight', align: 'center',title: '鍑�閲�', hide: false}
,{field: 'roughWeight', align: 'center',title: '鍗曠姣涢噸', hide: true}
// ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: true}
,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�', hide: true}
diff --git a/src/main/webapp/static/js/saas/stockAdjust.js b/src/main/webapp/static/js/saas/stockAdjust.js
index 94f0ee1..b6c8fe2 100644
--- a/src/main/webapp/static/js/saas/stockAdjust.js
+++ b/src/main/webapp/static/js/saas/stockAdjust.js
@@ -7,7 +7,7 @@
var cols = [
// {fixed: 'left', field: 'count', title: '瀹為檯鏁伴噺', align: 'center', edit:'text', width: 120, style:'color: blue;font-weight: bold'},
{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'batch', align: 'center',title: '绠卞彿锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
+ ,{field: 'batch', align: 'center',title: '鎵规锛堢紪杈戯級', edit: true, style: 'font-weight:bold'}
];
arrRemove(detlCols, "field", "anfme");
arrRemove(detlCols, "field", "batch");
diff --git a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
index 2103c50..c2f9a2f 100644
--- a/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
+++ b/src/main/webapp/static/js/wrkDetlSingle/wrkDetlSingle.js
@@ -28,41 +28,41 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'matnr', align: 'center',title: '瑙勬牸'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
- ,{field: 'batch', align: 'center',title: '绠卞彿'}
+ ,{field: 'batch', align: 'center',title: '鎵规'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿',hide: true}
- ,{field: 'specs', align: 'center',title: '鎺ュご'}
- ,{field: 'model', align: 'center',title: '鍗峰彿', hide: false}
- ,{field: 'color', align: 'center',title: '棰滆壊'}
+ ,{field: 'specs', align: 'center',title: 'MES璁㈠崟鍙�'}
+ ,{field: 'model', align: 'center',title: 'MES宸ヤ綔鍙�', hide: false}
+ ,{field: 'color', align: 'center',title: '棰滆壊',hide: true}
,{field: 'brand', align: 'center',title: '鏈ㄧ绫诲瀷', hide: true}
,{field: 'brand$', align: 'center',title: '鏈ㄧ绫诲瀷', hide: false}
- ,{field: 'unit', align: 'center',title: '鍗曚綅'}
+ ,{field: 'unit', align: 'center',title: '鍗曚綅',hide: true}
,{field: 'price', align: 'center',title: '闀垮害', hide: false}
- ,{field: 'sku', align: 'center',title: 'sku'}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�'}
+ ,{field: 'sku', align: 'center',title: 'sku',hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曚綅閲�',hide: true}
,{field: 'barcode', align: 'center',title: '鏉＄爜'}
- ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆'}
- ,{field: 'manu', align: 'center',title: '鍘傚'}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡'}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�'}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�'}
+ ,{field: 'origin', align: 'center',title: '鏈ㄧ浣嶇疆',hide: true}
+ ,{field: 'manu', align: 'center',title: '鍘傚',hide: true}
+ ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡',hide: true}
+ ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�',hide: true}
+ ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�',hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺'}
// ,{field: 'length', align: 'center',title: '闀垮害'}
- ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: false}
- ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜'}
- ,{field: 'supp', align: 'center',title: '渚涘簲鍟�'}
- ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�'}
- ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规'}
- ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�'}
- ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟'}
- ,{field: 'source$', align: 'center',title: '鍒惰喘'}
- ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�'}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�'}
- ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳'}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
- ,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳'}
- ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿'}
+ ,{field: 'volume', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ ,{field: 'threeCode', align: 'center',title: '涓夋柟缂栫爜',hide: true}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�',hide: true}
+ ,{field: 'suppCode', align: 'center',title: '渚涘簲鍟嗙紪鐮�',hide: true}
+ ,{field: 'beBatch$', align: 'center',title: '鏄惁鎵规', hide: true}
+ ,{field: 'deadTime', align: 'center',title: '淇濊川鏈�', hide: true}
+ ,{field: 'deadWarn', align: 'center',title: '棰勮澶╂暟', hide: true}
+ ,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
+ ,{field: 'inspect$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ ,{field: 'modiUser$', align: 'center',title: '淇敼浜哄憳', hide: true}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿', hide: true}
+ ,{field: 'appeUser$', align: 'center',title: '娣诲姞浜哄憳', hide: true}
+ ,{field: 'appeTime$', align: 'center',title: '娣诲姞鏃堕棿', hide: true}
,{field: 'memo', align: 'center',title: '澶囨敞'}
- ,{field: 'rollUp', align: 'center',title: ''}
+ ,{field: 'rollUp', align: 'center',title: '', hide: true}
,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
]],
diff --git a/src/main/webapp/views/locDetl/locDetl.html b/src/main/webapp/views/locDetl/locDetl.html
index 1ec1a96..46d851d 100644
--- a/src/main/webapp/views/locDetl/locDetl.html
+++ b/src/main/webapp/views/locDetl/locDetl.html
@@ -31,17 +31,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="MES宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="鎺ュご" autocomplete="off">
+ <input class="layui-input" type="text" name="specs" placeholder="MES璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<!-- <div class="layui-inline">-->
diff --git a/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html b/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
index 52b4e53..7f97160 100644
--- a/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
+++ b/src/main/webapp/views/locDetlRullUpDetail/locDetlRullUpDetail.html
@@ -79,9 +79,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗峰彿: </label>
+ <label class="layui-form-label">MES宸ヤ綔鍙�: </label>
<div class="layui-input-block">
- <input class="layui-input" name="rollNo" placeholder="璇疯緭鍏ュ嵎鍙�">
+ <input class="layui-input" name="rollNo" placeholder="璇疯緭鍏ES宸ヤ綔鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/mat/mat.html b/src/main/webapp/views/mat/mat.html
index 4814be3..8a33657 100644
--- a/src/main/webapp/views/mat/mat.html
+++ b/src/main/webapp/views/mat/mat.html
@@ -98,9 +98,9 @@
</div>
</div>
<div class="layui-inline">
- <label class="layui-form-label" style="padding: 8px 15px 8px 15px">鎺ュご:</label>
+ <label class="layui-form-label" style="padding: 8px 15px 8px 15px">MES璁㈠崟鍙�:</label>
<div class="layui-input-inline">
- <input name="specs" class="layui-input" placeholder="杈撳叆鎺ュご"/>
+ <input name="specs" class="layui-input" placeholder="杈撳叆MES璁㈠崟鍙�"/>
</div>
</div>
<div class="layui-inline"> 
@@ -206,9 +206,9 @@
</div>
<div class="layui-form-item">
- <label class="layui-form-label">鍗曠鍑�閲�</label>
+ <label class="layui-form-label">鍑�閲�</label>
<div class="layui-input-block">
- <input name="weight" placeholder="璇疯緭鍏ュ崟绠卞噣閲嶆牸" class="layui-input">
+ <input name="weight" placeholder="璇疯緭鍏ュ噣閲嶉噺" class="layui-input">
</div>
</div>
diff --git a/src/main/webapp/views/matTurn/turnOverQuery.html b/src/main/webapp/views/matTurn/turnOverQuery.html
index 7f252b0..db77d26 100644
--- a/src/main/webapp/views/matTurn/turnOverQuery.html
+++ b/src/main/webapp/views/matTurn/turnOverQuery.html
@@ -87,7 +87,7 @@
{type: 'checkbox'},
{field: 'matnr', align: 'center', title: '瑙勬牸'}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
- , {field: 'specs', align: 'center', title: '鎺ュご'}
+ , {field: 'specs', align: 'center', title: 'MES璁㈠崟鍙�'}
];
}
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index aa5fc84..5362158 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -294,7 +294,7 @@
<td>No.</td>
<td>瑙勬牸</td>
<!-- <td>瑙勬牸</td>-->
- <td>绠卞彿</td>
+ <td>鎵规</td>
<!-- <td>绠卞瓙绫诲瀷</td>-->
<td>鏄惁纭</td>
</tr>
diff --git a/src/main/webapp/views/orderDetl/orderDetl.html b/src/main/webapp/views/orderDetl/orderDetl.html
index bac5804..d569094 100644
--- a/src/main/webapp/views/orderDetl/orderDetl.html
+++ b/src/main/webapp/views/orderDetl/orderDetl.html
@@ -102,7 +102,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸: </label>
<div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ユ帴澶�">
+ <input class="layui-input" name="specs" placeholder="璇疯緭鍏ES璁㈠崟鍙�">
</div>
</div>
<div class="layui-form-item">
diff --git a/src/main/webapp/views/pakStore/locDetlCheckQuery.html b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
index f30f250..bb5e950 100644
--- a/src/main/webapp/views/pakStore/locDetlCheckQuery.html
+++ b/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -78,7 +78,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="鎺ュご" autocomplete="off">
+ <input class="layui-input" type="text" name="specs" placeholder="MES璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/pakStore/stockOutOrder.html b/src/main/webapp/views/pakStore/stockOutOrder.html
index d42eef5..661e253 100644
--- a/src/main/webapp/views/pakStore/stockOutOrder.html
+++ b/src/main/webapp/views/pakStore/stockOutOrder.html
@@ -84,7 +84,7 @@
<!-- 鍔熻兘鍖� -->
<div class="function-area">
<button id="mat-query" class="function-btn">鎻愬彇搴撳瓨</button>
- <button class="function-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆绠卞彿鍑哄簱妯℃澘涓嬭浇</button>
+ <button class="function-btn" style="width: auto;float:right;" onclick="excelMouldDownload()">瀵煎叆鎵规鍑哄簱妯℃澘涓嬭浇</button>
</div>
<hr>
@@ -103,8 +103,8 @@
</div>
</div>
<button class="layui-btn layui-btn-lg" id="btn-outbound" lay-event="outbound">鍚姩鍑哄簱</button>
- <!-- 3.瀵煎叆绠卞彿鍑哄簱 -->
- <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆绠卞彿鍑哄簱</button>
+ <!-- 3.瀵煎叆鎵规鍑哄簱 -->
+ <button class="layui-btn layui-btn-lg" onclick="importExcel()" style="font-size: 12px;width: auto;">瀵煎叆鎵规鍑哄簱</button>
<span style="display: none"><input id="importExcel" type="file" onchange="upload(this)">鍚姩鍑哄簱</span>
</div>
<!-- <div class="layui-btn-container">-->
diff --git a/src/main/webapp/views/pda/matQuery.html b/src/main/webapp/views/pda/matQuery.html
index 9485e6c..c94733e 100644
--- a/src/main/webapp/views/pda/matQuery.html
+++ b/src/main/webapp/views/pda/matQuery.html
@@ -85,7 +85,7 @@
<input id="matName" type="text" disabled="disabled">
</div>
<div class="form-item">
- <span>鎺ュご</span>
+ <span>MES璁㈠崟鍙�</span>
<input id="str2" type="text" disabled="disabled">
</div>
<div class="form-item">
diff --git a/src/main/webapp/views/report/locDetl.html b/src/main/webapp/views/report/locDetl.html
index e7f2d00..da8c5be 100644
--- a/src/main/webapp/views/report/locDetl.html
+++ b/src/main/webapp/views/report/locDetl.html
@@ -105,7 +105,7 @@
rollUp = data.rollUp
layer.open({
type: 2,
- title: '鍗峰彿淇℃伅',
+ title: 'MES宸ヤ綔鍙蜂俊鎭�',
maxmin: true,
area: [top.detailWidth, top.detailHeight],
shadeClose: true,
diff --git a/src/main/webapp/views/report/viewWorkOut.html b/src/main/webapp/views/report/viewWorkOut.html
index 4cca278..e95519f 100644
--- a/src/main/webapp/views/report/viewWorkOut.html
+++ b/src/main/webapp/views/report/viewWorkOut.html
@@ -31,7 +31,7 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="鎺ュご" autocomplete="off">
+ <input class="layui-input" type="text" name="specs" placeholder="MES璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/waitPakin/waitPakin.html b/src/main/webapp/views/waitPakin/waitPakin.html
index 76dc44c..8063160 100644
--- a/src/main/webapp/views/waitPakin/waitPakin.html
+++ b/src/main/webapp/views/waitPakin/waitPakin.html
@@ -26,12 +26,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="MES宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/waitPakinLog/waitPakinLog.html b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
index a825d96..d397acd 100644
--- a/src/main/webapp/views/waitPakinLog/waitPakinLog.html
+++ b/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -21,12 +21,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="MES宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/wrkDetl/wrkDetl.html b/src/main/webapp/views/wrkDetl/wrkDetl.html
index b3fb5ac..eccfeae 100644
--- a/src/main/webapp/views/wrkDetl/wrkDetl.html
+++ b/src/main/webapp/views/wrkDetl/wrkDetl.html
@@ -31,12 +31,12 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="MES宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<!-- 鏃ユ湡鑼冨洿 -->
diff --git a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
index 754872d..bf993ed 100644
--- a/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
+++ b/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -32,17 +32,17 @@
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="batch" placeholder="绠卞彿" autocomplete="off">
+ <input class="layui-input" type="text" name="batch" placeholder="鎵规" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="model" placeholder="鍗峰彿" autocomplete="off">
+ <input class="layui-input" type="text" name="model" placeholder="MES宸ヤ綔鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
<div class="layui-input-inline">
- <input class="layui-input" type="text" name="specs" placeholder="鎺ュご" autocomplete="off">
+ <input class="layui-input" type="text" name="specs" placeholder="MES璁㈠崟鍙�" autocomplete="off">
</div>
</div>
<div class="layui-inline">
diff --git a/src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html b/src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html
index 9dd74c8..de85b9d 100644
--- a/src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html
+++ b/src/main/webapp/views/wrkDetlSingle/wrkDetlSingle.html
@@ -123,7 +123,7 @@
<div class="layui-form-item">
<label class="layui-form-label">瑙勬牸: </label>
<div class="layui-input-block">
- <input class="layui-input" name="specs" placeholder="璇疯緭鍏ユ帴澶�">
+ <input class="layui-input" name="specs" placeholder="璇疯緭鍏ES璁㈠崟鍙�">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1