From e19d9742d5d14823bc414b1d1d47778b3daee227 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期二, 19 十二月 2023 09:24:56 +0800
Subject: [PATCH] 盘点时库存查询不分仓库类型
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 25 ++++++++++++++-----------
1 files changed, 14 insertions(+), 11 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
index fab2164..3cf6f64 100644
--- a/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java
@@ -1,10 +1,7 @@
package com.consum.base.service.impl;
-import com.consum.base.service.BaseWarehouseService;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LWhFormInventoryGoodsServiceImpl;
-import com.consum.base.service.LWhFormInventoryService;
-import com.consum.base.service.LWhGoodsService;
+import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,6 +28,11 @@
import com.consum.base.pojo.response.FormInventoryDetailVO;
import com.consum.base.pojo.response.FormInventoryGoodsVO;
import com.consum.base.pojo.response.FormInventoryVO;
+import com.consum.base.service.BaseWarehouseService;
+import com.consum.base.service.FinSysTenantService;
+import com.consum.base.service.LWhFormInventoryGoodsService;
+import com.consum.base.service.LWhFormInventoryService;
+import com.consum.base.service.LWhGoodsService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -57,11 +59,11 @@
@Autowired
private BaseWarehouseService baseWarehouseService;
@Autowired
- private LWhFormInventoryGoodsServiceImpl inventoryGoodsService;
+ private LWhFormInventoryGoodsService inventoryGoodsService;
@Autowired
private LWhGoodsService lWhGoodsService;
@Autowired
- private FinSysTenantServiceImpl finSysTenantService;
+ private FinSysTenantService finSysTenantService;
@Autowired
@Lazy
private LWhFormInventoryCoreService lWhFormInventoryCoreService;
@@ -208,7 +210,7 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
return 0;
}
- this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
+ inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
// 淇敼鐩樼偣鍗�
if (state == 2) {
// 瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
@@ -348,7 +350,7 @@
formInventoryVO.setWarehouseName(inventory.getWarehouseName());
String sql =
- "select bgt.id baseGoodsTemplateId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,bgt.CLASSIFICATION type,bgm.UNIT "
+ "select bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,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<>();
@@ -357,8 +359,9 @@
List<FormInventoryGoodsVO> goodsVOList = Lists.newArrayList();
result.forEach(item -> {
FormInventoryGoodsVO baseGoodsModels = MapUtils.convertMapToObj(item, FormInventoryGoodsVO.class);
- int inventoryCount =
- this.lWhGoodsService.queryGoodsModelNum(warehouseType, warehouseId, baseGoodsModels.getId(), 1, null);
+ List<Long> warehouseIds = new ArrayList<>(Arrays.asList(warehouseId));
+ int inventoryCount = this.lWhGoodsService.queryGoodsModelNum(null, warehouseIds,
+ baseGoodsModels.getBaseGoodsModelId(), 1, null);
baseGoodsModels.setInventoryCount(inventoryCount);
goodsVOList.add(baseGoodsModels);
});
--
Gitblit v1.9.1