From 5e6c61b8753870ef2f8cde60eef47e3eeefe89e6 Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 17:35:48 +0800
Subject: [PATCH] 报废单 相关代码
---
consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 98 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
index 2747e39..6e6c912 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormScrappedController.java
@@ -1,17 +1,24 @@
package com.consum.base.controller;
import com.consum.base.BaseController;
-import com.consum.base.pojo.LWhFormInventoryParam;
-import com.consum.base.pojo.LWhFormScrappedParam;
+import com.consum.base.pojo.*;
+import com.consum.base.service.LWhFormScrappedGoodsService;
import com.consum.base.service.LWhFormScrappedServiceImpl;
-import com.consum.model.po.FinSysTenantUser;
+import com.consum.model.po.*;
+import com.consum.model.vo.LWhFormOutputVo;
+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.web.ResponseValue;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-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 java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
/**
* @Description 鎶ュ簾鍗�
@@ -24,6 +31,8 @@
@Autowired
private LWhFormScrappedServiceImpl lWhFormScrappedService;
+ @Autowired
+ private LWhFormScrappedGoodsService scrappedGoodsService;
/**
* @Description 鏂板鎶ュ簾鍗�
@@ -32,15 +41,94 @@
*/
@PostMapping("/add")
public ResponseValue add(@RequestBody LWhFormScrappedParam param) {
- //鏍规嵁鐩樼偣浜篿d鏌ヨ鐩樼偣浜�
- S_user_core operatorUser = this.getUser(param.getOperatorId());
FinSysTenantUser sysInfo = this.getSysInfo();
- int result = this.lWhFormScrappedService.add(param, sysInfo,operatorUser);
+ int result = this.lWhFormScrappedService.add(param, this.getCurrentUser(),sysInfo);
if (result > 0) return ResponseValue.success(1);
return ResponseValue.error("鏂板澶辫触锛�");
}
+ /**
+ * @Description 鍒楄〃鏌ヨ
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/02
+ */
+ //1.鏌ヨ鎶ュ簾鍗�
+ //2.鏌ヨ鎶ュ簾鍗曠墿鍝�
+ @GetMapping("/list")
+ public ResponseValue queryList(LWhFormScrappedParam param) {
+ FinSysTenantUser sysInfo = getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager genericPager = lWhFormScrappedService.queryList(param,sysInfo);
+ List<LWhFormScrapped> datas = genericPager.getDatas();
+ ArrayList<LWhFormScrappedExtend> newDatas = new ArrayList<>();
+ if (!CollectionUtils.isEmpty(datas)) {
+ datas.forEach(item -> {
+ // 鏌ヨ鎶ュ簾鍗曠墿鍝�
+ LWhFormScrappedGoods scrappedGoods = new LWhFormScrappedGoods();
+ scrappedGoods.setFormScrappedId(item.getId());
+ List<LWhFormScrappedGoods> scrappedGoodsList = scrappedGoodsService.select(scrappedGoods);
+ LWhFormScrappedExtend formScrappedExtend = new LWhFormScrappedExtend();
+ BeanUtils.copyProperties(item, formScrappedExtend);
+ formScrappedExtend.setScrappedGoodsList(scrappedGoodsList);
+ newDatas.add(formScrappedExtend);
+ });
+ }
+ 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/11/2
+ */
+ @GetMapping("/detail")
+ public ResponseValue getById(Long id) {
+ if (id == null) {
+ return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
+ }
+ LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.getById(id);
+ return ResponseValue.success(scrappedExtend);
+ }
+
+ /**
+ * 鎶ュ簾鏄庣粏
+ * @param param
+ * @return
+ */
+ @GetMapping("/list/detailList")
+ public ResponseValue queryDetailList(LWhFormScrappedParam param) {
+ FinSysTenantUser sysInfo = this.getSysInfo();
+ if (sysInfo == null) {
+ return ResponseValue.error("鐧诲綍鐢ㄦ埛淇℃伅涓嶅瓨鍦�");
+ }
+ GenericPager<Map<String, Object>> genericPager = lWhFormScrappedService.queryDetailList(param,sysInfo);
+ return ResponseValue.success(genericPager);
+ }
+
+ /**
+ * @Description 瀵煎嚭鎶ュ簾鐧昏鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/11/2
+ */
+ @GetMapping("/export")
+ public ResponseValue export(Long id) {
+ if (id == null) {
+ return ResponseValue.error("鎶ュ簾鍗昳d涓虹┖");
+ }
+ LWhFormScrappedExtend scrappedExtend = this.lWhFormScrappedService.export(id,this.getSysInfo());
+ return ResponseValue.success(scrappedExtend);
+ }
}
--
Gitblit v1.9.1