From dfd61f47ab99e875d6dbac51e96ef27b7d882d51 Mon Sep 17 00:00:00 2001
From: 王佳豪 <g675230687@126.com>
Date: 星期六, 29 五月 2021 11:02:55 +0800
Subject: [PATCH] 库存同步功能

---
 src/main/java/zy/cloud/wms/manager/controller/WorkController.java |   71 ++++++++++++++++++++++++++++++-----
 1 files changed, 60 insertions(+), 11 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 9e38fa4..5968a24 100644
--- a/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
+++ b/src/main/java/zy/cloud/wms/manager/controller/WorkController.java
@@ -14,8 +14,10 @@
 import zy.cloud.wms.common.web.BaseController;
 import zy.cloud.wms.manager.entity.*;
 import zy.cloud.wms.manager.entity.param.*;
+import zy.cloud.wms.manager.entity.result.KeyValueVo;
 import zy.cloud.wms.manager.service.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -34,12 +36,18 @@
     @Autowired
     private SnowflakeIdWorker snowflakeIdWorker;
     @Autowired
-    private CustOrderService custOrderService;
+    private OrderService orderService;
 
     @RequestMapping("/stock/pakin")
     @ManagerAuth(memo = "鍏ュ簱")
     public R stockPakin(@RequestBody PakinParam number) {
         return workService.stockPakin(number, getUserId());
+    }
+
+    @RequestMapping("/stock/pakout")
+    @ManagerAuth(memo = "鍑哄簱")
+    public R stockPakout(@RequestBody PakoutParam number) {
+        return workService.stockPakout(number, getUserId());
     }
 
     @RequestMapping("/stock/in")
@@ -60,10 +68,10 @@
         return workService.stockOutPreview(stockOutParam, getUserId());
     }
 
-    @RequestMapping("/stock/out")
-    @ManagerAuth(memo = "鎷ｈ揣")
+    @RequestMapping("/stock/out/create")
+    @ManagerAuth(memo = "鐢熸垚鎷ｈ揣鍗�")
     public R stockOut(@RequestBody StockOutParam stockOutParam) {
-        return workService.stockOut(stockOutParam, getUserId());
+        return workService.stockOutCreate(stockOutParam, getUserId());
     }
 
     @RequestMapping("/stock/out/print")
@@ -123,18 +131,18 @@
     }
 
     @RequestMapping("/orderNo/init")
-    @ManagerAuth(memo = "鐢熸垚閿�鍞鍗曠紪鍙�")
+    @ManagerAuth(memo = "鐢熸垚鍗曟嵁缂栧彿")
     public R initOrderNo() {
         long nextId = snowflakeIdWorker.nextId();
-        String number = "PR-" + String.valueOf(nextId).substring(0, 15);
-        if (custOrderService.selectCount(new EntityWrapper<CustOrder>().eq("number", number)) > 0) {
-            return R.error("鎶辨瓑鍗曞彿宸插瓨鍦紝璇峰啀鐢熸垚涓�娆�");
+        String orderNo = "AT-" + String.valueOf(nextId).substring(0, 15);
+        if (orderService.selectByOrderNo(orderNo) != null) {
+            return R.error("鎶辨瓑锛屽崟鎹紪鍙峰凡瀛樺湪");
         }
-        return R.ok().add(number);
+        return R.ok().add(orderNo);
     }
 
     @RequestMapping("/order/init")
-    @ManagerAuth(memo = "鐢熸垚閿�鍞鍗�")
+    @ManagerAuth(memo = "鐢熸垚璁㈠崟")
     public R initOrder(@RequestBody InitOrderParam param) {
         return workService.initOrder(param, getUserId());
     }
@@ -142,7 +150,7 @@
     @RequestMapping("/stock/transfer")
     @ManagerAuth(memo = "搴撳瓨璋冩嫧")
     public R stockTransfer(@RequestBody AsrsTransferParam number) {
-        return R.error();
+        return workService.asrsStockTransfer(number, getUserId());
     }
 
     @RequestMapping("/stock/check")
@@ -157,6 +165,18 @@
         return workService.stockCheckAuditing(checkId, getUserId());
     }
 
+    @RequestMapping("/stock/checks/auditing")
+    @ManagerAuth(memo = "鐩樼偣璁板綍鎵归噺瀹℃牳")
+    public R checksAuditing(@RequestParam(value = "checkIds[]") Long[] checkIds) {
+        int success = 0;
+        for (Long checkId : checkIds) {
+            R r = workService.stockCheckAuditing(checkId, getUserId());
+            if (String.valueOf(r.get("code")).equals("200")) {
+                success ++;
+            }
+        }
+        return R.ok("瀹℃牳鎴愬姛鏁伴噺锛�" + success);
+    }
 
     /******************************************************************************************************/
 
@@ -183,6 +203,21 @@
         return R.ok().add(cstmrs);
     }
 
+    // 鑾峰彇鎵�鏈夊鎴� [閿�煎鐗圿
+    @RequestMapping("/cstmr/all/get/kv")
+    @ManagerAuth
+    public R getCstmrDataKV() {
+        List<Cstmr> cstmrs = cstmrService.selectList(new EntityWrapper<Cstmr>().eq("status", 1).orderBy("create_time", false));
+        List<KeyValueVo> valueVos = new ArrayList<>();
+        for (Cstmr cstmr : cstmrs) {
+            KeyValueVo vo = new KeyValueVo();
+            vo.setName(cstmr.getName());
+            vo.setValue(cstmr.getId());
+            valueVos.add(vo);
+        }
+        return R.ok().add(valueVos);
+    }
+
     // 鑾峰彇鎵�鏈夐」鐩�
     @RequestMapping("/item/all/get")
     @ManagerAuth
@@ -190,5 +225,19 @@
         List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
         return R.ok().add(items);
     }
+    // 鑾峰彇鎵�鏈夐」鐩�
+    @RequestMapping("/item/all/get/kv")
+    @ManagerAuth
+    public R getItemDataKV() {
+        List<Item> items = itemService.selectList(new EntityWrapper<Item>().eq("status", 1).orderBy("create_time", false));
+        List<KeyValueVo> valueVos = new ArrayList<>();
+        for (Item item : items) {
+            KeyValueVo vo = new KeyValueVo();
+            vo.setName(item.getName());
+            vo.setValue(item.getId());
+            valueVos.add(vo);
+        }
+        return R.ok().add(valueVos);
+    }
 
 }

--
Gitblit v1.9.1