From 50b1b07bfa382c3f19c6b23f1cff4dfa50294f07 Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 30 十一月 2023 10:58:38 +0800
Subject: [PATCH] feat: 库存管理 增加加载状态
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 26 ++++++++++----------------
1 files changed, 10 insertions(+), 16 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
index b6a158b..79c9669 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java
@@ -21,17 +21,17 @@
import com.walker.infrastructure.utils.DateUtils;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
-
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
/**
* @Description 鐩樼偣
@@ -47,11 +47,7 @@
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
- private FinSysTenantUserServiceImpl finSysTenantUserService;
- @Autowired
private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
- @Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
@@ -161,7 +157,7 @@
}
- public void saveInventory(FormInventoryVO dto, Long id) {
+ public List<FormInventoryGoodsVO> saveInventory(FormInventoryVO dto, Long id) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(id));
if (lWhFormInventory == null) {
@@ -179,11 +175,9 @@
if (CollectionUtils.isEmpty(formInventoryGoodsList)) {
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
}
- int num = inventoryGoodsService.add(formInventoryGoodsList, id);
- if (num != formInventoryGoodsList.size()) {
- log.error("鏇存柊鐩樼偣鍗曠墿鍝佸け璐�");
- }
+ List<FormInventoryGoodsVO> result = inventoryGoodsService.add(formInventoryGoodsList, id);
+ return result;
}
@@ -193,6 +187,7 @@
* @author 鍗㈠簡闃�
* @date 2023/10/31
*/
+ @Transactional(rollbackFor = Exception.class)
public int updateInventoryInfo(LWhFormInventoryParam dto, Integer state, S_user_core currentUser, FinSysTenantUser sysInfo) {
//1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
@@ -206,8 +201,7 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
return 0;
}
- int i = this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
- System.out.println(i);
+ this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
//淇敼鐩樼偣鍗�
if (state == 2) {
//瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
@@ -387,7 +381,7 @@
formInventoryVO.setWarehouseName(inventory.getWarehouseName());
String sql =
- "select bgm.id,bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
+ "where bgt.AGENCY_ID = :agencyId";
HashMap<String, Object> param = new HashMap<>();
--
Gitblit v1.9.1