opt:优化结构

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库行架/box_manipulator/BoxManipulatorDeviceDriver.java

@@ -48,6 +48,7 @@ import java.util.concurrent.TimeUnit;
 
 /**
  * 一楼木箱机械手
+ * 协议：一楼木箱抓取智能桁架
  */
 @Slf4j
 @Data

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/scanner_weight_conveyor/ConveyorWithScannerWeightDeviceDriver.java

@@ -47,7 +47,7 @@ import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 /**
- * 输送线工位-带扫码称重
+ * 出入库输送线工位-带扫码称重
  */
 @Slf4j
 @Data
@@ -381,7 +381,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                     }
                 }
 
-                //申请入库指令、异常位指令
+                //申请入库指令、异常位指令，指令下发
                 if (this.mode == 2 && this.move > 0 && !this.requireSuccess) {
                     instruction_require();
                 }
@@ -548,7 +548,7 @@ public class ConveyorWithScannerWeightDeviceDriver extends AbstractOpcDeviceDriv
                 param.put("weight", this.weight);
             }
             param.put("type", type);
-            HttpResponse httpResponse = acsToWmsService.applyTwo(param);
+            HttpResponse httpResponse = acsToWmsService.c(param);
             if (ObjectUtil.isNotEmpty(httpResponse)) {
                 JSONObject resp = JSONObject.parseObject(httpResponse.body());
                 if (resp != null && resp.getIntValue("status") == 200) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/一楼立库输送线/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java

@@ -319,7 +319,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver
             this.requireTime = currentTimeMillis;
             JSONObject param = new JSONObject();
             param.put("device_code", this.currentDeviceCode);
-            param.put("material_barcode", vehicleCode);
+            param.put("vehicle_code", vehicleCode);
             param.put("task", this.task);
             String response = acsToWmsService.getIsUncap(param);
             JSONObject jo = JSON.parseObject(response);

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/enums/StorageTypeEnum.java

@@ -16,11 +16,11 @@ public enum StorageTypeEnum {
 
     ERROR("4", "异常处理位"),
 
-    BOX_IN("5", "木箱入库"),
+    BOX_IN("7", "木箱装箱开盒盖"),
 
     BOX_RETURN("6", "退货入库"),
-
+//    这个枚举字段需要跟上位统一
-    BOX_RETURN_HJ("7", "退货异常申请行架任务"),
+    BOX_RETURN_HJ("9", "退货异常申请行架对接位至NG位"),
 
     PACK_ERROR("8", "装箱异常申请任务");
     /**