From 3f69b4dfc585c4dfbc3c07a6acf5cdd838033636 Mon Sep 17 00:00:00 2001
From: liuguocan <527956374@qq.com>
Date: 星期二, 28 十一月 2023 14:45:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormProcureController.java | 120 ++++++++++++++++++++++++++++++++----------------------------
1 files changed, 64 insertions(+), 56 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 38adcd8..79df3ac 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
@@ -1,5 +1,6 @@
package com.consum.base.controller;
+import cn.hutool.core.util.ReflectUtil;
import com.consum.base.BaseController;
import com.consum.base.core.CodeGeneratorEnum;
import com.consum.base.core.CodeGeneratorService;
@@ -7,31 +8,14 @@
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.core.utils.PageUtil;
import com.consum.base.pojo.LWhFormProcureGoodsInfoParam;
import com.consum.base.pojo.LWhFormProcureParam;
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 +25,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
@@ -94,7 +69,15 @@
* @Description 鏂板
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormProcureParam param) {
+ public ResponseValue add() {
+ LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class);
+ LWhFormProcureParam param2 = new LWhFormProcureParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
+ return this.add(param);
+ }
+
+ private ResponseValue add(LWhFormProcureParam param) {
Long warehouseId = param.getWarehouseId();
if (param.getWarehouseId() == null) {
return ResponseValue.error("浠撳簱ID涓嶈兘涓虹┖");
@@ -166,7 +149,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 +161,7 @@
model.setCounts(counts);
model.setWorehouseCount(goodsModelNum);
model.setSupplier(supplier);
+ model.setTotalAmount(price * counts);
procureModelList.add(model);
}
procureGoodList.add(procureGood);
@@ -220,16 +204,25 @@
*/
@ApiOperation(value = "閲囪喘鍗曞垪琛ㄦ煡璇�", notes = "閲囪喘鍗曞垪琛ㄦ煡璇�")
@ApiImplicitParams({
- @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
+ @ApiImplicitParam(name = "param", value = "閲囪喘鏌ヨ鏉′欢", required = true, dataType = "FormProcureQryDto", paramType = "query")
})
@GetMapping("/list")
- public ResponseValue queryFormProcureList(FormProcureQry param) {
+ public ResponseValue queryFormProcureList() {
+ FormProcureQry param = CommonUtil.getObjFromReq(FormProcureQry.class);
+ FormProcureQry param2 = new FormProcureQry();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
S_user_core currentUser = this.getCurrentUser();
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)) {
@@ -241,8 +234,8 @@
// 鏌ヨ鍨嬪彿鏁伴噺
String sql = "select fpg.id,BASE_CATEGORY_ID ,BASE_GOODS_TEMPLATE_ID ,GOODS_TEMPLATE_NAME ,sum(counts) count "
- + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
- + "where fpg.WH_FORM_PROCURE_ID =:id group by pm.FROM_PROCURE_GOODS_ID";
+ + "from L_WH_FORM_PROCURE_GOODS fpg left join L_WH_PROCURE_MODEL pm on fpg.id = pm.FROM_PROCURE_GOODS_ID "
+ + "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, new MapperUtil());
@@ -257,11 +250,13 @@
}
try {
Field fieldDatas = GenericPager.class.getDeclaredField("datas");
- fieldDatas.setAccessible(true);
- fieldDatas.set(genericPager, result);
+// fieldDatas.setAccessible(true);
+// fieldDatas.set(genericPager, result);
+ ReflectUtil.setFieldValue(genericPager, fieldDatas, result);
} catch (Exception e) {
e.printStackTrace();
}
+ genericPager.setDatas(result);
return ResponseValue.success(genericPager);
}
@@ -269,7 +264,11 @@
* @Description 缂栬緫
*/
@PostMapping("/edit")
- public ResponseValue edit(@RequestBody LWhFormProcureParam param) {
+ public ResponseValue edit() {
+ LWhFormProcureParam param = CommonUtil.getObjFromReqBody(LWhFormProcureParam.class);
+ LWhFormProcureParam param2 = new LWhFormProcureParam();
+ CommonUtil.copyProperties(param, param2);
+ param = param2;
ResponseValue delFlag = delById(param.getId());
if (delFlag.getCode() == ResponseValue.CODE_SUCCESS) {
return this.add(param);
@@ -323,6 +322,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);
@@ -331,13 +333,13 @@
lWhFormProcureGoods.setWhFormProcureId(id);
List<LWhFormProcureGoods> formProcureGoods = lWhFormProcureGoodsService.select(lWhFormProcureGoods);
- Field fieldModels = null;
- try {
- fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- }
- fieldModels.setAccessible(true);
+// Field fieldModels = null;
+// try {
+// fieldModels = LWhFormProcureGoodsVO.class.getDeclaredField("models");
+// } catch (NoSuchFieldException e) {
+// e.printStackTrace();
+// }
+// fieldModels.setAccessible(true);
ArrayList<LWhFormProcureGoodsVO> procureGoodsVOList = new ArrayList<>();
for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
LWhFormProcureGoodsVO lWhFormProcureGoodsVO = new LWhFormProcureGoodsVO();
@@ -352,15 +354,17 @@
Map<String, Object> paramMap = new HashMap<>();
paramMap.put("formProcureGoodId", formProcureGood.getId());
String sql = "SELECT\n" + "pm.BASE_GOODS_MODELS_ID,pm.BASE_GOODS_MODELS_NAME,pm.PRICE,pm.COUNTS,pm.WOREHOUSE_COUNT,bgm.unit " + "FROM\n"
- + "\tl_wh_procure_model pm\n"
- + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
+ + "\tl_wh_procure_model pm\n"
+ + "\tLEFT JOIN base_goods_models bgm on pm.BASE_GOODS_MODELS_ID = bgm.id where pm.FROM_PROCURE_GOODS_ID =:formProcureGoodId";
List<Map<String, Object>> procureModelList = lWhProcureModelService.select(sql, paramMap, new MapperUtil());
List<GoodsModelVO> goodsModelVOList = Lists.newArrayList();
procureModelList.forEach(item -> {
GoodsModelVO goodsModelVO = MapUtils.convertMapToObj(item, GoodsModelVO.class);
goodsModelVOList.add(goodsModelVO);
});
- fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
+// fieldModels.set(lWhFormProcureGoodsVO, goodsModelVOList);
+ ReflectUtil.setFieldValue(lWhFormProcureGoodsVO, "models", goodsModelVOList);
+
procureGoodsVOList.add(lWhFormProcureGoodsVO);
}
lWhFormProcureExtendVO.setProcureGoods(procureGoodsVOList);
@@ -373,6 +377,10 @@
@GetMapping("detail/list")
public ResponseValue queryFormProcureDetailList() {
FormProcureQry formProcureQry = CommonUtil.getObjFromReq(FormProcureQry.class);
+ FormProcureQry param2 = new FormProcureQry();
+ CommonUtil.copyProperties(formProcureQry, param2);
+ formProcureQry = param2;
+
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
--
Gitblit v1.9.1