From 2af69a47b08aa4988cc9733a361a733a671a5f81 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期六, 09 十二月 2023 17:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryGoodsServiceImpl.java | 42 +++++++++++++++++++++---------------------
1 files changed, 21 insertions(+), 21 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 ff3142a..953aa85 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
@@ -1,13 +1,18 @@
package com.consum.base.service;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
+
import com.consum.base.core.utils.IdUtil;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.model.po.LWhFormInventoryGoods;
import com.walker.jdbc.service.BaseServiceImpl;
-import java.util.ArrayList;
-import java.util.List;
+
import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
/**
* @Description 鐩樼偣鍗曠墿鍝�
@@ -16,6 +21,7 @@
*/
@Slf4j
@Service
+@Transactional(propagation = Propagation.REQUIRED)
public class LWhFormInventoryGoodsServiceImpl extends BaseServiceImpl {
/**
@@ -30,8 +36,7 @@
return this.select(inventoryGoods);
}
-
- public int add(List<FormInventoryGoodsVO> inventoryGoodsList, Long inventoryId) {
+ public List<FormInventoryGoodsVO> add(List<FormInventoryGoodsVO> inventoryGoodsList, Long inventoryId) {
List<LWhFormInventoryGoods> goodsList = new ArrayList<>();
for (FormInventoryGoodsVO inventoryGoods : inventoryGoodsList) {
LWhFormInventoryGoods lWhFormInventoryGoods = new LWhFormInventoryGoods();
@@ -43,9 +48,12 @@
lWhFormInventoryGoods.setBaseGoodsModelsId(inventoryGoods.getId());
lWhFormInventoryGoods.setBaseGoodsModelsName(inventoryGoods.getBaseGoodsModelsName());
lWhFormInventoryGoods.setInitCounts(inventoryGoods.getInventoryCount());
+ // 淇濆瓨鎴愬姛鍚庤繑鍥瀒d,鐢ㄦ潵杩涜璁板綍鐨勬洿鏂�
+ inventoryGoods.setId(lWhFormInventoryGoods.getId());
goodsList.add(lWhFormInventoryGoods);
}
- return this.insert(goodsList);
+ this.insert(goodsList);
+ return inventoryGoodsList;
}
public int updateInventoryGoods(List<FormInventoryGoodsVO> inventoryGoodsList) {
@@ -56,26 +64,18 @@
Integer inventoryCount = inventoryGoods.getInventoryCount();
Integer realNum = inventoryGoods.getRealNum();
if (realNum != null) {
- int errorCount = inventoryCount - realNum;
+ int errorCount = realNum - inventoryCount;
lWhFormInventoryGoods.setInventoryCounts(realNum);
- lWhFormInventoryGoods.setErrorCounts(errorCount);
- //鐩樼偣缁撴灉锛�1=姝ｅ父锛�2=鐩樼泩锛�3=鐩樹簭锛�
+ lWhFormInventoryGoods.setErrorCounts(Math.abs(errorCount));
+ // 鐩樼偣缁撴灉锛�1=姝ｅ父锛�2=鐩樼泩锛�3=鐩樹簭锛�
lWhFormInventoryGoods.setInventoryResult((errorCount > 0) ? 2 : (errorCount < 0) ? 3 : 1);
- goodsList.add(lWhFormInventoryGoods);
+ // TODO 鎵归噺鏇存柊
+ this.update(lWhFormInventoryGoods);
+ // goodsList.add(lWhFormInventoryGoods);
}
}
- return this.updateBatch(goodsList);
+ return 1;
}
-
- /**
- * @Description 鏍规嵁鐩樼偣鍗昳d鍒犻櫎鐩樼偣鍗曠墿鍝�
- * @Author 鍗㈠簡闃�
- * @Date 2023/10/31
- */
- public void delByFormInventoryId(Long id) {
-
- }
-
}
--
Gitblit v1.9.1