From d92e13e128bc4a51f56ed4d32e4d2567aaa030e8 Mon Sep 17 00:00:00 2001
From: judy <278197488@qq.com>
Date: Sun, 22 Sep 2024 10:28:29 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A9=BA=E6=89=98=E5=87=BA=E5=BA=93=20?=
 =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=87=BA=E5=BA=93=EF=BC=8C=E7=9B=98=E7=82=B9?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8C=E7=9A=84=E7=AB=99=E7=82=B9=E6=A5=BC=E5=B1=82?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/shkj/wcs/third/stacker/StkCallUtil.java    | 3 ++-
 shkj-wms/src/main/java/com/shkj/wms/bo/STKMoveBo.java        | 5 +++++
 .../wms/controller/business/BusinStockInvController.java     | 4 ++--
 .../java/com/shkj/wms/service/IBusinStockInvService.java     | 2 +-
 .../com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java | 1 +
 .../com/shkj/wms/service/impl/BusinStockInvServiceImpl.java  | 3 ++-
 .../service/impl/SysThirdExceptionRequestServiceImpl.java    | 1 +
 .../src/main/java/com/shkj/wms/utils/WmsCallWcsUtil.java     | 2 ++
 8 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/shkj-wms/src/main/java/com/shkj/wcs/third/stacker/StkCallUtil.java b/shkj-wms/src/main/java/com/shkj/wcs/third/stacker/StkCallUtil.java
index 5b6a1da..54de577 100644
--- a/shkj-wms/src/main/java/com/shkj/wcs/third/stacker/StkCallUtil.java
+++ b/shkj-wms/src/main/java/com/shkj/wcs/third/stacker/StkCallUtil.java
@@ -142,7 +142,8 @@ public class StkCallUtil {
 
         log.info("1楼是否允许出库:："+oneDpsidle+" 出库的值："+oneDpsidleV);
         log.info("2楼是否允许出库:："+twoDpsidle+" 出库的值："+twoDpsidleV);
-        Integer layer = 1;
+        //出库的站台
+        Integer layer =stkMoveBo.getLayer();
         if (layer==1){
             //false不允许出库
             if (!Boolean.valueOf(oneDpsidleV)){
diff --git a/shkj-wms/src/main/java/com/shkj/wms/bo/STKMoveBo.java b/shkj-wms/src/main/java/com/shkj/wms/bo/STKMoveBo.java
index aa4ee4b..ba6a265 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/bo/STKMoveBo.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/bo/STKMoveBo.java
@@ -52,5 +52,10 @@ public class STKMoveBo implements Serializable {
     /** to列 */
     private String toLayer;
 
+    /**
+     * 呼叫楼层-站台
+     */
+    private Integer layer;
+
 
 }
diff --git a/shkj-wms/src/main/java/com/shkj/wms/controller/business/BusinStockInvController.java b/shkj-wms/src/main/java/com/shkj/wms/controller/business/BusinStockInvController.java
index 1e9ffce..b3f0c32 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/controller/business/BusinStockInvController.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/controller/business/BusinStockInvController.java
@@ -190,8 +190,8 @@ public class BusinStockInvController extends BaseController {
      */
     @Log(title = "盘点计划中的，执行盘点计划", businessType = BusinessType.UPDATE)
     @PostMapping("/exec")
-    public Result<Boolean> exec(@RequestParam String invOrderNo) {
-        return iBusinStockInvService.exec(invOrderNo);
+    public Result<Boolean> exec(@RequestParam String invOrderNo,Integer layer) {
+        return iBusinStockInvService.exec(invOrderNo,layer);
     }
     @Log(title = "盘点计划中的，取消盘点计划", businessType = BusinessType.UPDATE)
     @PostMapping("/execCancel")
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
index 186c06c..be59550 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/IBusinStockInvService.java
@@ -70,7 +70,7 @@ public interface IBusinStockInvService extends IService<BusinStockInv> {
      * @param invOrderNo
      * @return
      */
-    Result<Boolean> exec(String invOrderNo);
+    Result<Boolean> exec(String invOrderNo,Integer layer);
 
     /**
      * 取消盘点
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java
index 73584b4..7595447 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinOutInPlanServiceImpl.java
@@ -275,6 +275,7 @@ public class BusinOutInPlanServiceImpl extends ServiceImpl<BusinOutInPlanMapper,
             inPlan.setBranchId(3L);
             StockDetailLocationVo location = sysStockDetailService.findLocationByContainer(bo.getContainerCode(),  SecurityUtils.erpBranchId);
             inPlan.setLocationId(location.getId());
+            inPlan.setLayer(1);
             inPlans.add(inPlan);
         }
 
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinStockInvServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinStockInvServiceImpl.java
index be845a2..8de2149 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinStockInvServiceImpl.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/BusinStockInvServiceImpl.java
@@ -492,7 +492,7 @@ public class BusinStockInvServiceImpl extends ServiceImpl<BusinStockInvMapper, B
      */
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result<Boolean> exec(String invOrderNo) {
+    public Result<Boolean> exec(String invOrderNo,Integer layer) {
         LambdaQueryWrapper<BusinStockInv> wrapper = new LambdaQueryWrapper<BusinStockInv>()
                 .eq(BusinStockInv::getInvOrderNo, invOrderNo)
                 .eq(BusinStockInv::getInvStatus, InvStatusEnum.init.getValue());
@@ -503,6 +503,7 @@ public class BusinStockInvServiceImpl extends ServiceImpl<BusinStockInvMapper, B
         for (BusinStockInv businStockInv : list) {
             businStockInv.setInvStatus(InvStatusEnum.exec.getValue());
             businStockInv.setExecTime(DateUtils.getNowDate());
+            businStockInv.setLayer(layer);
         }
 
         //更新盘点的状态为确认执行
diff --git a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysThirdExceptionRequestServiceImpl.java b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysThirdExceptionRequestServiceImpl.java
index 3c60412..04091b2 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysThirdExceptionRequestServiceImpl.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/service/impl/SysThirdExceptionRequestServiceImpl.java
@@ -76,6 +76,7 @@ public class SysThirdExceptionRequestServiceImpl extends ServiceImpl<SysThirdExc
             case ThirdApiTypeEnum.wcsOutTask:
             case ThirdApiTypeEnum.wcsCallOutStock:
                 STKMoveBo vo = JSONObject.parseObject(request.getRequestBody(), STKMoveBo.class);
+                vo.setLayer(request.getLayer());
                 Result runTask = businOutInPlanService.checkIsRunTask(vo.getTaskId());
                 if (Result.isOk(runTask)) {
                     result = runTask;
diff --git a/shkj-wms/src/main/java/com/shkj/wms/utils/WmsCallWcsUtil.java b/shkj-wms/src/main/java/com/shkj/wms/utils/WmsCallWcsUtil.java
index 31a2ec3..a4d9913 100644
--- a/shkj-wms/src/main/java/com/shkj/wms/utils/WmsCallWcsUtil.java
+++ b/shkj-wms/src/main/java/com/shkj/wms/utils/WmsCallWcsUtil.java
@@ -57,6 +57,7 @@ public class WmsCallWcsUtil {
     public Result outStock(OutStockDetailVo vo, boolean call,Integer layer) {
         try {
             STKMoveBo moveBo = getStkMoveBo(vo);
+            moveBo.setLayer(layer);
             Result<Boolean> result = Result.err();
             log.info("outStock 调用入参 = {} call = {}", moveBo, call);
             if (call) {
@@ -86,6 +87,7 @@ public class WmsCallWcsUtil {
         try {
             //从哪个位置搬运
             STKMoveBo moveBo = getStkMoveBo(vo);
+            moveBo.setLayer(layer);
             log.info("callOutStock 调用入参 = {}", moveBo);
             //给堆垛机下搬运命令
             Result<Boolean> result = stkCallUtil.outTask(moveBo);