更新

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/oven_manipulator/OvenGantryManipulatorDeviceDriver.java

@@ -171,17 +171,6 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                         inst1.setInstruction_status("1");
                         inst1.setExecute_device_code(this.device_code);
                         instructionService.update(inst1);
-//                        TaskDto tas未反馈电气信号原因kDto = taskserver.findByCodeFromCache(inst1.getTask_code());
-//                        if (ObjectUtil.isNotEmpty(taskDto)) {
-//                            if (StrUtil.isNotEmpty(taskDto.getExt_task_id())) {
-//                                JSONArray array = new JSONArray();
-//                                JSONObject map = new JSONObject();
-//                                map.put("task_id", taskDto.getExt_task_id());
-//                                map.put("task_status", "1");
-//                                array.add(map);
-//                                acsToWmsService.feedbackTaskStatusToWms(array);
-//                            }
-//                        }
                     }
                 }
             }
@@ -592,6 +581,10 @@ public class OvenGantryManipulatorDeviceDriver extends AbstractOpcDeviceDriver i
                     this.writing("to_target", next_addr);
                     this.writing("to_task", instruction.getInstruction_code());
                     this.writing("to_command", "1");
+                    if (startdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
+                        hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) startdevice.getDeviceDriver();
+                        hongXiangConveyorDeviceDriver.writing("to_open_door","1");
+                    }
                     if (nextdevice.getDeviceDriver() instanceof HongXiangConveyorDeviceDriver) {
                         hongXiangConveyorDeviceDriver = (HongXiangConveyorDeviceDriver) nextdevice.getDeviceDriver();
                         hongXiangConveyorDeviceDriver.writing("to_open_door","1");

acs/nladmin-system/src/main/java/org/nl/acs/device_driver/basedriver/standard_conveyor_control_with_scanner/StandardCoveyorControlWithScannerDeviceDriver.java

@@ -553,6 +553,7 @@ public class StandardCoveyorControlWithScannerDeviceDriver extends AbstractOpcDe
                                     + "已存在对应任务");
                             requireSucess = true;
                             applySucess = true;
+                            return true;
                         }
                     }
                 }

acs/nladmin-system/src/main/java/org/nl/acs/opc/DeviceOpcProtocolRunable.java

@@ -138,7 +138,11 @@ public class DeviceOpcProtocolRunable implements Runnable {
             time_out = false;
           }
 
-//          if(ObjectUtil.isEmpty(itemStatus))  continue label97;
+//          if(ObjectUtil.isEmpty(itemStatus)) {
+//            System.out.println( tag + " :itemStatus is null");
+//            break;
+//          }
+
 
           Set<Item> items = itemStatus.keySet();
           Iterator var18 = items.iterator();

acs/nladmin-system/src/main/resources/logback-spring.xml

@@ -174,7 +174,7 @@ https://juejin.cn/post/6844903775631572999
 
     <!--生产环境:打印控制台和输出到文件-->
     <springProfile name="prod">
-        <root level="debug">
+        <root level="info">
             <appender-ref ref="ERROR"/>
             <appender-ref ref="lokiAppender" />
             <appender-ref ref="asyncFileAppender"/>

acs/nladmin-ui/src/views/system/monitor/device/index.vue

@@ -153,7 +153,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="dialogFormVisible1 = false">取 消</el-button>
-        <el-button type=this"primary" @click="saveBarcode">确 定</el-button>
+        <el-button type="primary" @click="saveBarcode">确 定</el-button>
       </div>
     </el-dialog>
   </div>