From 93dd846b5023cc268b06e0a8e0fb6a04a4ff5fde Mon Sep 17 00:00:00 2001
From: luqingyang <lqy5492@163.com>
Date: 星期四, 02 十一月 2023 17:36:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 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
index bfd5da1..d8b2204 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -7,6 +7,7 @@
import com.consum.base.pojo.*;
import com.consum.base.service.*;
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;
@@ -39,6 +40,8 @@
private BaseWarehouseServiceImpl baseWarehouseService;
@Autowired
private LWhProcureModelService lWhProcureModelService;
+ @Autowired
+ private LWhFormTransferCoreService lWhFormTransferCoreService;
/**
* @Description 鏂板
@@ -59,7 +62,7 @@
}
/**
- * @Description 鍒楄〃鏌ヨ
+ * @Description 鍒楄〃鏌ヨ(璋冩嫧鏄庣粏)
* @Author 鍗㈠簡闃�
* @Date 2023/10/30
*/
@@ -73,12 +76,12 @@
}
FinSysTenantUser sysInfo = getSysInfo();
- //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑杩涜揣鍗�
+ //鍙兘鏌ヨ鏈骇 鍙婁互涓嬫満鏋勭殑璋冩嫧鍗�
//??????
GenericPager genericPager = lWhFormTransferService.queryFormTransferList(param);
List<LWhFormTransfer> datas = genericPager.getDatas();
- ArrayList<LWhFormProcureExtend> newDatas = new ArrayList<>();
+ ArrayList<LWhFormTransferExtend> newDatas = new ArrayList<>();
if (!CollectionUtils.isEmpty(datas)) {
datas.forEach(item -> {
// 鏌ヨ鍨嬪彿鏁伴噺
@@ -86,10 +89,10 @@
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);
+ LWhFormTransferExtend formTransferExtend = new LWhFormTransferExtend();
+ BeanUtils.copyProperties(item, formTransferExtend);
+ formTransferExtend.setModels(models);
+ newDatas.add(formTransferExtend);
});
}
try {
@@ -109,7 +112,7 @@
* @Date 2023/10/30
*/
@GetMapping("/detail")
- public ResponseValue getById(Long id) throws IllegalAccessException {
+ public ResponseValue getById(Long id) {
if (id == null) {
return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
}
@@ -117,5 +120,56 @@
return ResponseValue.success(vo);
}
+ /**
+ * 鎾ら攢
+ * @author 鍗㈠簡闃�
+ * @date 2023/10/31
+ */
+ @PostMapping("/updStatus")
+ public ResponseValue updateStatus(Long id) {
+ if (id == null) {
+ return ResponseValue.error("鍙傛暟閿欒");
+ }
+
+ int num = this.lWhFormTransferService.updateStatus(id);
+ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("淇敼澶辫触锛�");
+ }
+
+ /**
+ * @Description 璋冩嫧鍏ュ簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ @PostMapping("/income")
+ public ResponseValue income(Long id) {
+ lWhFormTransferCoreService.doTransferInPut(id, getCurrentUser());
+ return ResponseValue.success();
+ }
+
+ /**
+ * @Description 璋冩嫧鍑哄簱
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ @PostMapping("/output")
+ public ResponseValue output(Long id) {
+ lWhFormTransferCoreService.doTransferOutPut(id, getCurrentUser());
+ return ResponseValue.success();
+ }
+
+ /**
+ * @Description 瀵煎嚭璋冩嫧鍑哄簱鍗�
+ * @Author 鍗㈠簡闃�
+ * @Date 2023/10/31
+ */
+ @GetMapping("/export")
+ public ResponseValue export(Long id) {
+ if (id == null) {
+ return ResponseValue.error("璋冩嫧鍗昳d涓虹┖");
+ }
+ LWhFormOutputVo vo = this.lWhFormTransferService.export(id,this.getCurrentUser());
+ return ResponseValue.success(vo);
+ }
+
}
--
Gitblit v1.9.1