From d8fb6d11aa24b77b8bbcc5740140d31f5692837d Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期四, 16 十一月 2023 16:11:05 +0800
Subject: [PATCH] feat: 调拨调整
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 60 +++++++++++++++++-------------------------------------------
1 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
index 0bef5bb..b3e027c 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java
@@ -7,31 +7,13 @@
import com.consum.base.core.utils.CommonUtil;
import com.consum.base.core.utils.MapUtils;
import com.consum.base.core.utils.MapperUtil;
-import com.consum.base.pojo.LWhFormProcureGoodsParams;
+import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
-import com.consum.base.pojo.LWhProcureModelParams;
+import com.consum.base.pojo.LWhProcureModelParam;
import com.consum.base.pojo.query.FormProcureQry;
-import com.consum.base.pojo.response.FormProcureVO;
-import com.consum.base.pojo.response.FromProcureTemplateInfoVO;
-import com.consum.base.pojo.response.GoodsModelVO;
-import com.consum.base.pojo.response.LWhFormProcureExtendVO;
-import com.consum.base.pojo.response.LWhFormProcureGoodsVO;
-import com.consum.base.service.BaseGoodsTemplateServiceImpl;
-import com.consum.base.service.BaseWarehouseServiceImpl;
-import com.consum.base.service.FinSysTenantServiceImpl;
-import com.consum.base.service.LOrgSupplierServiceImpl;
-import com.consum.base.service.LWhFormProcureCoreService;
-import com.consum.base.service.LWhFormProcureGoodsService;
-import com.consum.base.service.LWhFormProcureService;
-import com.consum.base.service.LWhGoodsService;
-import com.consum.base.service.LWhProcureModelService;
-import com.consum.model.po.BaseGoodsTemplate;
-import com.consum.model.po.BaseWarehouse;
-import com.consum.model.po.FinSysTenantUser;
-import com.consum.model.po.LOrgSupplier;
-import com.consum.model.po.LWhFormProcure;
-import com.consum.model.po.LWhFormProcureGoods;
-import com.consum.model.po.LWhProcureModel;
+import com.consum.base.pojo.response.*;
+import com.consum.base.service.*;
+import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
@@ -41,22 +23,13 @@
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import javax.annotation.Resource;
import org.apache.commons.compress.utils.Lists;
import org.springframework.beans.BeanUtils;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.lang.reflect.Field;
+import java.util.*;
/**
* @ClassName LWhFormProcureController
@@ -104,7 +77,7 @@
String tenantId = sysTenantUser.getTenantId();
String tenantName = sysTenantUser.getTenantName();
- List<LWhFormProcureGoodsParams> procureGoods = param.getProcureGoods();
+ List<LWhFormProcureGoodsInfoParam> procureGoods = param.getProcureGoods();
if (CollectionUtils.isEmpty(procureGoods)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
@@ -123,7 +96,7 @@
ArrayList<LWhProcureModel> procureModelList = new ArrayList<>();
for (int i = 0; i < procureGoods.size(); i++) {
- LWhFormProcureGoodsParams procureGoodT = procureGoods.get(i);
+ LWhFormProcureGoodsInfoParam procureGoodT = procureGoods.get(i);
Long baseCategoryId = procureGoodT.getBaseCategoryId();
Long baseGoodsTemplateId = procureGoodT.getBaseGoodsTemplateId();
String supplier = procureGoodT.getSupplier();
@@ -132,7 +105,7 @@
supplierList.add(supplier);
}
- List<LWhProcureModelParams> models = procureGoodT.getModels();
+ List<LWhProcureModelParam> models = procureGoodT.getModels();
if (CollectionUtils.isEmpty(models)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
@@ -146,7 +119,7 @@
procureGood.setGoodsTemplateName(procureGoodT.getGoodsTemplateName());
procureGood.setSupplier(supplier);
procureGood.setSort(i);
- for (LWhProcureModelParams modelT : models) {
+ for (LWhProcureModelParam modelT : models) {
Integer counts = modelT.getCounts();
if (counts == null || counts <= 0) {
return ResponseValue.error("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝ｆ暣鏁�");
@@ -178,6 +151,7 @@
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(supplier);
+ model.setTotalAmount(price*counts);
procureModelList.add(model);
}
procureGoodList.add(procureGood);
@@ -245,9 +219,9 @@
+ "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("id", item.getId());
- List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap);
+ List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
for (Map<String, Object> map : procureModelList) {
- FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(MapUtils.toReplaceKeyLow(map), FromProcureTemplateInfoVO.class);
+ FromProcureTemplateInfoVO procureTemplateInfoVO = MapUtils.convertMapToObj(map, FromProcureTemplateInfoVO.class);
procureTemplateInfoList.add(procureTemplateInfoVO);
}
fromProcureVO.setFromProcureTemplateInfoList(procureTemplateInfoList);
--
Gitblit v1.9.1