From 6044195effdaed87cc462c707c603fbe85ed2b31 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 19 六月 2021 13:27:10 +0800
Subject: [PATCH] 1.pda原材料入库erp传入修改
---
src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java | 5 +++--
1 files changed, 3 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..2d4a9dd 100644
--- a/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/LocNormalServiceImpl.java
@@ -149,10 +149,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 +161,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));
--
Gitblit v1.9.1