From 8eeafc1f4ad3905c4b3bbf80a588a5b6c503e76b Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期四, 30 十一月 2023 15:53:44 +0800
Subject: [PATCH] feat: 部门物品 物品分发查询加机构限制
---
consum-base/src/main/java/com/consum/base/service/LWhFormInventoryServiceImpl.java | 71 +++++------------------------------
1 files changed, 10 insertions(+), 61 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..bb7ee4f 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) {
//瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
@@ -231,51 +225,6 @@
return 1;
}
- /**
- * 瀹屾垚鐩樼偣
- *
- * @author 鍗㈠簡闃�
- * @date 2023/10/31
- */
-// public int finishPd(LWhFormInventoryParam dto) {
-// //1.鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗�
-// LWhFormInventory lWhFormInventory = this.get(new LWhFormInventory(dto.getId()));
-// if (lWhFormInventory == null) {
-// log.error("鏍规嵁鐩樼偣鍗昳d鏌ヨ鐩樼偣鍗� 澶辫触");
-// return 0;
-// }
-// //2.淇敼鐩樼偣鍗�
-// lWhFormInventory.setStates(2);
-// lWhFormInventory.setStopTime(DateUtils.getDateTimeNumber(System.currentTimeMillis()));
-// int flag1 = this.update(lWhFormInventory);
-// if (flag1 == 0) {
-// log.error("淇敼鐩樼偣鍗� 澶辫触");
-// return 0;
-// }
-// //3.鏇存柊鐩樼偣鍗曠墿鍝�
-// List<LWhFormInventoryGoods> inventoryGoodsList = dto.getInventoryGoodsList();
-// if (CollectionUtils.isEmpty(inventoryGoodsList)) {
-// log.error("鐩樼偣鍗曠墿鍝� 涓虹┖");
-// return 0;
-// }
-// for (LWhFormInventoryGoods inventoryGoods : inventoryGoodsList) {
-// int errorCounts = inventoryGoods.getInitCounts() - inventoryGoods.getInventoryCounts();
-// if (errorCounts > 0) {
-// inventoryGoods.setInventoryResult(3);
-// } else if (errorCounts < 0) {
-// inventoryGoods.setInventoryResult(2);
-// } else {
-// inventoryGoods.setInventoryResult(1);
-// }
-// inventoryGoods.setErrorCounts(Math.abs(errorCounts));
-// }
-// int flag2 = inventoryGoodsService.update(inventoryGoodsList);
-// if (flag2 != inventoryGoodsList.size()) {
-// log.error("鏇存柊鐩樼偣鍗曠墿鍝� 澶辫触");
-// return 0;
-// }
-// return 1;
-// }
/**
* @return
@@ -387,7 +336,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