From 6078c3e72dd7acbf910a0f8bd8b8d17e7edf0302 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期一, 05 七月 2021 16:19:37 +0800
Subject: [PATCH] 1.pda添加物料（非原材料）新增判断生产单号为空的情况
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 32 ++++++++++++++++++++++++++++++--
1 files changed, 30 insertions(+), 2 deletions(-)
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..c3d940a 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 {
@@ -241,6 +255,20 @@
if (baseMapper.pdaLocNormalIn(addList) > 0) {
// 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());
@@ -485,12 +513,12 @@
}
@Override
- public List<LocNormal> queryLocNorlMatnr(String fbillNo) {
+ public List<LocNormal> queryLocNorlMatnr(String fbillNo, String mnemonic) {
List<OutStockBillEntry> matList = outStockMapper.queryMatnrWithBillNo(fbillNo);
List<LocNormal> locNormal = new ArrayList<>();
List<LocNormal> locNormalResult = new ArrayList<>();
for (Integer i = 0; i < matList.size(); i++) {
- locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber()) ;
+ locNormal = baseMapper.queryLocNorlMatnr(matList.get(i).getFnumber(), mnemonic) ;
if (locNormal.size() > 0) {
for (LocNormal e:locNormal) {
LocNormal obj = new LocNormal();
--
Gitblit v1.9.1