From 7ec625f960e125c3975d84bf113788fe97b9ff6b Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期二, 22 六月 2021 14:11:20 +0800
Subject: [PATCH] 1.原材料出库扫单子默认显示平仓数量 2.平仓入库允许移除物料 3.平仓入库组托物料数量必须大于0
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 28 ++++++++++++++
src/main/webapp/views/pda/locNormalIn.html | 33 ++++++++++++++--
src/main/webapp/views/pda/locNormalOut.html | 2
src/main/java/com/zy/asrs/controller/MobileController.java | 2
4 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6d2b05c..a68185b 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -137,7 +137,7 @@
@RequestMapping("/bill/query/auth")
@ManagerAuth(memo = "鏍规嵁閫氱煡鍗曟煡璇㈡槑缁�")
public R billQuery(@RequestParam String billNo){
- List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).isNull("zpallet"));
+ List<WaitPakin> waitPakins = waitPakinService.selectList(new EntityWrapper<WaitPakin>().eq("supplier", billNo).and().gt("anfme", 0).isNull("zpallet"));
List<CombBillQueryVo> vos = new ArrayList<>();
if (!Cools.isEmpty(waitPakins)) {
for (WaitPakin waitPakin : waitPakins) {
diff --git a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
index 96febeb..26b9fc8 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -233,6 +233,20 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), updateAnfme);
}
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ if (Cools.isEmpty(locLog.getMemo())) {
+ locLog.setMemo("鍘熸潗鏂�");
+ }
+ locLog.setAnfme(increaseAnfme.doubleValue());
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鏉愭枡鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
// erp鏇存柊 InStockbill鍜孖nStockBillEntry
erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), increaseAnfme.doubleValue());
} else {
@@ -242,6 +256,20 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
}
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNormalLog locLog = new LocNormalLog();
+ VersionUtils.setLocNormalLog(locLog, list.get(i));
+ locLog.setAnfme(list.get(i).getAnfme().doubleValue());
+ if (Cools.isEmpty(locLog.getMemo())) {
+ locLog.setMemo("鍘熸潗鏂�");
+ }
+ locLog.setIoType(1);
+ locLog.setCreateTime(new Date());
+ locLog.setCreateUser(list.get(i).getAppeUser());
+ if (!locNormalLogService.insert(locLog)) {
+ String logStr = JSON.toJSONString(locLog);
+ log.info("骞充粨鏉愭枡鍏ュ簱璁板綍鎻掑叆澶辫触,鏁版嵁:" + logStr);
+ }
// erp鏇存柊 InStockbill鍜孖nStockBillEntry
erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), list.get(i).getAnfme().doubleValue());
}
diff --git a/src/main/webapp/views/pda/locNormalIn.html b/src/main/webapp/views/pda/locNormalIn.html
index e554323..f82101e 100644
--- a/src/main/webapp/views/pda/locNormalIn.html
+++ b/src/main/webapp/views/pda/locNormalIn.html
@@ -170,6 +170,7 @@
<button onclick="add()">+</button>
</div>
</div>
+ <button id="remove" onclick="remove()">绉婚櫎</button>
<button id="confirm" onclick="confirm()">淇濆瓨</button>
</div>
@@ -273,12 +274,14 @@
var count = $('#count').val();
var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
for (var j = 0; j < matData.length; j++) {
- if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
- if (count > maxCount || count < minCount) {
- tips("鏁伴噺涓嶈兘瓒呰繃鑼冨洿", true);
- return;
+ if (mnemonic) {
+ if (matNo === matData[j].matNo && mnemonic === matData[j].mnemonic) {
+ matData[j].count = Number(count);
}
- matData[j].count = Number(count);
+ } else {
+ if (matNo === matData[j].matNo) {
+ matData[j].count = Number(count);
+ }
}
}
tableIns.reload({data: matData});
@@ -286,6 +289,26 @@
tips("淇敼鎴愬姛");
}
+ function remove() {
+ var matnr = $('#matNo').val();
+ var index = $('#index').val();
+ var mnemonic = $("#mnemonic").val() === '' ? null : $("#mnemonic").val();
+ for (var j = 0; j < matData.length; j++) {
+ if (mnemonic) {
+ if (matnr === matData[j].matNo && mnemonic === matData[j].mnemonic) {
+ matData.splice(j, 1);
+ }
+ } else {
+ if (matnr === matData[j].matNo) {
+ matData.splice(j, 1);
+ }
+ }
+ }
+ tableIns.reload({data: matData});
+ layer.close(countLayer);
+ tips("绉婚櫎鎴愬姛");
+ }
+
window.onload = function () {
document.getElementById("uuid").focus();
}
diff --git a/src/main/webapp/views/pda/locNormalOut.html b/src/main/webapp/views/pda/locNormalOut.html
index aed8967..ab94a0d 100644
--- a/src/main/webapp/views/pda/locNormalOut.html
+++ b/src/main/webapp/views/pda/locNormalOut.html
@@ -293,7 +293,7 @@
if (res.data && res.data.length > 0) {
res.data.map(function (item) {
// 榛樿璧嬪��0寮�濮�
- item.anfmeOut = 0;
+ item.anfmeOut = item.anfme;
});
}
tableIns.reload({
--
Gitblit v1.9.1