From d6b6eb10d85af666ffe6fbdfe7aafbf3b538bf51 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期日, 11 五月 2025 09:51:50 +0800
Subject: [PATCH] 接口编写

---
 src/main/java/com/zy/asrs/controller/OpenController.java    |   97 ++++++++++++++++++++++----------
 src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java |   36 ++++++++++++
 src/main/java/com/zy/asrs/service/OpenService.java          |    2 
 3 files changed, 105 insertions(+), 30 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index ea51689..c0c3585 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -4,11 +4,13 @@
 import com.core.annotations.AppAuth;
 import com.core.common.*;
 import com.core.exception.CoolException;
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.entity.param.OpenOrderCompleteParam;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
 import com.zy.asrs.entity.param.PackParam;
 import com.zy.asrs.service.OpenService;
+import com.zy.asrs.service.WrkMastService;
 import com.zy.common.model.DetlDto;
 import com.zy.common.web.BaseController;
 import lombok.extern.slf4j.Slf4j;
@@ -35,6 +37,8 @@
 
     @Autowired
     private OpenService openService;
+    @Autowired
+    private WrkMastService wrkMastService;
 
 
 
@@ -93,36 +97,7 @@
         return R.ok().add(openService.pakinOrderComplete(param));
     }
 
-    /**
-     * 娣诲姞鍑哄簱鍗�
-     */
-    @PostMapping("/order/pakout/new/default/v1")
-    @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
-    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
-                                            @RequestBody OpenOrderPakoutParam param,
-                                            HttpServletRequest request) {
-        auth(appkey, param, request);
-        if (Cools.isEmpty(param)) {
-            return R.parse(BaseRes.PARAM);
-        }
-        //if (Cools.isEmpty(param.getLgort())) {
-        //    return R.error("鍗曟嵁缂栧彿[lgort]涓嶈兘涓虹┖");
-        //}
-        //if (!param.getLgort().equals("5006")) {
-        //    return R.ok();
-        //}
-        if (Cools.isEmpty(param.getOrderNo())) {
-            return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
-        }
-        if (Cools.isEmpty(param.getOrderType())) {
-            return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
-        }
-        if (Cools.isEmpty(param.getOrderDetails())) {
-            return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
-        }
-        openService.pakoutOrderCreate(param);
-        return R.ok();
-    }
+
 
     /**
      * 鍑哄簱鍗曞洖鍐�
@@ -161,6 +136,68 @@
         }
     }
 
+
+
+
+
+
+
+
+
+    /**
+     * 娣诲姞鍑哄簱鍗�
+     */
+    @PostMapping("/order/pakout/new/default/v1")
+    @AppAuth(memo = "娣诲姞璁㈠崟鍑哄簱")
+    public synchronized R pakoutOrderCreate(@RequestHeader(required = false) String appkey,
+                                            @RequestBody OpenOrderPakoutParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        if (Cools.isEmpty(param.getOrderNo())) {
+            return R.error("鍗曟嵁缂栧彿[orderNo]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getOrderType())) {
+            return R.error("鍗曟嵁绫诲瀷[orderType]涓嶈兘涓虹┖");
+        }
+        if (Cools.isEmpty(param.getOrderDetails())) {
+            return R.error("鍗曟嵁鏄庣粏[orderDetails]涓嶈兘涓虹┖");
+        }
+        openService.pakoutOrderCreate(param);
+        return R.ok();
+    }
+
+
+    /**
+     * 娣诲姞鍑哄簱鍗�
+     */
+    @PostMapping("/pickToFill/barcode")
+    @AppAuth(memo = "鎹℃枡杞叏鏉�")
+    public synchronized R againOut(@RequestHeader(required = false) String appkey,
+                                            @RequestBody PackParam param,
+                                            HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)||Cools.isEmpty(param.getBarcode())) {
+            return R.error("鎵樼洏鐮佷负绌�,璇锋鏌�");
+        }
+        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
+        if (Cools.isEmpty(wrkMast)) {
+            return R.error("鏃犳硶閫氳繃鎵樼洏鐮佹壘鍒拌宸ヤ綔妗�,璇锋鏌ユ墭鐩樼爜鏄惁姝g‘");
+        }
+        if (wrkMast.getIoType() != 103) {
+            return R.error("浠呮湁鎹℃枡鍑哄簱鍙互浣跨敤璇ュ姛鑳�");
+        }
+        if (wrkMast.getWrkSts() != 17) {
+            return R.error("鎹℃枡鍑哄簱鏈畬鎴�,璇风瓑寰呰澶囪繍琛屽畬鎴�");
+        }
+        openService.pickToFill(wrkMast);
+        return R.ok();
+    }
+
+
+
     public static void main(String[] args) {
         // 1
         System.out.println("======================================");
diff --git a/src/main/java/com/zy/asrs/service/OpenService.java b/src/main/java/com/zy/asrs/service/OpenService.java
index c349203..55aa8a6 100644
--- a/src/main/java/com/zy/asrs/service/OpenService.java
+++ b/src/main/java/com/zy/asrs/service/OpenService.java
@@ -1,5 +1,6 @@
 package com.zy.asrs.service;
 
+import com.zy.asrs.entity.WrkMast;
 import com.zy.asrs.entity.param.OpenOrderCompleteParam;
 import com.zy.asrs.entity.param.OpenOrderPakinParam;
 import com.zy.asrs.entity.param.OpenOrderPakoutParam;
@@ -41,4 +42,5 @@
     // 鎵撳寘涓婄嚎
     void packageUp(PackParam param);
 
+    void pickToFill(WrkMast wrkMast);
 }
diff --git a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
index d593df9..e1c7b1b 100644
--- a/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.DateUtils;
+import com.core.common.R;
 import com.core.common.SnowflakeIdWorker;
 import com.core.exception.CoolException;
 import com.zy.asrs.entity.*;
@@ -51,6 +52,14 @@
     private TagService tagService;
     @Autowired
     private TagMapper tagMapper;
+
+    @Autowired
+    private WrkMastService wrkMastService;
+
+    @Autowired
+    private WrkDetlService wrkDetlService;
+    @Autowired
+    private LocMastService locMastService;
 
     @Override
     @Transactional
@@ -271,6 +280,33 @@
             }
         }
     }
+    @Override
+    @Transactional
+    public void pickToFill( WrkMast wrkMast ){
+        Date now = new Date();
+        wrkMast.setIoType(101);
+        wrkMast.setMemo("鎹℃枡杞叏鏉垮伐浣滄。");
+        wrkMastService.update(wrkMast,new EntityWrapper<WrkMast>()
+                .eq("wrk_no",wrkMast.getWrkNo()));
+        wrkDetlService.deleteByWrkNo(wrkMast.getWrkNo());
+        List<LocDetl> locDetls = locDetlService.selectByLocNo(wrkMast.getSourceLocNo());
+        for (LocDetl locDetl : locDetls) {
+            WrkDetl wrkDetl = new WrkDetl();
+            wrkDetl.sync(locDetl);
+            wrkDetl.setWrkNo(wrkMast.getWrkNo());
+            wrkDetl.setIoTime(wrkMast.getIoTime());
+            wrkDetl.setZpallet(wrkDetl.getBarcode());
+            wrkDetl.setBarcode(wrkMast.getBarcode());
+            wrkDetl.setAppeTime(now);
+            wrkDetl.setModiTime(now);
+            wrkDetl.setAppeUser(1L);
+            wrkDetl.setModiUser(1L);
+            wrkDetl.setMatType(locDetl.getMatType());
+            wrkDetlService.insert(wrkDetl);
+        }
+        locMastService.updateLocSts(wrkMast.getSourceLocNo(),"R");
+    }
+
 
     @Override
     public List<OpenOrderCompeteResult> pakoutOrderComplete(OpenOrderCompleteParam param) {

--
Gitblit v1.9.1