From 1b41d774274c784adce2df6ed19fdffe0c22a113 Mon Sep 17 00:00:00 2001 From: luqingyang <lqy5492@163.com> Date: 星期一, 30 十月 2023 17:35:52 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 121 ++++++++++++++++++++++++++++++++++++++++ 1 files changed, 121 insertions(+), 0 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java new file mode 100644 index 0000000..bfd5da1 --- /dev/null +++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java @@ -0,0 +1,121 @@ +package com.consum.base.controller; + +import com.consum.base.BaseController; +import com.consum.base.core.CodeGeneratorEnum; +import com.consum.base.core.CodeGeneratorService; +import com.consum.base.core.WhBusinessEnum; +import com.consum.base.pojo.*; +import com.consum.base.service.*; +import com.consum.model.po.*; +import com.consum.model.vo.LWhFormTransferVo; +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.DateUtils; +import com.walker.infrastructure.utils.NumberGenerator; +import com.walker.web.ResponseValue; +import org.springframework.beans.BeanUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.lang.reflect.Field; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +/** + * @Description 璋冩嫧绠$悊 + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ +@RestController +@RequestMapping("/pc/l/wh/form/transfer") +public class LWhFormTransferController extends BaseController { + + @Autowired + private LWhFormTransferServiceImpl lWhFormTransferService; + @Autowired + private BaseWarehouseServiceImpl baseWarehouseService; + @Autowired + private LWhProcureModelService lWhProcureModelService; + + /** + * @Description 鏂板 + */ + @PostMapping("/add") + public ResponseValue add(@RequestBody LWhFormTransferParam param) { + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + List<LWhProcureModelParams> transferGoods = param.getModels(); + if (CollectionUtils.isEmpty(transferGoods)) { + return ResponseValue.error("璋冩嫧鍗曚笉鑳戒负绌�"); + } + int result = this.lWhFormTransferService.add(param, currentUser,this.getSysInfo()); + if (result > 0) return ResponseValue.success(1); + return ResponseValue.error("鏂板澶辫触锛�"); + } + + /** + * @Description 鍒楄〃鏌ヨ + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ +// 1.鏌ヨ璋冩嫧鍗� +// 2.鏌ヨ鐗╁搧鍨嬪彿 + @GetMapping("/list") + public ResponseValue queryFormTransferList(LWhFormTransferParam param) { + S_user_core currentUser = this.getCurrentUser(); + if (currentUser == null) { + return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�"); + } + FinSysTenantUser sysInfo = getSysInfo(); + + //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗� + //?????? + + GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param); + List<LWhFormTransfer> datas = genericPager.getDatas(); + ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>(); + if (!CollectionUtils.isEmpty(datas)) { + datas.forEach(item -> { + // 鏌ヨ鍨嬪彿鏁伴噺 + LWhProcureModel lWhProcureModel = new LWhProcureModel(); + lWhProcureModel.setBusinessType(2); + lWhProcureModel.setBusinessId(item.getId()); + List<LWhProcureModel> models = lWhProcureModelService.select(lWhProcureModel); + LWhFormProcureExtend formProcureExtend = new LWhFormProcureExtend(); + BeanUtils.copyProperties(item, formProcureExtend); + formProcureExtend.setModels(models); + newDatas.add(formProcureExtend); + }); + } + try { + Field fieldDatas = GenericPager.class.getDeclaredField("datas"); + fieldDatas.setAccessible(true); + fieldDatas.set(genericPager, newDatas); + } catch (Exception e) { + e.printStackTrace(); + } +// genericPager.setDatas(newDatas); + return ResponseValue.success(genericPager); + } + + /** + * @Description 鏍规嵁id鏌ヨ璇︽儏 + * @Author 鍗㈠簡闃� + * @Date 2023/10/30 + */ + @GetMapping("/detail") + public ResponseValue getById(Long id) throws IllegalAccessException { + if (id == null) { + return ResponseValue.error("璋冩嫧鍗昳d涓虹┖"); + } + LWhFormTransferVo vo = this.lWhFormTransferService.getById(id); + return ResponseValue.success(vo); + } + + +} -- Gitblit v1.9.1