From 6f7c57ceab710f631f0530e307c6fdbee4e7b9af Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 04 三月 2021 12:57:13 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 35 ++++++++++++++++++++++++++++++++++-
1 files changed, 34 insertions(+), 1 deletions(-)
diff --git a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
index a5eae33..412172f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -2,6 +2,8 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.core.annotations.ManagerAuth;
+import com.core.common.BaseRes;
+import com.core.common.Cools;
import com.core.common.R;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -10,10 +12,13 @@
import org.springframework.web.bind.annotation.RestController;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.Pakout;
+import zy.cloud.wms.manager.entity.WrkSts;
+import zy.cloud.wms.manager.entity.param.StockConfirmParam;
import zy.cloud.wms.manager.entity.param.StockInParam;
import zy.cloud.wms.manager.entity.param.StockOutParam;
import zy.cloud.wms.manager.service.PakoutService;
import zy.cloud.wms.manager.service.WorkService;
+import zy.cloud.wms.manager.service.WrkStsService;
import java.util.List;
@@ -28,6 +33,8 @@
private WorkService workService;
@Autowired
private PakoutService pakoutService;
+ @Autowired
+ private WrkStsService wrkStsService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -47,6 +54,12 @@
return workService.stockOut(stockOutParam, getUserId());
}
+ @RequestMapping("/stock/out/print")
+ @ManagerAuth(memo = "鎹¤揣鍗曟墦鍗�")
+ public R stockOutPrint(@RequestBody StockOutParam stockOutParam) {
+ return workService.stockOutPrint(stockOutParam, getUserId());
+ }
+
@RequestMapping("/stock/allot")
@ManagerAuth(memo = "搴撳瓨璋冩嫧")
public R stockAllot() {
@@ -57,7 +70,27 @@
@ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
public R getPakout(@RequestParam String docNumber) {
List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
- return R.ok().add(pakouts);
+ if (Cools.isEmpty(pakouts)) {
+ return R.parse(BaseRes.EMPTY);
+ }
+ Long sts = pakouts.get(0).getWrkSts();
+ if (sts == 1) {
+ sts =2L;
+ }
+ WrkSts wrkSts = wrkStsService.selectById(sts);
+ return R.ok().add(Cools
+ .add("number", pakouts.get(0).getDocNum())
+ .add("wrkSts", pakouts.get(0).getWrkSts())
+ .add("wrkSts$", wrkSts==null?"鏈煡":wrkSts.getStsName())
+ .add("custName", Cools.isEmpty(pakouts.get(0).getCustName())?"-":pakouts.get(0).getCustName())
+ .add("pakouts", pakouts)
+ );
+ }
+
+ @RequestMapping("/stock/out/confirm")
+ @ManagerAuth(memo = "鎹¤揣纭")
+ public R stockOutConfirm(@RequestBody StockConfirmParam param) {
+ return workService.stockOutComplete(param, getUserId());
}
}
--
Gitblit v1.9.1