From fd95223d9703b9c038ed3c782474c885052dda08 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期五, 22 十二月 2023 17:05:25 +0800
Subject: [PATCH] 代码整理
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormInventoryServiceImpl.java | 44 ++++++++++++++++++++++++++------------------
1 files changed, 26 insertions(+), 18 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..1edab61 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,8 @@
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.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -31,6 +29,12 @@
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.base.service.core.LWhFormInventoryCoreService;
import com.consum.model.po.BaseWarehouse;
import com.consum.model.po.FinSysTenant;
import com.consum.model.po.FinSysTenantUser;
@@ -57,11 +61,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;
@@ -155,8 +159,8 @@
paramts.put("inventoryDateEnd", param.getEndTime() * 1000000 + 240000);
}
// 鏈烘瀯
- sql.append("and AGENCY_ID =:AGENCY_ID ");
- paramts.put("AGENCY_ID", sysInfo.getTenantId());
+ sql.append("and AGENCY_ID =:agencyId ");
+ paramts.put("agencyId", sysInfo.getTenantId());
sql.append("ORDER BY CREATE_TIME DESC ");
return selectSplit(sql.toString(), paramts, new LWhFormInventory());
@@ -208,7 +212,7 @@
log.error("鐩樼偣鍗曠墿鍝佷负绌�");
return 0;
}
- this.inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
+ inventoryGoodsService.updateInventoryGoods(inventoryGoodsList);
// 淇敼鐩樼偣鍗�
if (state == 2) {
// 瀹屾垚鐩樼偣鏃惰缃畬鎴愮洏鐐规椂闂�
@@ -340,25 +344,29 @@
return null;
}
Long warehouseId = inventory.getWarehouseId();
- Integer warehouseType = inventory.getWarehouseType();
formInventoryVO.setBusinessFormCode(inventory.getBusinessFormCode());
formInventoryVO.setBusinessFormName(inventory.getBusinessFormName());
formInventoryVO.setWarehouseId(warehouseId);
formInventoryVO.setWarehouseName(inventory.getWarehouseName());
+ // 缁熻浠撳簱鍐呯殑鐗╁搧
String sql =
- "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";
+ "SELECT distinct bgt.id baseGoodsTemplateId,bgm.id baseGoodsModelId,bgt.GOODS_NAME goodsTemplateName,bgm.MODEL_NAME baseGoodsModelsName,"
+ + "bgt.CLASSIFICATION TYPE,bgm.UNIT FROM l_wh_goods g "
+ + "LEFT JOIN base_goods_template bgt ON g.BASE_GOODS_TEMPLATE_ID = bgt.ID "
+ + "LEFT JOIN base_goods_models bgm ON bgm.GOODS_TEMPLATES_ID = bgt.id WHERE "
+ + "WAREHOUSE_ID = :warehouseId GROUP BY g.BASE_GOODS_MODELS_ID ";
HashMap<String, Object> param = new HashMap<>();
- param.put("agencyId", inventory.getAgencyId());
+ param.put("warehouseId", warehouseId);
+
List<Map<String, Object>> result = this.select(sql, param, new MapperUtil());
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);
});
@@ -379,7 +387,7 @@
param.put("id", id);
List<Map<String, Object>> select = this.select(sql, param, new MapperUtil());
if (CollectionUtils.isEmpty(select)) {
- return null;
+ return Collections.emptyList();
}
List<InventoryExcelTemplate> list = Lists.newArrayList();
select.forEach(item -> {
--
Gitblit v1.9.1