From dbae31a7a7cd59048ada9b51fe8faff545324c59 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期五, 15 三月 2024 16:02:53 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/controller/CrnController.java |  311 +++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 273 insertions(+), 38 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/CrnController.java b/src/main/java/com/zy/asrs/controller/CrnController.java
index 3690e3c..b719ac1 100644
--- a/src/main/java/com/zy/asrs/controller/CrnController.java
+++ b/src/main/java/com/zy/asrs/controller/CrnController.java
@@ -1,9 +1,8 @@
 package com.zy.asrs.controller;
 
-import HslCommunication.Profinet.Siemens.SiemensS7Net;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.plugins.Page;
 import com.core.annotations.ManagerAuth;
 import com.core.common.Cools;
 import com.core.common.R;
@@ -17,11 +16,15 @@
 import com.zy.asrs.domain.vo.CrnStateTableVo;
 import com.zy.asrs.entity.*;
 import com.zy.asrs.mapper.BasCrnErrorMapper;
+import com.zy.asrs.service.ApiLogService;
 import com.zy.asrs.service.BasCrnpService;
 import com.zy.asrs.service.LocMastService;
 import com.zy.asrs.service.WrkMastService;
 import com.zy.asrs.service.impl.MainServiceImpl;
+import com.zy.asrs.utils.CommandUtils;
+import com.zy.asrs.utils.Utils;
 import com.zy.asrs.utils.VersionUtils;
+import com.zy.common.utils.HttpHandler;
 import com.zy.core.CrnThread;
 import com.zy.core.cache.MessageQueue;
 import com.zy.core.cache.OutputQueue;
@@ -36,9 +39,12 @@
 import com.zy.core.properties.SlaveProperties;
 import com.zy.core.properties.SystemProperties;
 import lombok.extern.slf4j.Slf4j;
+import org.hibernate.validator.internal.engine.messageinterpolation.parser.ELState;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -52,8 +58,14 @@
 @RestController
 public class CrnController {
 
+    @Value("${wms.url}")
+    private String wmsUrl;
+    @Value("${wms.movePath}")
+    private String movePath;
 
 
+    @Autowired
+    private ApiLogService apiLogService;
     @Autowired
     private SlaveProperties slaveProperties;
     @Autowired
@@ -125,8 +137,8 @@
             vo.setLiftPos(crnProtocol.getLiftPosType().desc);
             vo.setWalkPos(crnProtocol.getWalkPos()==1?"涓嶅湪瀹氫綅":"鍦ㄥ畾浣�");
             vo.setWarnCode(String.valueOf(crnProtocol.getAlarm1()));
-            if (crnProtocol.getAlarm1() > 0) {
-                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm1());
+            if (crnProtocol.getAlarm() > 0) {
+                BasCrnError crnError = basCrnErrorMapper.selectById(crnProtocol.getAlarm());
                 vo.setAlarm(crnError==null?"鏈煡寮傚父":crnError.getErrName());
             }
         }
@@ -370,62 +382,98 @@
     @ManagerAuth(memo = "鍏ュ簱")
     @PostMapping("/crn/operator/put")
     public R crnPut(CrnOperatorParam param){
+//        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
         command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
         command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setSourcePosZ(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosX(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosY(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosZ(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosX(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosY(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setCommand((short)1);
+        String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev());
+        String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev());
+        boolean wmsLocStatus = toWmsLocStatus(1, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer());
+        if (!wmsLocStatus){
+            return R.error("搴撲綅鏇存柊澶辫触");
+        }
         return crnControl(command)?R.ok():R.error();
     }
 
     @ManagerAuth(memo = "鍑哄簱")
     @PostMapping("/crn/operator/take")
     public R crnTake(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
         command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
         command.setTaskMode(CrnTaskModeType.PAKOUT); // 浠诲姟妯″紡
-        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setSourcePosZ(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosX(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosY(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosZ(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosX(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosY(param.getLev());     // 鐩爣搴撲綅灞�
+        String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev());
+        String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev());
+        boolean wmsLocStatus = toWmsLocStatus(2, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer());
+        if (!wmsLocStatus){
+            return R.error("搴撲綅鏇存柊澶辫触");
+        }
         return crnControl(command)?R.ok():R.error();
     }
 
     @ManagerAuth(memo = "搴撲綅杞Щ")
     @PostMapping("/crn/operator/stockMove")
     public R crnStockMove(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
         command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
         command.setTaskMode(CrnTaskModeType.LOC_MOVE); // 浠诲姟妯″紡
-        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setSourcePosZ(param.getSourceRow());     // 婧愬簱浣嶆帓
+        command.setSourcePosX(param.getSourceBay());     // 婧愬簱浣嶅垪
+        command.setSourcePosY(param.getSourceLev());     // 婧愬簱浣嶅眰
+        command.setDestinationPosZ(param.getRow());     // 鐩爣搴撲綅鎺�
+        command.setDestinationPosX(param.getBay());     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosY(param.getLev());     // 鐩爣搴撲綅灞�
+        command.setCommand((short)1);
         LocMast sourceLoc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getSourcePosX())
                 .eq("bay1", command.getSourcePosY()).eq("lev1", command.getSourcePosZ()));
         LocMast loc = locMastService.selectOne(new EntityWrapper<LocMast>().eq("row1", command.getDestinationPosX())
                 .eq("bay1", command.getDestinationPosY()).eq("lev1", command.getDestinationPosZ()));
         VersionUtils.locMoveCheckLocType(sourceLoc, loc);
+        String locNo =String.format("%2d",param.getRow()) + String.format("%3d",param.getBay()) + String.format("%2d",param.getLev());
+        String startlocNo =String.format("%2d",param.getSourceRow()) + String.format("%3d",param.getSourceBay()) + String.format("%2d",param.getSourceLev());
+        boolean wmsLocStatus = toWmsLocStatus(3, startlocNo, locNo, param.getBarcode(), param.getBarcodeType(), param.getEmptyContainer());
+        if (!wmsLocStatus){
+            return R.error("搴撲綅鏇存柊澶辫触");
+        }
         return crnControl(command)?R.ok():R.error();
     }
 
     @ManagerAuth(memo = "绔欏埌绔�")
     @PostMapping("/crn/operator/siteMove")
     public R crnSiteMove(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -443,6 +491,10 @@
     @ManagerAuth(memo = "鍥炲師鐐�")
     @PostMapping("/crn/operator/bacOrigin")
     public R crnBacOrigin(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -460,6 +512,10 @@
     @ManagerAuth(memo = "鍙嶅師鐐�")
     @PostMapping("/crn/operator/reverseOrigin")
     public R reverseOrigin(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -469,8 +525,8 @@
         command.setSourcePosY((short) 0);     // 婧愬簱浣嶅垪
         command.setSourcePosZ((short) 0);     // 婧愬簱浣嶅眰
         command.setDestinationPosX((short) 0);     // 鐩爣搴撲綅鎺�
-        command.setDestinationPosY((short) 34);     // 鐩爣搴撲綅鍒�
-        command.setDestinationPosZ((short) 5);     // 鐩爣搴撲綅灞�
+        command.setDestinationPosY((short) 22);     // 鐩爣搴撲綅鍒�
+        command.setDestinationPosZ((short) 1);     // 鐩爣搴撲綅灞�
         return crnControl(command)?R.ok():R.error();
     }
 
@@ -495,6 +551,10 @@
     @ManagerAuth(memo = "浠诲姟瀹屾垚")
     @PostMapping("/crn/operator/taskComplete")
     public R crnTaskComplete(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
@@ -524,6 +584,10 @@
     @ManagerAuth(memo = "娓呴櫎鍛戒护")
     @PostMapping("/crn/operator/clearCommand")
     public R crnClearCommand(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         if (param.getCrnNo() == null) {
             throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
         }
@@ -544,6 +608,10 @@
     @ManagerAuth(memo = "鎵嬪姩澶嶄綅")
     @PostMapping("/crn/operator/handleReset")
     public R handleReset(CrnOperatorParam param) throws Exception {
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         if (param.getCrnNo() == null) {
             throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
         }
@@ -566,7 +634,7 @@
                 crnCommand.setCommand((short) 0);  // 浠诲姟瀹屾垚纭浣�
                 // 寤舵椂鍙戦��
                 Thread.sleep(1000L);
-                if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, crnCommand))) {
+                if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(5, crnCommand), false)) {
                     return R.ok();
                 } else {
                     throw new CoolException("鍛戒护涓嬪彂澶辫触");
@@ -582,22 +650,127 @@
     @ManagerAuth(memo = "鍒囨崲鑱旀満妯″紡")
     @PostMapping("/crn/operator/auto")
     public R crnAuto(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
         short[] array = new short[9];
         CrnCommand command = new CrnCommand();
         command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
         command.setTaskNo((short) 0); // 宸ヤ綔鍙�
-//        command.setAckFinish((short) 0);  // 浠诲姟瀹屾垚纭浣�
-//        command.setTaskMode(CrnTaskModeType.PAKIN); // 浠诲姟妯″紡
-//        command.setSourcePosX(param.getSourceRow());     // 婧愬簱浣嶆帓
-//        command.setSourcePosY(param.getSourceBay());     // 婧愬簱浣嶅垪
-//        command.setSourcePosZ(param.getSourceLev());     // 婧愬簱浣嶅眰
-//        command.setDestinationPosX(param.getRow());     // 鐩爣搴撲綅鎺�
-//        command.setDestinationPosY(param.getBay());     // 鐩爣搴撲綅鍒�
-//        command.setDestinationPosZ(param.getLev());     // 鐩爣搴撲綅灞�
         command.setAuto((short)1);
 
         return crnControl2(command)?R.ok():R.error();
     }
+    @ManagerAuth(memo = "鍒囨崲鍗婃墜鍔ㄦā寮�")
+    @PostMapping("/crn/operator/semiAutomatic")
+    public R crnsemiAutomatic(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAuto((short)2);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+    @ManagerAuth(memo = "鍒囨崲鎵嬪姩妯″紡")
+    @PostMapping("/crn/operator/hand")
+    public R onlineWrk1(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setAuto((short)3);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+    @ManagerAuth(memo = "鐢宠瀹屾垚浠诲姟")
+    @PostMapping("/crn/operator/onlineWrk1")
+    public R onlineWrk2(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setOnlineWrk1((short)1);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+    @ManagerAuth(memo = "鐢宠鍙栨秷浠诲姟")
+    @PostMapping("/crn/operator/onlineWrk2")
+    public R onlineWrk3(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setOnlineWrk2((short)1);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+    @ManagerAuth(memo = "娓呴櫎鑱旀満浠诲姟")
+    @PostMapping("/crn/operator/onlineWrk3")
+    public R onlineWrk4(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setOnlineWrk3((short)1);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+    @ManagerAuth(memo = "鎭㈠鑱旀満浠诲姟")
+    @PostMapping("/crn/operator/onlineWrk4")
+    public R crnHand(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setOnlineWrk4((short)1);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+
+    @ManagerAuth(memo = "澶嶄綅")
+    @PostMapping("/crn/operator/reset")
+    public R crnReset(CrnOperatorParam param){
+        // 绯荤粺杩愯鐘舵�佸垽鏂�
+//        if (SystemProperties.WCS_RUNNING_STATUS.get()) {
+//            return R.error("wcs绯荤粺鐘舵�佷负寮�鍚�");
+//        }
+        short[] array = new short[9];
+        CrnCommand command = new CrnCommand();
+        command.setCrnNo(param.getCrnNo()); // 鍫嗗灈鏈虹紪鍙�
+        command.setTaskNo((short) 0); // 宸ヤ綔鍙�
+        command.setReset((short)1);
+
+        return crnControl2(command)?R.ok():R.error();
+    }
+
+
+
     private boolean crnControl2(CrnCommand command){
         if (command.getCrnNo() == null) {
             throw new CoolException("璇烽�夋嫨鍫嗗灈鏈�");
@@ -649,11 +822,11 @@
                 }
                 // 绌洪棽鍒ゆ柇
 //                if (crnProtocol.getStatusType().equals(com.zy.core.enums.CrnStatusType.IDLE) && crnProtocol.getTaskNo() == 0) {
-                    if (MessageQueue.offer(SlaveType.Crn, crn.getId(), new Task(2, command))) {
-                        return true;
-                    } else {
-                        throw new CoolException("鍛戒护涓嬪彂澶辫触");
-                    }
+                if (CommandUtils.offer(SlaveType.Crn, crn.getId(), new Task(2, command), false)) {
+                    return true;
+                } else {
+                    throw new CoolException("鍛戒护涓嬪彂澶辫触");
+                }
 //                } else {
 //                    throw new CoolException("鍫嗗灈鏈轰笉鍦ㄧ┖闂茬姸鎬�");
 //                }
@@ -715,5 +888,67 @@
         return R.ok().add(list);
     }
 
+    public boolean toWmsLocStatus(Integer type,String startlocNo,String locNo,String barcode,String barcodeType,String emptyContainer){
+        Map<String, Object> map = new HashMap<>();
+        map.put("x-api-key","7a15b5db-29b6-552c-8cff-0cfec3756da2");
+        WmsLocStatus param = new WmsLocStatus();
+        param.setWarehouseId("1688469798893297665");
+        param.setLocationCode(Utils.getWmsLocNo(locNo));
+        if (emptyContainer.equals("1")){
+            param.setEmptyContainer("Y");
+        }else {
+            param.setEmptyContainer("N");
+        }
+        param.setStatus("QY");
+        param.setContainerCode(barcode);
+        param.setContainerTypeCode(barcodeType);
+
+        String response = null;
+        try {
+            response = new HttpHandler.Builder()
+                    .setHeaders(map)
+                    .setUri(wmsUrl)
+                    .setPath("wcsManager/wcsInterface/locationUpdate")
+                    .setJson(JSON.toJSONString(param))
+                    .build()
+                    .doPost();
+        }catch (Exception e){
+            log.error("搴撲綅鏇存柊澶辫触");
+        }
+        JSONObject jsonObject = JSON.parseObject(response);
+        if (jsonObject.getInteger("code").equals(200)){
+            LocMast originLoc = locMastService.selectByLocNo(startlocNo);
+            LocMast locMast = locMastService.selectByLocNo(locNo);
+            if (type == 1){
+                locMast.setBarcode(barcode);
+                locMast.setLocSts("Z");
+                locMastService.updateById(locMast);
+            }else if (type == 2){
+                originLoc.setLocSts("K");
+                originLoc.setBarcode("");
+                locMastService.updateById(originLoc);
+            }else if (type == 3){
+                originLoc.setLocSts("K");
+                originLoc.setBarcode("");
+                locMast.setBarcode(barcode);
+                locMast.setLocSts("Z");
+                locMastService.updateById(originLoc);
+                locMastService.updateById(locMast);
+            }
+
+            apiLogService.save("Wms鍙樻洿璐т綅鐘舵��"
+                    ,wmsUrl+"wcsManager/wcsInterface/inboundTaskApply"
+                    ,null
+                    ,"127.0.0.1"
+                    ,JSON.toJSONString(param)
+                    ,response
+                    ,true
+            );
+            return true;
+        }
+        return false;
+
+    }
+
 
 }

--
Gitblit v1.9.1