From 1e5a083e2c1acd8ab24bbc3b0ba579b040abf6b9 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 12 二月 2025 08:56:54 +0800
Subject: [PATCH] #四向库订单出库单个出库

---
 src/main/java/com/zy/asrs/controller/OpenController.java |   76 +++++++++++++++++++++++++++++++++++++-
 1 files changed, 74 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/OpenController.java b/src/main/java/com/zy/asrs/controller/OpenController.java
index f8829d5..7375327 100644
--- a/src/main/java/com/zy/asrs/controller/OpenController.java
+++ b/src/main/java/com/zy/asrs/controller/OpenController.java
@@ -1,11 +1,14 @@
 package com.zy.asrs.controller;
 
 import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 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.*;
 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;
@@ -16,6 +19,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * Created by vincent on 2022/4/8
@@ -32,11 +36,78 @@
 
     @Autowired
     private OpenService openService;
+    @Autowired
+    private WrkMastService wrkMastService;
+
+    @GetMapping("/order/delete/v1")
+    @AppAuth(memo = "璁㈠崟淇℃伅鍒犻櫎")
+    public synchronized R orderDelete(@RequestHeader(required = false) String appkey,
+                                  @RequestParam String orderNo,
+                                  HttpServletRequest request) {
+        auth(appkey, orderNo, request);
+        if (Cools.isEmpty(orderNo)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        openService.orderDelete(orderNo);
+        return R.ok();
+
+    }
+
+
+    @PostMapping("/tagSync/v1")
+    @AppAuth(memo = "鐗╂枡鍒嗙被鍚屾")
+    public synchronized R tagSync(@RequestHeader(required = false) String appkey,
+                                        @RequestBody(required = false) List<Map<String,String>> param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        ArrayList<TagParam> params = new ArrayList<>();
+        for (Map<String,String> map : param) {
+            TagParam tagParam  = new TagParam(map);
+            params.add(tagParam);
+        }
+
+        openService.syncTag(params);
+        return R.ok();
+
+    }
+
+
+    @PostMapping("/wrkMast/finish/v1")
+    @AppAuth(memo = "鍥涘悜杞︿换鍔″畬鎴�")
+    public synchronized R wrkMastFinish(@RequestHeader(required = false) String appkey,
+                                        @RequestBody(required = false) ShuttleFinishParam param,
+                                        HttpServletRequest request) {
+        auth(appkey, param, request);
+        if (Cools.isEmpty(param)) {
+            return R.parse(BaseRes.PARAM);
+        }
+        try {
+            WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", param.getTaskNo()).eq("crn_no",7));
+            if (Cools.isEmpty(wrkMast)) {
+                throw new CoolException("鍥涘悜搴撲换鍔℃湭鎵惧埌");
+            }
+            if (wrkMast.getIoType() == 1 || wrkMast.getIoType() == 10 || wrkMast.getIoType() == 53 || wrkMast.getIoType() == 54 || wrkMast.getIoType() == 57) {
+                wrkMast.setWrkSts(4L);
+            }else {
+                wrkMast.setWrkSts(14L);
+            }
+            if (!wrkMastService.updateById(wrkMast)){
+                return R.error();
+            }
+        }catch (Exception e) {
+            throw new CoolException(e);
+        }
+
+
+        return R.ok();
+    }
 
 
 
     @PostMapping("/locDetl/select/time/v1")
-    @AppAuth(memo = "鏃堕棿鑾峰彇搴撳瓨淇℃伅")
     public synchronized R locDetlSelect(@RequestHeader(required = false) String appkey,
                                         @RequestBody(required = false) TimeSelectParam param,
                                         HttpServletRequest request) {
@@ -97,6 +168,7 @@
      * 娣诲姞鍏ュ簱鍗�
      */
     @PostMapping("/order/pakin/default/v1")
+    @AppAuth(memo = "鍏ュ簱鍗曟嵁涓嬪彂")
     public synchronized R pakinOrderCreate(@RequestHeader(required = false) String appkey,
                                            @RequestBody OpenOrderPakinParam param,
                                            HttpServletRequest request) {
@@ -182,7 +254,7 @@
     }
 
         private void auth(String appkey, Object obj, HttpServletRequest request) {
-            log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", "open/sensorType/list/auth/v1", appkey, JSON.toJSONString(obj));
+//            log.info("{}鎺ュ彛琚闂紱appkey:{}锛涜姹傛暟鎹細{}", request.getRequestURI(), appkey, JSON.toJSONString(obj));
             request.setAttribute("cache", obj);
             if (!auth) {
                 return;

--
Gitblit v1.9.1