From 9c12e20237eb56bf2b53f3d751ba618b56954fad Mon Sep 17 00:00:00 2001
From: 石广澎 <shiguangpeng@163.com>
Date: 星期六, 02 十二月 2023 17:44:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 39 insertions(+), 16 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
similarity index 93%
rename from consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
rename to consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
index 199896f..1df2daf 100644
--- a/consum-base/src/main/java/com/consum/base/service/LWhFormTransferServiceImpl.java
+++ b/consum-base/src/main/java/com/consum/base/service/impl/LWhFormTransferServiceImpl.java
@@ -1,4 +1,4 @@
-package com.consum.base.service;
+package com.consum.base.service.impl;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
@@ -15,10 +15,32 @@
import com.consum.base.pojo.response.FormTransferGoodsVO;
import com.consum.base.pojo.response.GoodsModelVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
-import com.consum.model.po.*;
+import com.consum.base.service.BaseGoodsModelsServiceImpl;
+import com.consum.base.service.BaseWarehouseManagerService;
+import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.FinSysTenantServiceImpl;
+import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.LWhFormTransferService;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.base.service.LWhProcureModelUserRecordServiceImpl;
+import com.consum.base.service.LWhProcureModelUserServiceImpl;
+import com.consum.model.po.BaseWarehouse;
+import com.consum.model.po.BaseWarehouseManager;
+import com.consum.model.po.FinSysTenant;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormTransfer;
+import com.consum.model.po.LWhProcureModel;
+import com.consum.model.po.LWhProcureModelUser;
+import com.consum.model.po.LWhProcureModelUserRecord;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.StringUtils;
import com.walker.jdbc.service.BaseServiceImpl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -26,15 +48,13 @@
import org.springframework.transaction.interceptor.TransactionAspectSupport;
import org.springframework.util.CollectionUtils;
-import java.util.*;
-
/**
* @Description 璋冩嫧绠＄悊
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@Service
-public class LWhFormTransferServiceImpl extends BaseServiceImpl {
+public class LWhFormTransferServiceImpl extends BaseServiceImpl implements LWhFormTransferService {
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@@ -47,11 +67,7 @@
@Autowired
private LWhProcureModelService lWhProcureModelService;
@Autowired
- private LWhFormOutputCoreService lWhFormOutputCoreService;
- @Autowired
private LWhFormOutputServiceImpl lWhFormOutputService;
- @Autowired
- private LWhGoodsRecordService lWhGoodsRecordService;
@Autowired
private BaseGoodsModelsServiceImpl baseGoodsModelsService;
@Autowired
@@ -60,8 +76,6 @@
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
private BaseWarehouseManagerService baseWarehouseManagerService;
- @Autowired
- private BaseGoodsTemplateServiceImpl baseGoodsTemplateService;
private static String QUERY_FORM_TRANSFER_LIST = "SELECT ft.* FROM l_wh_form_transfer ft "
+ "left join L_WH_PROCURE_MODEL pm on pm.BUSINESS_ID = ft.id "
@@ -346,13 +360,16 @@
List<FormTransferGoodsVO> formTransferGoods = Lists.newArrayList();
for (Map<String, Object> map : procureModelList) {
FormTransferGoodsVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FormTransferGoodsVO.class);
-
+ Long baseGoodsTemplateId = procureTemplateInfoVO.getId();
// 鏌ヨ鍨嬪彿鏁伴噺
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
String sql2 = "SELECT pm.id,pm.BASE_GOODS_MODELS_NAME,bgm.UNIT,COUNTS,total_amount "
+ "FROM l_wh_procure_model pm LEFT JOIN base_goods_models bgm ON bgm.id = pm.BASE_GOODS_MODELS_ID "
- + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id";
- List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, paramMap, new MapperUtil());
+ + "LEFT JOIN base_goods_template bgt ON bgt.id = bgm.GOODS_TEMPLATES_ID " + "WHERE pm.BUSINESS_ID =:id and bgt.id =:baseGoodsTemplateId";
+ Map<String, Object> goodsModelParamMap = new HashMap<>();
+ goodsModelParamMap.put("id", result.getId());
+ goodsModelParamMap.put("baseGoodsTemplateId", baseGoodsTemplateId);
+ List<Map<String, Object>> modelList = lWhFormOutputService.select(sql2, goodsModelParamMap, new MapperUtil());
modelList.forEach(item -> {
GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
Integer businessType = result.getBusinessType();
@@ -381,9 +398,8 @@
}
goodsModelVOList.add(goodsModelVO);
+ procureTemplateInfoVO.setModels(goodsModelVOList);
});
-
- procureTemplateInfoVO.setModels(goodsModelVOList);
formTransferGoods.add(procureTemplateInfoVO);
}
result.setFormTransferGoods(formTransferGoods);
@@ -577,4 +593,11 @@
return select;
}
+
+ @Override
+ public LWhFormTransfer selectById(Long id) {
+ LWhFormTransfer lWhFormTransfer = new LWhFormTransfer();
+ lWhFormTransfer.setId(id);
+ return this.get(lWhFormTransfer);
+ }
}
--
Gitblit v1.9.1