From a897c6650036f9f0e2a033bca554864c9b24e34f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期五, 12 三月 2021 16:51:34 +0800
Subject: [PATCH] #

---
 src/main/java/zy/cloud/wms/manager/controller/WorkController.java |   81 ++++++++++++++++++++++++++++++++++++++--
 1 files changed, 76 insertions(+), 5 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..28a8ffb 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -2,18 +2,24 @@
 
 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 com.core.common.SnowflakeIdWorker;
 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.CustOrder;
 import zy.cloud.wms.manager.entity.Pakout;
-import zy.cloud.wms.manager.entity.param.StockInParam;
-import zy.cloud.wms.manager.entity.param.StockOutParam;
+import zy.cloud.wms.manager.entity.WrkSts;
+import zy.cloud.wms.manager.entity.param.*;
+import zy.cloud.wms.manager.service.CustOrderService;
 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 +34,12 @@
     private WorkService workService;
     @Autowired
     private PakoutService pakoutService;
+    @Autowired
+    private WrkStsService wrkStsService;
+    @Autowired
+    private SnowflakeIdWorker snowflakeIdWorker;
+    @Autowired
+    private CustOrderService custOrderService;
 
     @RequestMapping("/stock/in")
     @ManagerAuth(memo = "涓婃灦")
@@ -42,9 +54,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")
@@ -56,8 +74,61 @@
     @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));
-        return R.ok().add(pakouts);
+        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());
+    }
+
+    @RequestMapping("/pakout/init")
+    @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
+    public R initPakout(@RequestBody List<InitPakoutParam> params) {
+        return workService.initPakout(params, getUserId());
+    }
+
+    @RequestMapping("/hand/control/pakout")
+    @ManagerAuth(memo = "鎵嬪姩澶勭悊鎷ｈ揣鍗�")
+    public R handControlWrkMast(@RequestParam String wrkNo, @RequestParam Integer type){
+        if (type == 1) {
+            return workService.completePakout(wrkNo, getUserId());
+        } else if (type == 2) {
+            return workService.cancelPakout(wrkNo, getUserId());
+        }
+        return R.ok();
+    }
+
+    @RequestMapping("/orderNo/init")
+    @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+    public R initOrderNo() {
+        long nextId = snowflakeIdWorker.nextId();
+        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", String.valueOf(nextId))) > 0) {
+            return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+        }
+        return R.ok().add(String.valueOf(nextId));
+    }
+
+    @RequestMapping("/order/init")
+    @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+    public R initOrder(@RequestBody InitOrderParam param) {
+        return workService.initOrder(param, getUserId());
     }
 
 }

--
Gitblit v1.9.1