From 7b2f457805eeb4d16c8e92dffae419665f81db02 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 06 三月 2021 16:34:53 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 17 +++++++++++++++--
1 files changed, 15 insertions(+), 2 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 8ee9867..a28f355 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -13,6 +13,7 @@
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;
@@ -48,9 +49,15 @@
}
@RequestMapping("/stock/out")
- @ManagerAuth(memo = "鎹¤揣")
+ @ManagerAuth(memo = "鎷ｈ揣")
public R stockOut(@RequestBody StockOutParam stockOutParam) {
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")
@@ -62,7 +69,7 @@
@RequestMapping("/pakout/get")
@ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
public R getPakout(@RequestParam String docNumber) {
- List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).eq("wrk_sts", 1));
+ List<Pakout> pakouts = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num", docNumber).in("wrk_sts", 1,2));
if (Cools.isEmpty(pakouts)) {
return R.parse(BaseRes.EMPTY);
}
@@ -80,4 +87,10 @@
);
}
+ @RequestMapping("/stock/out/confirm")
+ @ManagerAuth(memo = "鎷ｈ揣纭")
+ public R stockOutConfirm(@RequestBody StockConfirmParam param) {
+ return workService.stockOutComplete(param, getUserId());
+ }
+
}
--
Gitblit v1.9.1