From f3529363cc63b4729a429f80a4827b71df0cd5dd Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期五, 10 十一月 2023 11:26:23 +0800
Subject: [PATCH] feat: 上传
---
consum-base/src/main/java/com/consum/base/controller/LWhFormOutputController.java | 58 ++++++++++++++++++++++++++++++----------------------------
1 files changed, 30 insertions(+), 28 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..a4b1079 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
@@ -4,6 +4,8 @@
import com.consum.base.pojo.*;
import com.consum.base.service.BaseCategoryServiceImpl;
import com.consum.base.service.LWhFormOutputServiceImpl;
+import com.consum.base.service.LWhGoodsService;
+import com.consum.base.service.LWhProcureModelService;
import com.consum.model.po.*;
import com.iplatform.model.po.S_user_core;
import com.walker.db.page.GenericPager;
@@ -29,6 +31,10 @@
@Autowired
private LWhFormOutputServiceImpl lWhFormOutputService;
+ @Autowired
+ private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhGoodsService lWhGoodsService;
/**
* @Description 鏂板鍑哄簱鍗�
@@ -36,7 +42,7 @@
* @Date 2023/10/27
*/
@PostMapping("/add")
- public ResponseValue add(@RequestBody LWhFormOutputParam param) {
+ public ResponseValue add(@RequestBody LWhFormOutputInsertParam param) {
S_user_core currentUser = this.getCurrentUser();
if (currentUser == null) {
return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
@@ -62,15 +68,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,34 +105,30 @@
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