From b4de1386f34734fa0e4155ed9a21ea7b7163a006 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期一, 13 十一月 2023 17:36:40 +0800
Subject: [PATCH] 增加表字段
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 100 ++++++++++++++++++++++++++++---------------------
1 files changed, 57 insertions(+), 43 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
index 0cf4d6a..4521463 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java
@@ -1,56 +1,79 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.*;
-import com.consum.base.service.BaseCategoryServiceImpl;
+import com.consum.base.core.utils.CommonUtil;
+import com.consum.base.pojo.LWhFormOutputExtend;
+import com.consum.base.pojo.LWhFormOutputInsertParam;
+import com.consum.base.pojo.LWhFormOutputParam;
import com.consum.base.service.LWhFormOutputServiceImpl;
-import com.consum.model.po.*;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
+import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.LWhFormOutput;
+import com.consum.model.po.LWhProcureModel;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
import com.walker.infrastructure.utils.CollectionUtils;
-import com.walker.infrastructure.utils.StringUtils;
import com.walker.web.ResponseValue;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
import java.lang.reflect.Field;
import java.util.ArrayList;
import java.util.List;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
/**
* @Description 鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+@Api(value = "鍑哄簱鍗�", tags = "鍑哄簱鍗�")
@RestController
@RequestMapping("/pc/l/wh/form/output")
public class LWhFormOutputController extends BaseController {
@Autowired
private LWhFormOutputServiceImpl lWhFormOutputService;
+ @Autowired
+ private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
/**
* @Description 鏂板鍑哄簱鍗�
* @Author 鍗㈠簡闃�
* @Date 2023/10/27
*/
+ @ApiOperation(value = "鏂板鍑哄簱鍗�", notes = "鏂板鍑哄簱鍗�")
+// @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputInsertParam", paramType = "body")
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormOutputParam param) {
+ public ResponseValue add() {
+ LWhFormOutputInsertParam param = CommonUtil.getObjFromReqBody(LWhFormOutputInsertParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
}
- int result = this.lWhFormOutputService.add(param, currentUser,this.getSysInfo());
- if (result > 0) return ResponseValue.success(1);
+ int result = this.lWhFormOutputService.add(param, currentUser, this.getSysInfo());
+ if (result > 0) {
+ return ResponseValue.success(1);
+ }
return ResponseValue.error("鏂板澶辫触锛�");
}
/**
* @Description 鍒楄〃鏌ヨ
*/
+ @ApiOperation(value = "鍒楄〃鏌ヨ", notes = "鍒楄〃鏌ヨ")
+ @ApiImplicitParam(name = "param", value = "鍑哄簱鍗曞疄浣�", required = true, dataType = "LWhFormOutputParam", paramType = "query")
@GetMapping("/list")
- public ResponseValue queryFormOutputList(LWhFormOutputParam param) {
+ public ResponseValue queryFormOutputList() {
+ LWhFormOutputParam param = CommonUtil.getObjFromReq(LWhFormOutputParam.class);
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -62,15 +85,15 @@
GenericPager genericPager = lWhFormOutputService.queryFormOutputList(param);
List<LWhFormOutput> datas = genericPager.getDatas();
- ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>();
+ ArrayList<LWhFormOutputExtend> newDatas = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
LWhProcureModel lWhProcureModel = new LWhProcureModel();
lWhProcureModel.setBusinessType(3);
lWhProcureModel.setBusinessId(item.getId());
- List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
- LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend();
+ List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel);
+ LWhFormOutputExtend formProcureExtend = new LWhFormOutputExtend();
BeanUtils.copyProperties(item, formProcureExtend);
formProcureExtend.setModels(models);
newDatas.add(formProcureExtend);
@@ -99,38 +122,29 @@
LWhFormOutputExtend formOutputExtend = new LWhFormOutputExtend();
BeanUtils.copyProperties(lWhFormOutput, formOutputExtend);
- // 鐗╁搧
- LWhFormProcureGoods lWhFormProcureGoods = new LWhFormProcureGoods();
- lWhFormProcureGoods.setWhFormProcureId(id);
- List<LWhFormProcureGoods> formProcureGoods = lWhFormOutputService.select(lWhFormProcureGoods);
+ // 鏌ヨ鍨嬪彿鏁伴噺
+ LWhProcureModel lWhProcureModel = new LWhProcureModel();
+ lWhProcureModel.setBusinessType(3);
+ lWhProcureModel.setBusinessId(id);
+ List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
+ formOutputExtend.setModels(models);
- Field fieldModels = null;
- try {
- fieldModels = LWhFormProcureGoodsParams.class.getDeclaredField("models");
- } catch (NoSuchFieldException e) {
- e.printStackTrace();
- }
- fieldModels.setAccessible(true);
- ArrayList<LWhFormProcureGoodsParams> procureGoodsParams = new ArrayList<>();
- for (LWhFormProcureGoods formProcureGood : formProcureGoods) {
- LWhFormProcureGoodsParams lWhFormProcureGoodsParams = new LWhFormProcureGoodsParams();
- BeanUtils.copyProperties(formProcureGood, lWhFormProcureGoodsParams);
-
- // 鏌ヨ鍨嬪彿鏁伴噺
- LWhProcureModel lWhProcureModel = new LWhProcureModel();
- lWhProcureModel.setFromProcureGoodsId(formProcureGood.getId());
- List<LWhProcureModel> models = lWhFormOutputService.select(lWhProcureModel);
- fieldModels.set(lWhFormProcureGoodsParams, models);
- procureGoodsParams.add(lWhFormProcureGoodsParams);
- }
- formOutputExtend.setProcureGoods(procureGoodsParams);
return ResponseValue.success("鏌ヨ鎴愬姛!", formOutputExtend);
}
-
-
-
-
+ /**
+ * @Description 鏍规嵁浠撳簱id鍜屽瀷鍙穒d 鏌ヨ搴撳瓨
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ @GetMapping("/select/number")
+ public ResponseValue selectNumber(Long warehouseId, Long baseGoodsModelsId) {
+ if (warehouseId == null || baseGoodsModelsId == null) {
+ return ResponseValue.error("鍙傛暟閿欒");
+ }
+ int num = this.lWhGoodsService.queryGoodsModelNum(0, warehouseId, baseGoodsModelsId, (short) 1, null);
+ return ResponseValue.success(num);
+ }
}
--
Gitblit v1.9.1