From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java | 61 ++++++++++++++----------------
1 files changed, 29 insertions(+), 32 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
index 5331d39..c6f4220 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java
@@ -8,6 +8,8 @@
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
/**
* @Description 鐩樼偣鍗曠墿鍝�
@@ -16,6 +18,7 @@
*/
@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryGoodsServiceImpl extends BaseServiceImpl {
/**
@@ -30,52 +33,46 @@
return this.select(inventoryGoods);
}
- /**
- * @return
- * @Description 鏂板鐩樼偣鍗曠墿鍝佽褰�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
-// public int add(List<Map<String, Object>> list, Long warehouseId) {
-// List<LWhFormInventoryGoods> inventoryGoodsList = new ArrayList<>();
-// for (Map<String, Object> map : list) {
-// LWhFormInventoryGoods inventoryGoods = new LWhFormInventoryGoods();
-// inventoryGoods.setId(IdUtil.generateId());
-// inventoryGoods.setWhFormInventoryId(warehouseId);
-// inventoryGoods.setBaseGoodsTemplateId((Long) map.get("id"));
-// inventoryGoods.setGoodsTemplateName((String) map.get("goodsname"));
-// inventoryGoods.setUnit((String) map.get("unit"));
-// inventoryGoods.setBaseGoodsModelsId((Long) map.get("modelsid"));
-// inventoryGoods.setBaseGoodsModelsName((String) map.get("goodsTemplateId"));
-// inventoryGoods.setInitCounts((Integer) map.get("endcount"));
-//
-// inventoryGoodsList.add(inventoryGoods);
-// }
-// return this.insert(inventoryGoodsList);
-// }
- public int add(List<FormInventoryGoodsVO> inventoryGoodsList, Long warehouseId) {
+
+ public int add(List<FormInventoryGoodsVO> inventoryGoodsList, Long inventoryId) {
List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
LWhFormInventoryGoods lWhFormInventoryGoods = new LWhFormInventoryGoods();
lWhFormInventoryGoods.setId(IdUtil.generateId());
- lWhFormInventoryGoods.setWhFormInventoryId(warehouseId);
+ lWhFormInventoryGoods.setWhFormInventoryId(inventoryId);
lWhFormInventoryGoods.setBaseGoodsTemplateId(inventoryGoods.getBaseGoodsTemplateId());
lWhFormInventoryGoods.setGoodsTemplateName(inventoryGoods.getGoodsTemplateName());
lWhFormInventoryGoods.setUnit(inventoryGoods.getUnit());
lWhFormInventoryGoods.setBaseGoodsModelsId(inventoryGoods.getId());
lWhFormInventoryGoods.setBaseGoodsModelsName(inventoryGoods.getBaseGoodsModelsName());
- Integer inventoryCount = inventoryGoods.getInventoryCount();
- Integer realNum = inventoryGoods.getRealNum();
- int errorCount = inventoryCount - realNum;
- lWhFormInventoryGoods.setInventoryCounts(realNum);
- lWhFormInventoryGoods.setErrorCounts(errorCount);
- //鐩樼偣缁撴灉锛�1=姝ｅ父锛�2=鐩樼泩锛�3=鐩樹簭锛�
- lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? 2 : (errorCount < 0) ? 3 : 1);
+ lWhFormInventoryGoods.setInitCounts(inventoryGoods.getInventoryCount());
goodsList.add(lWhFormInventoryGoods);
}
return this.insert(goodsList);
}
+ public int updateInventoryGoods(List<FormInventoryGoodsVO> inventoryGoodsList) {
+ List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
+ for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
+ LWhFormInventoryGoods lWhFormInventoryGoods = new LWhFormInventoryGoods();
+ lWhFormInventoryGoods.setId(inventoryGoods.getId());
+ Integer inventoryCount = inventoryGoods.getInventoryCount();
+ Integer realNum = inventoryGoods.getRealNum();
+ if (realNum != null) {
+ int errorCount = realNum - inventoryCount;
+ lWhFormInventoryGoods.setInventoryCounts(realNum);
+ lWhFormInventoryGoods.setErrorCounts(Math.abs(errorCount));
+ //鐩樼偣缁撴灉锛�1=姝ｅ父锛�2=鐩樼泩锛�3=鐩樹簭锛�
+ lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? 2 : (errorCount < 0) ? 3 : 1);
+ // TODO 鎵归噺鏇存柊
+ this.update(lWhFormInventoryGoods);
+// goodsList.add(lWhFormInventoryGoods);
+ }
+
+ }
+ return 1;
+ }
+
/**
* @Description 鏍规嵁鐩樼偣鍗昳d鍒犻櫎鐩樼偣鍗曠墿鍝�
* @Author 鍗㈠簡闃�
--
Gitblit v1.9.1