From 5b7ddbbd288579ccc54d1977803fcecab38e84aa Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期四, 27 十一月 2025 11:20:41 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java | 15 ++
src/main/webapp/static/js/orderDetlPakout/orderDetl.js | 2
src/main/webapp/static/js/pack/pack.js | 2
src/main/java/com/zy/asrs/entity/param/CombParam.java | 5
src/main/webapp/static/js/orderDetlPakin/orderDetl.js | 2
src/main/webapp/views/pda/stockIn.html | 2
src/main/webapp/static/js/inventoryFlow/inventoryFlow.js | 2
src/main/webapp/static/js/saas/locDetl.js | 2
src/main/webapp/views/pda/comb.html | 2
src/main/webapp/static/js/wrkMast/wrkMast.js | 2
src/main/webapp/static/js/stoMan/stoQue.js | 2
src/main/webapp/static/js/orderDetl/orderDetl.js | 2
src/main/webapp/static/js/locCheck/locCheck.js | 2
src/main/webapp/static/js/locDetlGroup/locDetlGroup.js | 2
src/main/webapp/views/matTurn/turnOverQuery.html | 2
src/main/webapp/static/js/order/out.js | 2
src/main/webapp/static/js/basArmMastLog/basArmMastLog.js | 2
src/main/webapp/views/pda/stockOut.html | 2
src/main/webapp/static/js/adjDetl/adjDetl.js | 2
src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java | 12 ++
src/main/java/com/zy/common/model/DetlDto.java | 6
src/main/webapp/static/js/basArmMastSign/basArmMastSign.js | 2
src/main/webapp/static/js/common.js | 55 ++++++-----
src/main/webapp/static/js/handlebars/errorWrkMast/errorWrkMast.js | 2
src/main/webapp/static/js/orderPakin/order.js | 4
src/main/webapp/static/js/report/workCountIn.js | 2
src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js | 2
src/main/webapp/static/js/report/workCountOut.js | 2
src/main/java/com/zy/asrs/controller/OpenController.java | 8 +
src/main/webapp/static/js/saasLog/saasLog.js | 2
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2
src/main/webapp/static/js/orderPakin/out.js | 2
src/main/webapp/static/js/locDetl/locDetl.js | 66 ++++++-------
src/main/webapp/static/js/locRule/locRule.js | 2
src/main/webapp/static/js/orderPakout/order.js | 2
src/main/webapp/static/js/orderPakout/out.js | 2
src/main/java/com/zy/asrs/entity/LocDetl.java | 3
src/main/webapp/views/pakStore/turnOverOwner.html | 2
src/main/webapp/static/js/handWrkMast/handWrkMast.js | 2
src/main/webapp/static/js/order/order.js | 21 +--
src/main/webapp/static/js/pakStore/turnOver.js | 2
src/main/webapp/static/js/basArmMast/basArmMast.js | 2
src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js | 2
43 files changed, 143 insertions(+), 118 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ffdc932..68f380c 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -439,8 +439,12 @@
return R.error("WMS浠诲姟鍙穂reqCode]涓嶈兘涓虹┖");
}
String taskCode = param.getTaskCode();
- String[] split = taskCode.split("-");
- param.setTaskNo(Integer.parseInt(split[0]));
+ if (taskCode == null || !taskCode.matches("^\\d+-.*$")) {
+ throw new CoolException("taskCode 鏍煎紡閿欒锛岄渶涓� 鏁板瓧-xxx锛屼緥濡� 123-ABC");
+ }
+
+ param.setTaskNo(Integer.parseInt(taskCode.substring(0, taskCode.indexOf("-"))));
+
// if (Cools.isEmpty(param.getTimestamp())) {
// return R.error("RGV浠诲姟鍙穂timestamp]涓嶈兘涓虹┖");
// }
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 77bdfcb..c9ba0f6 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -106,7 +106,8 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @TableField("man_length")
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
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 2a7b05a..93aa33b 100644
--- a/src/main/java/com/zy/asrs/entity/param/CombParam.java
+++ b/src/main/java/com/zy/asrs/entity/param/CombParam.java
@@ -49,11 +49,14 @@
// 瑙勬牸
private String specs = "";
private String supp = "";
-
+ //
+ private String suppCode = "";
// sku
private String sku = "";
//澶囨敞
private String memo = "";
+ //浠撳簱缂栫爜
+ private String manu = "";
}
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 992c847..49ca615 100644
--- a/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/MobileServiceImpl.java
@@ -724,6 +724,10 @@
combMat.setBoxType1(orderDetlPakins.get(0).getBoxType1());
combMat.setBoxType2(orderDetlPakins.get(0).getBoxType2());
combMat.setBoxType3(orderDetlPakins.get(0).getBoxType3());
+ combMat.setMemo(orderDetlPakins.get(0).getMemo());
+ combMat.setSupp(orderDetlPakins.get(0).getSupp());
+ combMat.setSuppCode(orderDetlPakins.get(0).getSuppCode());
+ combMat.setManu(orderDetlPakins.get(0).getManu());//浠撳簱缂栫爜
} else {
throw new CoolException("鏈煡璇㈠埌鐩稿叧璁㈠崟===>>" + param.getBarcode());
}
@@ -755,6 +759,10 @@
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(),elem.getBrand(),elem.getStandby1(),elem.getStandby2(),elem.getStandby3(),
elem.getBoxType1(),elem.getBoxType2(),elem.getBoxType3(), elem.getAnfme());
+ detlDto.setMemo(elem.getMemo());
+ detlDto.setSupp(elem.getSupp());
+ detlDto.setManu(elem.getManu());
+ detlDto.setSuppCode(elem.getSuppCode());
if (DetlDto.has(detlDtos, detlDto)) {
DetlDto one = DetlDto.findDto(detlDtos, detlDto);
assert one != null;
@@ -780,6 +788,10 @@
waitPakin.setAppeTime(now);
waitPakin.setModiUser(userId);
waitPakin.setModiTime(now);
+ waitPakin.setMemo(detlDto.getMemo());
+ waitPakin.setSupp(detlDto.getSupp());
+ waitPakin.setSuppCode(detlDto.getSuppCode());
+ waitPakin.setManu(detlDto.getManu());
waitPakin.setStandby1(detlDto.getStandby1());
waitPakin.setStandby2(detlDto.getStandby2());
waitPakin.setStandby3(detlDto.getStandby3());
diff --git a/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java b/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
index c7f12dd..e1884f0 100644
--- a/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
+++ b/src/main/java/com/zy/asrs/utils/OptimizedLockerPacking3Utils.java
@@ -7,6 +7,8 @@
public class OptimizedLockerPacking3Utils {
+ private static int signC = 0;
+
public static class Item {
String name;
double unitSpace;
@@ -445,6 +447,7 @@
double targetUtilization,
List<RemainderItem> current,
List<RemainderItem> bestCombination, double[] bestDiff) {
+ signC++;
// 妫�鏌ュ綋鍓嶇粍鍚堢殑鏈夋晥鎬�
if (!current.isEmpty()) {
double diff = Math.abs(currentSpace - targetUtilization);
@@ -468,8 +471,10 @@
RemainderItem currentItem = items.get(index);
// 涓嶉�夋嫨褰撳墠鐗╁搧
- validDfsCombination(items, index + 1, currentSpace, targetUtilization,
- current, bestCombination, bestDiff);
+ if(signC<100){
+ validDfsCombination(items, index + 1, currentSpace, targetUtilization,
+ current, bestCombination, bestDiff);
+ }
// 閫夋嫨褰撳墠鐗╁搧
if (currentItem.quantity > 0) {
@@ -479,8 +484,10 @@
for (int qty = 1; qty <= maxCanAdd; qty++) {
current.add(new RemainderItem(currentItem.item, qty));
- validDfsCombination(items, index + 1, currentSpace + qty * currentItem.item.unitSpace,
- targetUtilization, current, bestCombination, bestDiff);
+ if(signC<100){
+ validDfsCombination(items, index + 1, currentSpace + qty * currentItem.item.unitSpace,
+ targetUtilization, current, bestCombination, bestDiff);
+ }
current.remove(current.size() - 1);
}
}
diff --git a/src/main/java/com/zy/common/model/DetlDto.java b/src/main/java/com/zy/common/model/DetlDto.java
index d7168d0..4c32681 100644
--- a/src/main/java/com/zy/common/model/DetlDto.java
+++ b/src/main/java/com/zy/common/model/DetlDto.java
@@ -24,9 +24,11 @@
private String standby1 = "";
private String standby2 = "";
private String standby3 = "";
-
+ private String memo = "";
+ private String supp = "";
+ private String suppCode = "";
private Long lineNumber = 1L;
-
+ private String manu = "";
private String boxType1 = "1";
private String boxType2 = "1";
private String boxType3 = "1";
diff --git a/src/main/webapp/static/js/adjDetl/adjDetl.js b/src/main/webapp/static/js/adjDetl/adjDetl.js
index bdcc21a..e19b229 100644
--- a/src/main/webapp/static/js/adjDetl/adjDetl.js
+++ b/src/main/webapp/static/js/adjDetl/adjDetl.js
@@ -23,7 +23,7 @@
// {field: 'adjId', align: 'center',title: '搴忓彿'}
{field: 'locNo', align: 'center',title: '搴撲綅鍙�',hide:false}
,{field: 'matnrOld', align: 'center',title: '鍘熷搧鍙�',hide:false}
- ,{field: 'matnr', align: 'center',title: 'sku',hide:false}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',hide:false}
,{field: 'standby1', align: 'center',title: 'po',hide:false}
,{field: 'standby2', align: 'center',title: 'upc',hide:false}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
diff --git a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
index 2378547..7640c3d 100644
--- a/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
+++ b/src/main/webapp/static/js/basAgvLocDetl/basAgvLocDetl.js
@@ -25,7 +25,7 @@
,{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍚嶇О'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'orderNo', align: 'center',title: ''}
diff --git a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
index c27624c..5abe697 100644
--- a/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
+++ b/src/main/webapp/static/js/basAgvWrkDetl/basAgvWrkDetl.js
@@ -26,7 +26,7 @@
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'batch', align: 'center',title: '鎵瑰彿',hide:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
diff --git a/src/main/webapp/static/js/basArmMast/basArmMast.js b/src/main/webapp/static/js/basArmMast/basArmMast.js
index e1f3292..d0be1a8 100644
--- a/src/main/webapp/static/js/basArmMast/basArmMast.js
+++ b/src/main/webapp/static/js/basArmMast/basArmMast.js
@@ -29,7 +29,7 @@
,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜',hide: true}
,{field: 'staNo', align: 'center',title: '缁堢偣',hide: false}
,{field: 'sortingLine', align: 'center',title: '璧风偣',hide: false}
- ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',hide: false}
,{field: 'sku', align: 'center',title: 'sku',hide: true}
,{field: 'po', align: 'center',title: 'po',hide: false}
,{field: 'upc', align: 'center',title: 'upc',hide: false}
diff --git a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
index edd68cd..528d67c 100644
--- a/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
+++ b/src/main/webapp/static/js/basArmMastLog/basArmMastLog.js
@@ -29,7 +29,7 @@
,{field: 'armDirection', align: 'center',title: '鎿嶄綔鏂瑰悜',hide: true}
,{field: 'staNo', align: 'center',title: '缁堢偣',hide: false}
,{field: 'sortingLine', align: 'center',title: '璧风偣',hide: false}
- ,{field: 'matnr', align: 'center',title: 'sku',hide: false}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',hide: false}
,{field: 'sku', align: 'center',title: 'sku',hide: true}
,{field: 'po', align: 'center',title: 'po',hide: false}
,{field: 'upc', align: 'center',title: 'upc',hide: false}
diff --git a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
index 2450c70..8cc01dc 100644
--- a/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
+++ b/src/main/webapp/static/js/basArmMastSign/basArmMastSign.js
@@ -26,7 +26,7 @@
,{field: 'status$', align: 'center',title: '浠诲姟涓嬪彂鏍囪',hide: false}
,{field: 'orderNo', align: 'center',title: '璁㈠崟鍙�',hide: false}
,{field: 'createTime', align: 'center',title: '鍒嗘嫞缁戝畾鏍囪',hide: false}
- ,{field: 'matnr', align: 'center',title: 'sku',hide: true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿',hide: true}
,{field: 'sku', align: 'center',title: 'sku',hide: false}
,{field: 'po', align: 'center',title: 'po',hide: false}
,{field: 'upc', align: 'center',title: 'upc',hide: false}
diff --git a/src/main/webapp/static/js/common.js b/src/main/webapp/static/js/common.js
index 3fca8b5..2644c45 100644
--- a/src/main/webapp/static/js/common.js
+++ b/src/main/webapp/static/js/common.js
@@ -181,38 +181,43 @@
}
var matCols = [
- {field: 'matnr', align: 'center',title: 'SKU', width: 180}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 180}
// {field: 'id', align: 'center',title: 'ID'}
// ,{field: 'uuid', align: 'center',title: '缂栧彿'}
// ,{field: 'tagId$', align: 'center',title: '鎵�灞炲綊绫�'}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
// ,{field: 'name', align: 'center',title: '鍒悕'}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
- ,{field: 'standby2', align: 'center',title: '鏉＄爜upc', hide: false}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
+ // ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ // ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ // ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ // ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ ,{field: 'standby2', align: 'center',title: '鏉＄爜upc', hide: true}
+ ,{field: 'units', align: 'center',title: '鍗曠姣涢噸kg', hide: false}
,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: true}
- ,{field: 'manu', align: 'center',title: '鍘傚', hide: true}
- ,{field: 'manuDate', align: 'center',title: '鐢熶骇鏃ユ湡', hide: true}
- ,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
- ,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
- ,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', hide: false}
+ ,{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: '鍗曠鍑�閲峩g', hide: false}
+ ,{field: 'manLength', align: 'center',title: '闀匡紙姣背锛�', hide: false}
+ ,{field: 'height', align: 'center',title: '瀹斤紙姣背锛�', hide: false}
+ ,{field: 'width', align: 'center',title: '楂橈紙姣背锛�', hide: false}
+
+
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ // ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: false}
+ // ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', 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: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', 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: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ // ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
// ,{field: 'status$', align: 'center',title: '鐘舵��'}
// ,{field: 'createBy$', align: 'center',title: '娣诲姞浜哄憳'}
// ,{field: 'createTime$', align: 'center',title: '娣诲姞鏃堕棿'}
@@ -222,7 +227,7 @@
]
var detlCols = [
- {field: 'matnr', align: 'center',title: 'SKU', 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: '璐у搧鐗瑰緛', sort:true,hide:true}
diff --git a/src/main/webapp/static/js/handWrkMast/handWrkMast.js b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
index 6d6685c..8e4b81a 100644
--- a/src/main/webapp/static/js/handWrkMast/handWrkMast.js
+++ b/src/main/webapp/static/js/handWrkMast/handWrkMast.js
@@ -355,7 +355,7 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'standby2', align: 'center',title: 'upc'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
diff --git a/src/main/webapp/static/js/handlebars/errorWrkMast/errorWrkMast.js b/src/main/webapp/static/js/handlebars/errorWrkMast/errorWrkMast.js
index cfbfca8..9616048 100644
--- a/src/main/webapp/static/js/handlebars/errorWrkMast/errorWrkMast.js
+++ b/src/main/webapp/static/js/handlebars/errorWrkMast/errorWrkMast.js
@@ -359,7 +359,7 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'standby2', align: 'center',title: 'upc'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
diff --git a/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js b/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
index b179e9f..79c4bdf 100644
--- a/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
+++ b/src/main/webapp/static/js/inventoryFlow/inventoryFlow.js
@@ -27,7 +27,7 @@
,{field: 'sourceLocNo$', align: 'center',title: '婧愬簱浣�'}
,{field: 'locNo$', align: 'center',title: '鐩爣搴撲綅'}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'standby2', align: 'center',title: 'upc'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
diff --git a/src/main/webapp/static/js/locCheck/locCheck.js b/src/main/webapp/static/js/locCheck/locCheck.js
index ef11851..07e0026 100644
--- a/src/main/webapp/static/js/locCheck/locCheck.js
+++ b/src/main/webapp/static/js/locCheck/locCheck.js
@@ -24,7 +24,7 @@
{type: 'checkbox', hide: true}
, {field: 'id', align: 'center', title: '鍞竴ID', hide: true}
, {field: 'locNo', align: 'center', title: '搴撲綅鍙�'}
- , {field: 'matnr', align: 'center', title: 'sku'}
+ , {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'standby2', align: 'center',title: 'upc'}
, {field: 'originAnfme', align: 'center', title: '鐩樼偣鍓嶆暟閲�'}
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index eb83cff..8612fe7 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -4,53 +4,49 @@
{type: 'checkbox'},
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
,{field: 'storeDate', align: 'center',title: '搴撻緞(澶�)', hide: true, sort:true}
- ,{field: 'matnr', align: 'center',title: 'SKU', hide: false, sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', hide: false, sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', hide: false, sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
- ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true, width: 300, sort:true}
+ // ,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true, width: 300, sort:true}
,{field: 'anfme', align: 'center',title: '鏁伴噺', hide: false}
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜', hide: false}
- ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
- ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
- ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
- ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
- ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
- ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
+ // ,{field: 'specs', align: 'center',title: '瑙勬牸', hide: true}
+ // ,{field: 'model', align: 'center',title: '浠ｇ爜', hide: true}
+ // ,{field: 'color', align: 'center',title: '棰滆壊', hide: true}
+ // ,{field: 'brand', align: 'center',title: '鍝佺墝', hide: true}
+ // ,{field: 'unit', align: 'center',title: '鍗曚綅', hide: true}
+ // ,{field: 'price', align: 'center',title: '鍗曚环', hide: true}
,{field: 'standby2', align: 'center',title: '鏉＄爜upc', hide: false}
- ,{field: 'units', align: 'center',title: '鍗曚綅閲�', hide: true}
- ,{field: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
- ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
- ,{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: 'barcode', align: 'center',title: '鏉＄爜', hide: true}
+ // ,{field: 'origin', align: 'center',title: '鍦ㄥ簱鏍囪', hide: false}
+ ,{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: 'units', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'weight', align: 'center',title: '鍗曠鍑�閲�', hide: true}
- ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
- ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
- ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
- ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', hide: true}
+ // ,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
+ // ,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
+ // ,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
+ ,{field: 'standby1', align: 'center',title: '瀹㈡埛po', hide: false}
+ ,{field: 'standby3', align: 'center',title: '瀹㈡埛SKU', hide: false}
,{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: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
- ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�', hide: true,
- templet: function(d) {
- // 鏍规嵁鏉′欢鍒ゆ柇瀛椾綋棰滆壊
- if (d.frozen$ === '宸插喕缁�') {
- return '<span style="color: #34a8de;">' +d.frozen$ + '</span>';
- } else {
- return '<span">' +d.frozen$ + '</span>';
- }
- }}
+ ,{field: 'supp', align: 'center',title: '渚涘簲鍟�', hide: false}
+ ,{field: 'boxType1', align: 'center',title: '璐т富', hide: false}
+ ,{field: 'boxType3', align: 'center',title: '閲囪喘鍗曞彿', hide: false}
+ // ,{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: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
+ // ,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
+ // ,{field: 'frozen$', align: 'center',title: '鍐荤粨鍚�', hide: true,
];
// cols.push.apply(cols, detlCols);
cols.push({field: 'modiUser$', align: 'center',title: '淇敼浜哄憳',hide: true}
- ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
,{field: 'memo', align: 'center',title: '澶囨敞', hide: false}
+ ,{field: 'modiTime$', align: 'center',title: '淇敼鏃堕棿'}
)
return cols;
}
diff --git a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
index fd1ceb4..7e614fc 100644
--- a/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
+++ b/src/main/webapp/static/js/locDetlGroup/locDetlGroup.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
- {field: 'matnr', align: 'center', title: 'sku', sort: true}
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿', sort: true}
, {field: 'maktx', align: 'center', title: '鐗╂枡鍚嶇О', sort: true}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
,{field: 'standby1', align: 'center',title: 'po'}
diff --git a/src/main/webapp/static/js/locRule/locRule.js b/src/main/webapp/static/js/locRule/locRule.js
index dbae2be..7674407 100644
--- a/src/main/webapp/static/js/locRule/locRule.js
+++ b/src/main/webapp/static/js/locRule/locRule.js
@@ -23,7 +23,7 @@
cols: [[
{type: 'checkbox'}
// ,{field: 'id', align: 'center',title: 'ID'}
- , {field: 'matnr', align: 'center', title: 'sku'}
+ , {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po'}
,{field: 'standby2', align: 'center',title: 'upc'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index e1f0f9f..c9b5b73 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: 'sku', 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 c82bb3e..591c0ff 100644
--- a/src/main/webapp/static/js/order/order.js
+++ b/src/main/webapp/static/js/order/order.js
@@ -43,7 +43,7 @@
cols: [[
{type: 'numbers'},
{field: 'orderNo', title: '鍗曟嵁缂栧彿', templet: '#orderNoTpl'},
- {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
+ // {field: 'itemName', align: 'center', title: '瀹㈡埛po', minWidth: 160, width: 160},
{field: 'docType$', align: 'center', title: '绫诲瀷', minWidth: 160, width: 160},
{field: 'cstmrName', align: 'center', title: '璐т富', minWidth: 160, width: 160},
{align: 'center', title: '鏄庣粏', toolbar: '#tbLook', minWidth: 160, width: 160},
@@ -126,21 +126,16 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80},
- {field: 'standby1', title: 'po'},
- {field: 'standby2', title: 'upc'},
+ {field: 'boxType3', title: '閲囪喘鍗曞彿'},
+ {field: 'standby1', title: '瀹㈡埛PO'},
+ {field: 'standby2', title: 'UPC'},
+ {field: 'standby3', title: '瀹㈡埛SKU'},
+ {field: 'boxType1', title: '璐т富'},
{field: 'anfme', title: '鏁伴噺', width: 80},
{field: 'qty', title: '涓婃姤鏁伴噺', style: 'font-weight: bold'},
{field: 'workQty', title: '鍘嗗彶涓婃姤鏁伴噺'},
- // {field: 'unit', title: '鍗曚綅'},
- // {
- // field: 'createTime$', title: '鍒涘缓鏃堕棿', sort: true, templet: function (d) {
- // return util.toDateString(d.createTime);
- // }, width: 180
- // },
- // {field: 'inQty', title: '宸插叆搴撻噺'},
- // {field: 'color', title: '棰滆壊'}
]],
request: {
pageName: 'curr',
@@ -240,7 +235,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80},
// {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 741d458..0673161 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: 'sku', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸',hide:true}
diff --git a/src/main/webapp/static/js/orderDetl/orderDetl.js b/src/main/webapp/static/js/orderDetl/orderDetl.js
index df68fa1..10e83e6 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: 'sku'}
+ ,{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/orderDetlPakin/orderDetl.js b/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
index df68fa1..10e83e6 100644
--- a/src/main/webapp/static/js/orderDetlPakin/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakin/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: 'sku'}
+ ,{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/orderDetlPakout/orderDetl.js b/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
index df68fa1..10e83e6 100644
--- a/src/main/webapp/static/js/orderDetlPakout/orderDetl.js
+++ b/src/main/webapp/static/js/orderDetlPakout/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: 'sku'}
+ ,{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/orderPakin/order.js b/src/main/webapp/static/js/orderPakin/order.js
index 75329bc..78df7df 100644
--- a/src/main/webapp/static/js/orderPakin/order.js
+++ b/src/main/webapp/static/js/orderPakin/order.js
@@ -124,7 +124,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 160},
// {field: 'batch', title: '鎵瑰彿'}
{field: 'standby1', align: 'center',title: 'po', hide: false},
@@ -238,7 +238,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers', title: '#'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 200}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false},
diff --git a/src/main/webapp/static/js/orderPakin/out.js b/src/main/webapp/static/js/orderPakin/out.js
index 9a10af0..ac159c2 100644
--- a/src/main/webapp/static/js/orderPakin/out.js
+++ b/src/main/webapp/static/js/orderPakin/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: 'sku', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{field: 'specs', align: 'center',title: '瑙勬牸'}
diff --git a/src/main/webapp/static/js/orderPakout/order.js b/src/main/webapp/static/js/orderPakout/order.js
index 71f9abf..998cc41 100644
--- a/src/main/webapp/static/js/orderPakout/order.js
+++ b/src/main/webapp/static/js/orderPakout/order.js
@@ -124,7 +124,7 @@
cellMinWidth: 100,
cols: [[
{type: 'numbers'},
- {field: 'matnr', title: 'sku', width: 160},
+ {field: 'matnr', title: '鍟嗗搧缂栧彿', width: 160},
{field: 'maktx', title: '鍚嶇О', width: 80}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false},
diff --git a/src/main/webapp/static/js/orderPakout/out.js b/src/main/webapp/static/js/orderPakout/out.js
index c58479e..40e74f9 100644
--- a/src/main/webapp/static/js/orderPakout/out.js
+++ b/src/main/webapp/static/js/orderPakout/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: 'sku', width: 160}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', width: 160}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', width: 200}
,{field: 'batch', align: 'center',title: '搴忓垪鐮�',hide:true}
,{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 ecc2117..777d454 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: 'sku', minWidth: 250, width: 250}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', minWidth: 250, width: 250}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'batch', align: 'center',title: '鎵瑰彿', hide: true}
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index 522f099..0174c60 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -30,7 +30,7 @@
cellMinWidth: 50,
limit: 500,
cols: [[
- ,{field: 'matnr', align: 'center',title: 'sku', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
diff --git a/src/main/webapp/static/js/report/workCountIn.js b/src/main/webapp/static/js/report/workCountIn.js
index a26029c..0edc32b 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: 'sku'}
+ ,{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 99dd13d..6534f00 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: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
];
diff --git a/src/main/webapp/static/js/saas/locDetl.js b/src/main/webapp/static/js/saas/locDetl.js
index a3aee1c..45fbbb1 100644
--- a/src/main/webapp/static/js/saas/locDetl.js
+++ b/src/main/webapp/static/js/saas/locDetl.js
@@ -2,7 +2,7 @@
function getCol() {
var cols = [
{field: 'locNo', align: 'center',title: '搴撲綅鍙�'},
- {field: 'matnr', align: 'center',title: 'sku', sort:true}
+ {field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: false, hide: true}
,{field: 'batch', align: 'center',title: '鎵瑰彿', width: 300, sort:true , hide: true}
diff --git a/src/main/webapp/static/js/saasLog/saasLog.js b/src/main/webapp/static/js/saasLog/saasLog.js
index f2cf67c..f0f1afc 100644
--- a/src/main/webapp/static/js/saasLog/saasLog.js
+++ b/src/main/webapp/static/js/saasLog/saasLog.js
@@ -25,7 +25,7 @@
,{field: 'id', align: 'center',title: 'id', hide:true}
,{field: 'locNo', align: 'center',title: '搴撲綅'}
,{field: 'type$', align: 'center',title: '鎿嶄綔绫诲瀷'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'anfme', align: 'center',title: '鏁伴噺'}
,{field: 'ioTime$', align: 'center',title: '鎿嶄綔鏃堕棿'}
,{field: 'createBy', align: 'center',title: '', hide:true}
diff --git a/src/main/webapp/static/js/stoMan/stoQue.js b/src/main/webapp/static/js/stoMan/stoQue.js
index c1873f6..b61d127 100644
--- a/src/main/webapp/static/js/stoMan/stoQue.js
+++ b/src/main/webapp/static/js/stoMan/stoQue.js
@@ -216,7 +216,7 @@
cols: [[
// {type: 'checkbox'}
{field: 'locNo$', align: 'center',title: '搴撲綅鍙�'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
,{field: 'tbnum', align: 'center',title: '杞偍璇锋眰缂栧彿'}
// ,{field: 'tbpos', align: 'center',title: '琛岄」鐩�'}
diff --git a/src/main/webapp/static/js/wrkMast/wrkMast.js b/src/main/webapp/static/js/wrkMast/wrkMast.js
index 8ea8c4a..426429e 100644
--- a/src/main/webapp/static/js/wrkMast/wrkMast.js
+++ b/src/main/webapp/static/js/wrkMast/wrkMast.js
@@ -549,7 +549,7 @@
{type: 'checkbox'}
,{field: 'wrkNo', align: 'center',title: '宸ヤ綔鍙�'}
,{field: 'ioTime$', align: 'center',title: '宸ヤ綔鏃堕棿'}
- ,{field: 'matnr', align: 'center',title: 'sku'}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿'}
,{field: 'standby1', align: 'center',title: 'po', hide: false}
,{field: 'standby2', align: 'center',title: 'upc', hide: false}
,{field: 'lgnum', align: 'center',title: '浠撳簱鍙�'}
diff --git a/src/main/webapp/views/matTurn/turnOverQuery.html b/src/main/webapp/views/matTurn/turnOverQuery.html
index 26b3a71..edd57a9 100644
--- a/src/main/webapp/views/matTurn/turnOverQuery.html
+++ b/src/main/webapp/views/matTurn/turnOverQuery.html
@@ -85,7 +85,7 @@
function getCol() {
return [
{type: 'checkbox'},
- {field: 'matnr', align: 'center', title: 'sku'}
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'}
, {field: 'maktx', align: 'center', title: '鍝佸悕'}
, {field: 'specs', align: 'center', title: '瑙勬牸'}
];
diff --git a/src/main/webapp/views/pakStore/turnOverOwner.html b/src/main/webapp/views/pakStore/turnOverOwner.html
index 1fbb041..bf915a0 100644
--- a/src/main/webapp/views/pakStore/turnOverOwner.html
+++ b/src/main/webapp/views/pakStore/turnOverOwner.html
@@ -123,7 +123,7 @@
cellMinWidth: 50,
cols: [[
{type: 'checkbox',width: 50}
- ,{field: 'matnr', align: 'center',title: 'sku', sort:true}
+ ,{field: 'matnr', align: 'center',title: '鍟嗗搧缂栧彿', sort:true}
,{field: 'maktx', align: 'center',title: '鍟嗗搧鍚嶇О', sort:true}
,{field: 'loc_no', align: 'center',title: '搴撲綅鍙�', sort:true}
,{field: 'orderNo', align: 'center',title: '鍗曟嵁缂栧彿', hide: true}
diff --git a/src/main/webapp/views/pda/comb.html b/src/main/webapp/views/pda/comb.html
index 5e1f752..4739ffb 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: 'sku'},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockIn.html b/src/main/webapp/views/pda/stockIn.html
index 11bf752..9384793 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: 'sku'},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿'},
{field: 'maktx', align: 'center', title: '鍟嗗搧鍚嶇О'}
]],
done: function (res, curr, count) {
diff --git a/src/main/webapp/views/pda/stockOut.html b/src/main/webapp/views/pda/stockOut.html
index 9d1f852..388f317 100644
--- a/src/main/webapp/views/pda/stockOut.html
+++ b/src/main/webapp/views/pda/stockOut.html
@@ -130,7 +130,7 @@
cols: [[
{type: 'checkbox', fixed: 'left', width:30},
{field: 'count', align: 'center', title: '鏁伴噺', event: 'detail', style:'color: blue', width:50},
- {field: 'matnr', align: 'center', title: 'sku', event: 'detail'},
+ {field: 'matnr', align: 'center', title: '鍟嗗搧缂栧彿', event: 'detail'},
{field: 'maktx', align: 'center', title: '鍚嶇О', event: 'detail'},
{field: 'locNo', align: 'center', title: '搴撲綅', event: 'detail'}
]],
--
Gitblit v1.9.1