From 4bc605c9333c5e9c4f023c48cfe11356313db404 Mon Sep 17 00:00:00 2001
From: Comair <1464848666@qq.com>
Date: Mon, 5 Aug 2024 06:59:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E8=AE=BE=E7=BD=AE-=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E8=B6=8A=E5=BA=93=EF=BC=8C=E6=98=AF=E5=90=A6=E6=9A=82?=
 =?UTF-8?q?=E5=81=9C=E5=87=BA=E5=BA=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../shkj/common/constant/RedisConstant.java   | 13 +++++++
 .../business/BaseBarcodesController.java      | 26 ++++++++++++++
 .../wms/service/IBaseBarcodesOutService.java  |  7 ++++
 .../impl/BaseBarcodesOutServiceImpl.java      | 35 +++++++++++++++++++
 4 files changed, 81 insertions(+)

diff --git a/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java b/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java
index 44a9baf..b58306c 100644
--- a/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java
+++ b/shkj-common/src/main/java/com/shkj/common/constant/RedisConstant.java
@@ -107,6 +107,19 @@ public class RedisConstant {
 
     public static String redisSurplusWaitIssueEmpFixTaskNum="surplusWaitIssueEmpFixTaskNum:";
 
+    /**
+     * 是否越库
+     * start 启动越库
+     * stop 不启动越库
+     */
+    public  final static String redisSkipOverWare="skipOverWare:";
+    /**
+     * 是否启动/或暂停出库
+     * stop 停止出库
+     * start 启动出库
+     */
+
+    public final static String redisStartStopOutbound="startStopOutbound:";
 
 }
 
diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/business/BaseBarcodesController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/business/BaseBarcodesController.java
index 2e90000..2c8b38c 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/controller/business/BaseBarcodesController.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/controller/business/BaseBarcodesController.java
@@ -241,6 +241,32 @@ public class BaseBarcodesController extends BaseController {
         return  iBaseBarcodesOutService.handMoveOutboundInfoTaskForCancel(bo);
     }
 
+    /**
+     * 手动控制是否越库
+     * start 启动越库
+     * stop 停止越库
+     * @param status
+     * @return
+     */
+    @PostMapping("/handStartStopOutboundStatus")
+    @RepeatSubmit
+    public Result<Boolean> handStartStopOutboundStatus(@RequestParam("status") String status){
+        return  iBaseBarcodesOutService.handOskipOverWareStatus(status);
+    }
+
+    /**
+     * 手动控制是否越库
+     * start 启动越库
+     * stop 停止越库
+     * @param status
+     * @return
+     */
+    @PostMapping("/handOskipOverWareStatus")
+    @RepeatSubmit
+    public Result<Boolean> handOskipOverWareStatus(@RequestParam("status") String status){
+        return  iBaseBarcodesOutService.handOskipOverWareStatus(status);
+    }
+
 
 
 }
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseBarcodesOutService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseBarcodesOutService.java
index 84ff4de..7ddd856 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/IBaseBarcodesOutService.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBaseBarcodesOutService.java
@@ -10,6 +10,7 @@ import com.shkj.wms.domain.BaseBarcodesOut;
 import com.shkj.wms.third.ykl.ThirdYklResult;
 import com.shkj.wms.vo.BaseBarcodesOutTaskVo;
 import com.shkj.wms.vo.BaseBarcodesOutVo;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
 import java.util.Map;
@@ -119,4 +120,10 @@ public interface IBaseBarcodesOutService  extends IService<BaseBarcodesOut> {
  * @return java.util.List<java.util.Map<java.lang.String,java.lang.String>>
      */
     List<Map<String,String>> getOutEmptyInfo();
+
+
+
+    Result<Boolean> handOskipOverWareStatus(String status);
+
+    Result<Boolean> handStartStopOutboundStatus(String status);
 }
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesOutServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesOutServiceImpl.java
index 2798c14..ded4110 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesOutServiceImpl.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BaseBarcodesOutServiceImpl.java
@@ -380,6 +380,41 @@ public class BaseBarcodesOutServiceImpl extends ServiceImpl<BaseBarcodesOutMappe
         return this.baseMapper.getOutEmptyInfo();
     }
 
+    /**
+     * 启动或停止越库
+     * start 启动越库
+     * stop 不启动越库
+     * @param status
+     * @return
+     */
+    @Override
+    public Result<Boolean> handOskipOverWareStatus(String status) {
+        try {
+            redisTemplate.opsForValue().set(RedisConstant.redisSkipOverWare,status);
+            return Result.ok().msg("设置越库成功");
+        }catch (Exception e){
+            return Result.err().msg("设置越库成功");
+        }
+    }
+
+
+    /**
+     * 是否启动/或暂停出库
+     * stop 停止出库
+     * start 启动出库
+     * @param status
+     * @return
+     */
+    @Override
+    public Result<Boolean> handStartStopOutboundStatus(String status) {
+        try {
+            redisTemplate.opsForValue().set(RedisConstant.redisStartStopOutbound,status);
+            return Result.ok().msg("设置启动/停止出库成功");
+        }catch (Exception e){
+            return Result.err().msg("设置启动/停止出库成功");
+        }
+    }
+
 
     /**
      * 手动下发出库任务-恢复 ：暂停 ，已取消是否是作废，不可恢复 ； 2出库中 给堆垛机下发命令成功，更改状态