From 7077d2aca171525b6f021cd3307788ac7c55dd14 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 21 六月 2021 17:19:27 +0800
Subject: [PATCH] 平仓日志功能(未完成)
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 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 b88ae34..14e93b5 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.core.common.Cools;
import com.core.exception.CoolException;
+import com.zy.asrs.entity.LocNoramlLog;
import com.zy.asrs.entity.LocNormal;
import com.zy.asrs.entity.WaitPakin;
import com.zy.asrs.entity.WaitPakinLog;
@@ -15,6 +16,7 @@
import com.zy.asrs.service.LocNormalService;
import com.zy.asrs.service.WaitPakinLogService;
import com.zy.asrs.service.WaitPakinService;
+import com.zy.asrs.utils.VersionUtils;
import com.zy.common.service.erp.ErpService;
import com.zy.common.service.erp.ErpSqlServer;
import com.zy.common.service.erp.entity.CPICMO;
@@ -149,10 +151,11 @@
List<LocNormal> updateList = new ArrayList<>();
if (!Cools.isEmpty(list.get(i).getSupplier())) { // 瀛樺湪鍏ュ簱鍗曞彿鐨勬墠杩涜erp鏇存柊
// 鍒ゆ柇鍘熷厛骞充粨鏄惁瀛樺湪鏈夎揣,濡傛灉鏈夎揣鏁伴噺杩涜绱姞
- LocNormal oldLocList = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("supplier", list.get(i).getSupplier()).and().eq("state", "1").eq("warehouse", list.get(i).getWarehouse()));
+ LocNormal oldLocList = locNormalService.selectOne(new EntityWrapper<LocNormal>().eq("supplier", list.get(i).getSupplier()).and().eq("state", "1").eq("warehouse", list.get(i).getWarehouse()).and().eq("matnr", list.get(i).getMatnr()));
if (!Cools.isEmpty(oldLocList)) {
Double updateAnfme = new Double(list.get(i).getAnfme().doubleValue());
// 骞充粨鍏ュ簱锛堟洿鏂帮級閫昏緫
+ BigDecimal increaseAnfme = new BigDecimal(String.valueOf(list.get(i).getAnfme()));
list.get(i).setAnfme(oldLocList.getAnfme().add(list.get(i).getAnfme()));
updateList.add(list.get(i));
if (baseMapper.pdaLocNormalUpdate(updateList) > 0) {
@@ -160,7 +163,7 @@
custWaitPakinToLog(list.get(i), updateAnfme);
}
// erp鏇存柊 InStockbill鍜孖nStockBillEntry
- erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), list.get(i).getAnfme().doubleValue());
+ erpService.incrementPakIn(list.get(i).getSupplier(), list.get(i).getMatnr(), increaseAnfme.doubleValue());
} else {
// 骞充粨鍏ュ簱閫昏緫
addList.add(list.get(i));
@@ -244,6 +247,14 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), updateAnfme);
}
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNoramlLog log = new LocNoramlLog();
+ VersionUtils.setLocNormalLog(log, list.get(i));
+ log.setAnfme(updateAnfme);
+ log.setIoType(1);
+ log.setCreateTime(new Date());
+ log.setCreateUser(list.get(i).getAppeUser());
+
} else {
// erp鏇存柊
updateCPICMO(list.get(i));
@@ -253,6 +264,14 @@
// cust_wait_pakin杞琧ust_wait_pakin_log锛屽苟鏇存柊鏁伴噺
custWaitPakinToLog(list.get(i), list.get(i).getAnfme().doubleValue());
}
+ // 鐢熸垚骞充粨鍑哄叆搴撹褰�
+ LocNoramlLog log = new LocNoramlLog();
+ VersionUtils.setLocNormalLog(log, list.get(i));
+ log.setAnfme(list.get(i).getAnfme().doubleValue());
+ log.setIoType(1);
+ log.setCreateTime(new Date());
+ log.setCreateUser(list.get(i).getAppeUser());
+
}
} else {
throw new CoolException("閫氱煡鍗曞彿涓嶅彲涓虹┖");
--
Gitblit v1.9.1