From 5112320c542900d9e79bbc0938b195a43e3fc255 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 23 十一月 2023 17:34:54 +0800
Subject: [PATCH] --部门物品分发
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 33 ++++++++++++++++++++++-----------
1 files changed, 22 insertions(+), 11 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..ed68075 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,9 +7,10 @@
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.core.utils.PageUtil;
+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;
@@ -104,7 +105,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 +124,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 +133,7 @@
supplierList.add(supplier);
}
- List<LWhProcureModelParams> models = procureGoodT.getModels();
+ List<LWhProcureModelParam> models = procureGoodT.getModels();
if (CollectionUtils.isEmpty(models)) {
return ResponseValue.error("閲囪喘鍗曚笉鑳戒负绌�");
}
@@ -146,7 +147,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("鍨嬪彿鐨勯噰璐暟閲忓彧鑳戒负姝ｆ暣鏁�");
@@ -166,7 +167,7 @@
}
String modelName = (String) tempGoodsInfo.get("modelname");
// 鏌ヨ鍨嬪彿搴撳瓨
- int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ int goodsModelNum = lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, 1, null);
LWhProcureModel model = new LWhProcureModel();
model.setId(NumberGenerator.getLongSequenceNumber());
model.setFromProcureGoodsId(fromProcureGoodsId);
@@ -178,6 +179,7 @@
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(supplier);
+ model.setTotalAmount(price * counts);
procureModelList.add(model);
}
procureGoodList.add(procureGood);
@@ -228,8 +230,13 @@
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
-
- GenericPager genericPager = lWhFormProcureService.queryFormProcureList(param);
+ /*褰撳墠鐧诲綍浜哄彧鑳界湅鍒拌嚜宸辨満鏋勪笅鐨勫垪琛�*/
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ String tenantId = sysInfo.getTenantId();
+ if (param.getAgencyId() == null) {
+ param.setAgencyId(Long.valueOf(tenantId));
+ }
+ PageUtil genericPager = lWhFormProcureService.queryFormProcureList(param);
List<LWhFormProcure> data = genericPager.getDatas();
ArrayList<FormProcureVO> result = new ArrayList<>();
if (!CollectionUtils.isEmpty(data)) {
@@ -245,9 +252,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);
@@ -262,6 +269,7 @@
} catch (Exception e) {
e.printStackTrace();
}
+ genericPager.setDatas(result);
return ResponseValue.success(genericPager);
}
@@ -323,6 +331,9 @@
return ResponseValue.error("閲囪喘鍗昳d涓虹┖");
}
LWhFormProcure lWhFormProcure = lWhFormProcureService.get(new LWhFormProcure(id));
+ if (lWhFormProcure == null) {
+ return ResponseValue.error("閲囪喘鍗曚笉瀛樺湪");
+ }
LWhFormProcureExtendVO lWhFormProcureExtendVO = new LWhFormProcureExtendVO();
BeanUtils.copyProperties(lWhFormProcure, lWhFormProcureExtendVO);
--
Gitblit v1.9.1