From abc5baf903a2bd229fb7f2decd35b26536d86e13 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期三, 29 十一月 2023 15:07:57 +0800
Subject: [PATCH] 部门分发增加出库和入库
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 31 +++++++++++++++----------------
1 files changed, 15 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 cb62402..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 鐩樼偣
@@ -157,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) {
@@ -175,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;
}
@@ -189,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()));
@@ -338,9 +337,9 @@
mapGenericPager.getDatas().forEach(item -> {
FormInventoryDetailVO formInventoryDetailVO = MapUtils.convertMapToObj(item, FormInventoryDetailVO.class);
formInventoryDetailVO.setInventoryResultType(
- formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
+ formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩" : "鐩樹簭"));
formInventoryDetailVO.setInventoryType(
- formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩鍏ュ簱" : "鐩樹簭鍑哄簱"));
+ formInventoryDetailVO.getInventoryResult() == null ? null : (formInventoryDetailVO.getInventoryResult() == 2 ? "鐩樼泩鍏ュ簱" : "鐩樹簭鍑哄簱"));
formInventoryDetailVO.setWarehouseFormCode(formInventoryDetailVO.getWarehouseFormCode());
result.add(formInventoryDetailVO);
});
@@ -351,8 +350,8 @@
public List<FormInventoryGoodsVO> selectDetailById(Long id) {
String sql = "select fig.id, fig.BASE_GOODS_TEMPLATE_ID,fig.GOODS_TEMPLATE_NAME,fig.BASE_GOODS_MODELS_NAME,"
- + "fig.INIT_COUNTS inventoryCount,fig.INVENTORY_COUNTS realNum,fig.INVENTORY_RESULT status,fig.unit,bgt.CLASSIFICATION type from "
- + "l_wh_form_inventory_goods fig left join base_goods_template bgt on bgt.id =fig.BASE_GOODS_TEMPLATE_ID where fig.WH_FORM_INVENTORY_ID = :id";
+ + "fig.INIT_COUNTS inventoryCount,fig.INVENTORY_COUNTS realNum,fig.INVENTORY_RESULT status,fig.unit,bgt.CLASSIFICATION type from "
+ + "l_wh_form_inventory_goods fig left join base_goods_template bgt on bgt.id =fig.BASE_GOODS_TEMPLATE_ID where fig.WH_FORM_INVENTORY_ID = :id";
HashMap<String, Object> param = new HashMap<>();
param.put("id", id);
List<Map<String, Object>> select = select(sql, param, new MapperUtil());
@@ -382,9 +381,9 @@
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 "
- + "from base_goods_models bgm left join base_goods_template bgt on bgm.GOODS_TEMPLATES_ID = bgt.id "
- + "where bgt.AGENCY_ID = :agencyId";
+ "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<>();
param.put("agencyId", inventory.getAgencyId());
List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
--
Gitblit v1.9.1