From 1df6f4e9ab81da3212cffc126bece65350b6d09f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 05 三月 2021 14:59:49 +0800
Subject: [PATCH] #
---
src/main/java/zy/cloud/wms/manager/controller/WorkController.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 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 d661097..941160f 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -1,15 +1,26 @@
package zy.cloud.wms.manager.controller;
+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;
import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
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;
/**
* Created by vincent on 2021/2/25
@@ -20,6 +31,10 @@
@Autowired
private WorkService workService;
+ @Autowired
+ private PakoutService pakoutService;
+ @Autowired
+ private WrkStsService wrkStsService;
@RequestMapping("/stock/in")
@ManagerAuth(memo = "涓婃灦")
@@ -27,10 +42,55 @@
return workService.stockIn(stockInParam, getUserId());
}
+ @RequestMapping("/stock/out/check")
+ @ManagerAuth(memo = "搴撳瓨鏁伴噺妫�娴�")
+ public R stockOutCheck(@RequestParam String number) {
+ return workService.stockOutCheck(number, getUserId());
+ }
+
@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")
+ @ManagerAuth(memo = "搴撳瓨璋冩嫧")
+ public R stockAllot() {
+ return R.ok();
+ }
+
+ @RequestMapping("/pakout/get")
+ @ManagerAuth(memo = "鑾峰彇鍑哄簱鍗�")
+ public R getPakout(@RequestParam String docNumber) {
+ 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);
+ }
+ 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