opt: 分切下料联调优化

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/TwoNDCSocketConnectionAutoRun.java

@@ -117,7 +117,7 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                 }
 
                 int[] arr = new int[count];
-            StringBuffer bs = new StringBuffer();
+                StringBuffer bs = new StringBuffer();
 
                 for (int i = 0; i < count; i++) {
                     int temp = b[i];
@@ -241,6 +241,8 @@ public class TwoNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
                                 if (standardAutodoorDeviceDriver.getOpen() == 1 && standardAutodoorDeviceDriver.getToOpen() == 1 ) {
                                     log.info("下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
                                     data = ndcAgvService.sendAgvTwoModeInst(phase, index, 0);
+                                }else {
+                                    log.info("未下发NDC信号原因: 下发开门信号值为:{},下发关门信号值为:{}", standardAutodoorDeviceDriver.getToOpen(), standardAutodoorDeviceDriver.getToClose());
                                 }
                             }
                         } else {

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/two_conveyor/slit_two_manipulator/SlitTwoManipulatorDeviceDriver.java

@@ -284,7 +284,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
                 try {
                     finish_instruction(inst);
                     Map<String, Object> map = new LinkedHashMap<>();
-                    map.put("to_command", 9);
+                    map.put("to_command", 5);
                     this.writing(map);
                     this.setRequireSucess(true);
                 } catch (Exception e) {
@@ -533,7 +533,7 @@ public class SlitTwoManipulatorDeviceDriver extends AbstractOpcDeviceDriver impl
     public void isSetAddress(Device device) {
         if (ObjectUtil.isEmpty(device.getExtraValue().get("address"))) {
             logServer.deviceExecuteLog(device_code, "", "task:" + task, "设备：" + device.getDevice_code() + "未设置电气调度号！");
-            notCreateInstMessage = "设备：" + device.getDevice_code() + "未设置电气调度号！";
+            notCreateInstMessage = device.getDevice_code() + "universal_notCreateInstMessage1";;
             throw new BadRequestException("设备：" + device.getDevice_code() + "未设置电气调度号！");
         }
     }

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/instruction/service/impl/InstructionServiceImpl.java

@@ -1164,14 +1164,14 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
 //
 //        } else
         //1=XZ 2=NDC
-        if (entity.getAgv_system_type().equals(CommonFinalParam.TWO)) {
+        if (ObjectUtil.isNotEmpty(entity.getAgv_system_type()) && entity.getAgv_system_type().equals(CommonFinalParam.TWO)) {
             // NDC agv指令不当场取消指令,需要等agv上报
             if (!StrUtil.isEmpty(entity.getAgv_jobno())) {
                 ndcAgvService.deleteAgvInstToNDC(BeanUtil.copyProperties(entity, Instruction.class));
             } else {
                 flag = true;
             }
-        } else if (entity.getAgv_system_type().equals(CommonFinalParam.ONE)
+        } else if (ObjectUtil.isNotEmpty(entity.getAgv_system_type()) && entity.getAgv_system_type().equals(CommonFinalParam.ONE)
                 && !StrUtil.equals(entity.getSend_status(), "2")) {
             XianGongAgvService xianGongAgvService = SpringContextHolder.getBean(XianGongAgvService.class);
             xianGongAgvService.deleteXZAgvInst(entity.getInstruction_code());

acs2/nladmin-ui/src/views/acs/task/index.vue

@@ -301,6 +301,9 @@
                   />
                 </el-select>
               </el-form-item>
+              <el-form-item label="行架任务类型">
+                <el-input v-model="form.truss_type" style="width: 370px;" @change="isDisabled=false" />
+              </el-form-item>
             </el-col>
             <el-col :span="12">
               <div class="grid-content bg-purple-light" />
@@ -405,6 +408,9 @@
               <el-form-item :label="$t('task.txt_box.Vehicle_number')">
                 <el-input v-model="form.vehicle_code" style="width: 370px;" @change="isDisabled=false" />
               </el-form-item>
+              <el-form-item label="空轴位">
+                <el-input v-model="form.empty_site" style="width: 370px;" @change="isDisabled=false" />
+              </el-form-item>
               <el-form-item :label="$t('task.txt_box.extension_field')">
                 <div>
                   <el-button @click="openDialog">{{ $t('task.select.Placeholder') }}</el-button>