Merge remote-tracking branch 'origin/acs_dev' into acs_dev

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/driver/AbstractOpcDeviceDriver.java

@@ -218,10 +218,10 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
                 int var18 = itemValues.length;
 
                 for (int var19 = 0; var19 < var18; ++var19) {
-                    ItemValue itemValue = var17[var19];
-                    String code = itemValue.getItem_code();
-                    Object value = itemValue.getItem_value();
-                    opcValueAccessor.setValue(code, value);
+                    //ItemValue itemValue = var17[var19];
+                    //String code = itemValue.getItem_code();
+                    //Object value = itemValue.getItem_value();
+                    //opcValueAccessor.setValue(code, value);
                 }
             }
 
@@ -274,10 +274,10 @@ public class AbstractOpcDeviceDriver extends AbstractDeviceDriver implements Opc
                 int var18 = itemValues.length;
 
                 for (int var19 = 0; var19 < var18; ++var19) {
-                    ItemValue itemValue = var17[var19];
-                    String code = itemValue.getItem_code();
-                    Object value = itemValue.getItem_value();
-                    opcValueAccessor.setValue(code, value);
+                    //ItemValue itemValue = var17[var19];
+                    //String code = itemValue.getItem_code();
+                    //Object value = itemValue.getItem_value();
+                    //opcValueAccessor.setValue(code, value);
                 }
             }
 

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_conveyor/un_box_lable_conveyor/UnBoxLableConveyorDeviceDriver.java

@@ -202,7 +202,7 @@ public class UnBoxLableConveyorDeviceDriver extends AbstractOpcDeviceDriver impl
                 }
 
                 //空箱出库开盖位，申请开盖
-                if (mode == 15 && move == 1 && task > 0) {
+                if (mode == 15 && move == 1 && task > 0 && !requireSucess) {
                     Instruction instruction = instructionService.findByCode(String.valueOf(task));
                     //不允许开盖，完成出库任务，自动去扫码位
                     if (instruction == null || StrUtil.isEmpty(instruction.getVehicle_code())) {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/one_manipulator/box_package_manipulator/BoxPackageManipulatorDeviceDriver.java

@@ -424,14 +424,16 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                             throw new BadRequestException("设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                         }
 
-                        BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
-                        if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
-                            boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver();
-                            if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) {
-                                notCreateInstMessage = "universal_notCreateInstMessage2";
-                                return false;
-                            }
-                        }
+                        //效率提升屏蔽光电判断
+
+//                        BoxSubvolumesConveyorDeviceDriver boxSubvolumesConveyorDeviceDriver;
+//                        if (nextDevice.getDeviceDriver() instanceof BoxSubvolumesConveyorDeviceDriver) {
+//                            boxSubvolumesConveyorDeviceDriver = (BoxSubvolumesConveyorDeviceDriver) nextDevice.getDeviceDriver();
+//                            if (boxSubvolumesConveyorDeviceDriver.getMove() != 1) {
+//                                notCreateInstMessage = "universal_notCreateInstMessage2";
+//                                return false;
+//                            }
+//                        }
 
                         ManipulatorCacheDeviceDriver manipulatorCacheDeviceDriver;
                         if (startDevice.getDeviceDriver() instanceof ManipulatorCacheDeviceDriver) {
@@ -553,11 +555,11 @@ public class BoxPackageManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                 map12.put("value", interactionJsonDTO.getFrpModel());
                 list.add(map12);
             }
-            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
-                map13.put("code", "to_have_or_not");
-                map13.put("value", interactionJsonDTO.getIsHave());
-                list.add(map13);
-            }
+//            if (ObjectUtil.isNotEmpty(interactionJsonDTO.getIsHave())) {
+//                map13.put("code", "to_have_or_not");
+//                map13.put("value", interactionJsonDTO.getIsHave());
+//                list.add(map13);
+//            }
         }
         this.writing(list);
         luceneExecuteLogService.deviceExecuteLog(LuceneLogDto.builder()

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/opc/OpcUtl.java

@@ -47,9 +47,9 @@ public class OpcUtl {
             Map<Item, Integer> e = null;
             try {
                 e = group.write(requests);
+                log.info("Group返回下发信号结果：" + String.valueOf(e));
 //                group.write(requests);
             } catch (Exception e1) {
-               e1.printStackTrace();
                throw new BadRequestException("下发信号失败：" + e1.getMessage());
             }