From 1a41abd4bdc077f79ef182fd3e247c55edc43b7f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 17:02:46 +0800
Subject: [PATCH] #上架规则
---
src/main/webapp/static/js/locDetl/locDetl.js | 2 --
src/main/webapp/static/js/picking/picking.js | 4 ++--
src/main/webapp/static/js/orderCheckLog/orderCheckLog.js | 3 +--
src/main/webapp/views/pakStore/turnOverOwner.html | 2 --
src/main/resources/mapper/LocDetlMapper.xml | 2 +-
src/main/webapp/static/js/manLocDetl/manLocDetl.js | 2 --
src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java | 3 +++
src/main/webapp/static/js/pakStore/turnOver.js | 2 --
src/main/webapp/static/js/picking/pickingOrder.js | 2 --
src/main/webapp/static/js/orderLog/orderLog.js | 3 +--
src/main/webapp/static/js/orderCheck/orderCheck.js | 4 ----
11 files changed, 8 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
index 1c13db3..9e08dd7 100644
--- a/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/NodeServiceImpl.java
@@ -230,6 +230,9 @@
@Override
public List<String> getRemmendLoc(String matnr) {
LocRule locRule = locRuleService.selectOne(new EntityWrapper<LocRule>().eq("matnr", matnr));
+ if (locRule == null){
+ return null;
+ }
List<String> list = this.baseMapper.getRommendLoc(locRule.getRowBeg(),locRule.getRowEnd(),locRule.getBayBeg(),locRule.getBayEnd(),locRule.getLevBeg(),locRule.getLevEnd());
return list;
}
diff --git a/src/main/resources/mapper/LocDetlMapper.xml b/src/main/resources/mapper/LocDetlMapper.xml
index 10eb31e..05abd0f 100644
--- a/src/main/resources/mapper/LocDetlMapper.xml
+++ b/src/main/resources/mapper/LocDetlMapper.xml
@@ -413,7 +413,7 @@
<select id="searchByLike" resultMap="BaseResultMap">
select *
- from asr_loc_detl
+ from asr_loc_detl_merge
where
1 = 1
<if test="orderNo != null and orderNo != ''">
diff --git a/src/main/webapp/static/js/locDetl/locDetl.js b/src/main/webapp/static/js/locDetl/locDetl.js
index dcc1056..2cc2fb8 100644
--- a/src/main/webapp/static/js/locDetl/locDetl.js
+++ b/src/main/webapp/static/js/locDetl/locDetl.js
@@ -23,8 +23,6 @@
,{field: 'itemNum', align: 'center',title: '鍝侀」鏁�', hide: true}
,{field: 'safeQty', align: 'center',title: '瀹夊叏搴撳瓨閲�', hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
- ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
- ,{field: 'payment$', align: 'center',title: '璐х墿鐘舵��', hide: false}
,{field: 'length', align: 'center',title: '鍗曠姣涢噸', hide: true}
,{field: 'volume', align: 'center',title: '鍗曠浣撶Н', hide: true}
,{field: 'threeCode', align: 'center',title: '绠卞瓙灏哄', hide: true}
diff --git a/src/main/webapp/static/js/manLocDetl/manLocDetl.js b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
index 45c0879..c907781 100644
--- a/src/main/webapp/static/js/manLocDetl/manLocDetl.js
+++ b/src/main/webapp/static/js/manLocDetl/manLocDetl.js
@@ -35,9 +35,7 @@
,{field: 'source$', align: 'center',title: '鍒惰喘', hide: true}
,{field: 'check$', align: 'center',title: '瑕佹眰妫�楠�', hide: true}
,{field: 'danger$', align: 'center',title: '鍗遍櫓鍝�', hide: true}
- ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
,{field: 'status$', align: 'center',title: '鏄庣粏閿�', hide: false}
- ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
];
diff --git a/src/main/webapp/static/js/orderCheck/orderCheck.js b/src/main/webapp/static/js/orderCheck/orderCheck.js
index fdc8cc0..f474642 100644
--- a/src/main/webapp/static/js/orderCheck/orderCheck.js
+++ b/src/main/webapp/static/js/orderCheck/orderCheck.js
@@ -137,8 +137,6 @@
{field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
{field: 'type$', title: '鐘舵��'},
- {field: 'owner$', title: '璐т富'},
- {field: 'payment$', title: '璐х墿鐘舵��'},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar3', minWidth: 80, width: 80, fixed: 'right'}
]],
request: {
@@ -264,8 +262,6 @@
{field: 'matnr', title: '鍟嗗搧缂栫爜', width: 160},
{field: 'maktx', title: '鍟嗗搧鍚嶇О', width: 160},
{field: 'locNo', title: '搴撲綅鍙�'},
- {field: 'owner$', title: '璐т富'},
- {field: 'payment$', title: '璐х墿鐘舵��'},
{field: 'anfme', title: '搴撳瓨鏁伴噺'},
{field: 'realAnfme', title: '鐪熷疄鏁伴噺'},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
diff --git a/src/main/webapp/static/js/orderCheckLog/orderCheckLog.js b/src/main/webapp/static/js/orderCheckLog/orderCheckLog.js
index 5042c90..1342f63 100644
--- a/src/main/webapp/static/js/orderCheckLog/orderCheckLog.js
+++ b/src/main/webapp/static/js/orderCheckLog/orderCheckLog.js
@@ -135,8 +135,7 @@
{field: 'anfme', title: '鏁伴噺'},
{field: 'realAnfme', title: '鐪熷疄鏁伴噺',style: 'color: blue;font-weight: bold', edit: true},
{field: 'diffAnfme', title: '宸紓鏁伴噺', style: 'font-weight: bold'},
- {field: 'owner$', title: '璐т富'},
- {field: 'payment$', title: '璐х墿鐘舵��'},
+
{field: 'type$', title: '鐘舵��'}
]],
request: {
diff --git a/src/main/webapp/static/js/orderLog/orderLog.js b/src/main/webapp/static/js/orderLog/orderLog.js
index c392cfc..46f4ae1 100644
--- a/src/main/webapp/static/js/orderLog/orderLog.js
+++ b/src/main/webapp/static/js/orderLog/orderLog.js
@@ -130,8 +130,7 @@
{field: 'anfme', title: '鏁伴噺'},
{field: 'workQty', title: '浣滀笟鏁伴噺'},
{field: 'qty', title: '瀹屾垚鏁伴噺', style: 'font-weight: bold'},
- {field: 'owner$', title: '璐т富'},
- {field: 'payment$', title: '璐х墿褰㈡��'},
+
{field: 'weight', title: '閲嶉噺'}
]],
request: {
diff --git a/src/main/webapp/static/js/pakStore/turnOver.js b/src/main/webapp/static/js/pakStore/turnOver.js
index 8d0e95a..d9a991a 100644
--- a/src/main/webapp/static/js/pakStore/turnOver.js
+++ b/src/main/webapp/static/js/pakStore/turnOver.js
@@ -39,8 +39,6 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
- ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
- ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
]],
done: function(res, curr, count) {
tableMerge.render(this);
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index 06fbb0f..b1dec70 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -295,9 +295,9 @@
var className = templateDom.attr("class");
if (className === 'template-barcode') {
- json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2¶m=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+ json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2¶m=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
} else {
- json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2¶m=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].maktx+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
+ json.data[i]["barcodeUrl"] = baseUrl + "/ManPakOut/code/auth?type=2¶m=" + (json.data[i].docNum+";"+json.data[i].matnr+";"+json.data[i].batch+";"+json.data[i].anfme+";"+json.data[i].locNo+";");
}
}
var tpl = templateDom.html();
diff --git a/src/main/webapp/static/js/picking/pickingOrder.js b/src/main/webapp/static/js/picking/pickingOrder.js
index df11673..847332b 100644
--- a/src/main/webapp/static/js/picking/pickingOrder.js
+++ b/src/main/webapp/static/js/picking/pickingOrder.js
@@ -311,8 +311,6 @@
{field: 'specs', title: '瑙勬牸'},
{field: 'anfme', title: '鏁伴噺(淇敼)', style: 'color: blue;font-weight: bold', edit: true, minWidth: 110, width: 110},
{field: 'workQty', title: '浣滀笟鏁伴噺', minWidth: 100, width: 100},
- {field: 'owner$', title: '璐т富', minWidth: 100, width: 100},
- {field: 'payment$', title: '璐х墿褰㈡��', minWidth: 100, width: 100},
// {field: 'unit', title: '鍗曚綅', width: 80},
{field: 'memo', title: '澶囨敞' , edit: true},
{align: 'center', title: '鎿嶄綔', toolbar: '#formSSXMTableBar', minWidth: 80, width: 80, fixed: 'right'}
diff --git a/src/main/webapp/views/pakStore/turnOverOwner.html b/src/main/webapp/views/pakStore/turnOverOwner.html
index 68b8caf..f1b12dd 100644
--- a/src/main/webapp/views/pakStore/turnOverOwner.html
+++ b/src/main/webapp/views/pakStore/turnOverOwner.html
@@ -132,8 +132,6 @@
,{field: 'zpallet', align: 'center',title: '鎵樼洏鏉＄爜',hide: false}
,{field: 'specs', align: 'center',title: '瑙勬牸',hide: true}
,{field: 'weight', align: 'center',title: '閲嶉噺', hide: false}
- ,{field: 'owner$', align: 'center',title: '璐т富', hide: false}
- ,{field: 'payment$', align: 'center',title: '璐х墿褰㈡��', hide: false}
]
],
--
Gitblit v1.9.1