Merge remote-tracking branch 'origin/master'

acs2/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/stacker/standard_stacker/StandardStackerDeviceDriver.java

@@ -428,7 +428,7 @@ public class StandardStackerDeviceDriver extends AbstractOpcDeviceDriver impleme
                         Pattern compile = Pattern.compile(pattern);
                         Map<String, Object> map = new HashMap<>();
                         map.put("code", "to_y");
-                        map.put("value", inst.getTo_z());
+                        map.put("value", inst.getTo_z() );
                         list.add(map);
                         if (inst.getTo_x().length() > 1 && !compile.matcher(inst.getTo_x()).matches()) {
                             String substring = inst.getTo_x().substring(1);

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

@@ -293,7 +293,7 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                             this.inst = null;
                         }
                     }
-                    if (requireSucess) {
+                    if (!requireSucess) {
                         remark = "universal_remark5";
                     }
                     this.setNotCreateTaskMessage(remark);
@@ -348,17 +348,31 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                     Device startPointDevice = deviceAppService.findDeviceByCode(startPoint);
                     if (startPointDevice.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                         plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) startPointDevice.getDeviceDriver();
-                        if (plugPullDeviceSiteDeviceDriver.getAction() != 1&&plugPullDeviceSiteDeviceDriver.getAction() != 3)
+                        if (plugPullDeviceSiteDeviceDriver.getAction() != 1) {
-                            notCreateInstMessage = "universal_notCreateInstMessage9";
+                            notCreateInstMessage = "universal_notCreateInstMessage12";
-                        return false;
+                            return false;
+                        }
                     }
                     String nextDeviceCode = taskDto.getNext_device_code();
                     Device device = deviceAppService.findDeviceByCode(nextDeviceCode);
                     if (device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                         plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) device.getDeviceDriver();
-                        if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2&&plugPullDeviceSiteDeviceDriver.getAction() != 3)
+                        String remark = "";
-                            notCreateInstMessage = "universal_notCreateInstMessage9";
+                        if (plugPullDeviceSiteDeviceDriver.getMode() != 2) {
+                            remark = "universal_notCreateInstMessage9";
+                            notCreateInstMessage = remark;
                             return false;
+                        }
+                        if (plugPullDeviceSiteDeviceDriver.getMove() != 0){
+                            remark = "universal_notCreateInstMessage10";
+                            notCreateInstMessage = remark;
+                            return false;
+                        }
+                        if (plugPullDeviceSiteDeviceDriver.getAction() != 2){
+                            remark = "universal_notCreateInstMessage11";
+                            notCreateInstMessage = remark;
+                            return false;
+                        }
                     }
                     Instruction instruction = instructionService.findByTaskcode(taskDto.getTask_code());
                     String startCode = instruction.getStart_device_code();
@@ -400,17 +414,31 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 Device start_device = deviceAppService.findDeviceByCode(startDeviceCode);
                 if (start_device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                     plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) start_device.getDeviceDriver();
-                    if (plugPullDeviceSiteDeviceDriver.getAction() != 1&&plugPullDeviceSiteDeviceDriver.getAction() != 3)
+                    if (plugPullDeviceSiteDeviceDriver.getAction() != 1) {
-                        notCreateInstMessage = "universal_notCreateInstMessage9";
+                        notCreateInstMessage = "universal_notCreateInstMessage12";
                         return false;
+                    }
                 }
                 String nextDeviceCode = task.getNext_device_code();
                 Device next_device = deviceAppService.findDeviceByCode(nextDeviceCode);
                 if (next_device.getDeviceDriver() instanceof PlugPullDeviceSiteDeviceDriver) {
                     plugPullDeviceSiteDeviceDriver = (PlugPullDeviceSiteDeviceDriver) next_device.getDeviceDriver();
-                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2 || plugPullDeviceSiteDeviceDriver.getMove() != 0 || plugPullDeviceSiteDeviceDriver.getAction() != 2 || plugPullDeviceSiteDeviceDriver.getAction() != 3)
+                    String remark = "";
-                        notCreateInstMessage = "universal_notCreateInstMessage9";
+                    if (plugPullDeviceSiteDeviceDriver.getMode() != 2) {
+                        remark = "universal_notCreateInstMessage9";
+                        notCreateInstMessage = remark;
                         return false;
+                    }
+                    if (plugPullDeviceSiteDeviceDriver.getMove() != 0){
+                        remark = "universal_notCreateInstMessage10";
+                        notCreateInstMessage = remark;
+                        return false;
+                    }
+                    if (plugPullDeviceSiteDeviceDriver.getAction() != 2){
+                        remark = "universal_notCreateInstMessage11";
+                        notCreateInstMessage = remark;
+                        return false;
+                    }
                 }
                 String taskId = task.getTask_id();
                 String taskCode = task.getTask_code();
@@ -458,12 +486,12 @@ public class PullHeadManipulatorDeviceDriver extends AbstractOpcDeviceDriver imp
                 Device startDevice = deviceAppService.findDeviceByCode(instdto.getStart_device_code());
                 Device nextDevice = deviceAppService.findDeviceByCode(instdto.getNext_device_code());
                 if (ObjectUtil.isEmpty(startDevice.getExtraValue().get("address"))) {
-                    notCreateInstMessage = "设备：" + startDevice.getDevice_code() + "未设置电气调度号！";
+                    notCreateInstMessage = "universal_notCreateInstMessage1";
                     logServer.deviceExecuteLog(this.getDevice_code(), "", "", "设备：" + startDevice.getDevice_code() + "未设置电气调度号！");
                     throw new BadRequestException(LangProcess.msg("device_checkAdd", startDevice.getDevice_code()));
                 }
                 if (ObjectUtil.isEmpty(nextDevice.getExtraValue().get("address"))) {
-                    notCreateInstMessage = "设备：" + nextDevice.getDevice_code() + "未设置电气调度号！";
+                    notCreateInstMessage = "universal_notCreateInstMessage1";
                     logServer.deviceExecuteLog(this.getDevice_code(), "", "", "设备：" + nextDevice.getDevice_code() + "未设置电气调度号！");
                     throw new BadRequestException(LangProcess.msg("device_checkAdd", nextDevice.getDevice_code()));
 

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

@@ -475,6 +475,12 @@ public class InstructionServiceImpl extends CommonServiceImpl<InstructionMapper,
                         dto.setRemark(e.getMessage());
                         e.printStackTrace();
                         log.warn("下发AGV指令异常:" + e);
+                        LuceneLogDto logDto1 = LuceneLogDto.builder()
+                                .device_code(start_device_code)
+                                .content("下发AGV指令异常")
+                                .build();
+                        logDto1.setLog_level(4);
+                        luceneExecuteLogService.deviceExecuteLog(logDto1);
                     }
                 } else {
                     // Boolean result =  createLkInst(task.getStorage_task_type(),dto);

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal.properties

@@ -57,7 +57,10 @@ universal_notCreateInstMessage5=\u5B58\u5728\u76F8\u540C\u8DEF\u7EBF\u7684\u6307
 universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93\u9001\u7EBF\u6307\u4EE4!
 universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A!
 universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A!
-universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4D\u6761\u4EF6\u4E0D\u6EE1\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4Dmode!=2\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage10=\u63D2\u62D4\u8F74\u5DE5\u4F4Dmove!=0\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage11=\u63D2\u62D4\u8F74\u5DE5\u4F4Daction!=2\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage12=\u63D2\u62D4\u8F74\u5DE5\u4F4Daction!=1\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_actionMessage1=\u4E0D\u5141\u8BB8\u53D6\u653E
 universal_actionMessage2=\u5141\u8BB8\u53D6\u653E
 universal_actionMessage3=\u5141\u8BB8\u79BB\u5F00

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_en_US.properties

@@ -54,7 +54,10 @@ universal_notCreateInstMessage3=The device is in standby mode or is not allowed
 universal_notCreateInstMessage4=ddj interface bit is in stock, cannot generate command!
 universal_notCreateInstMessage5=Instructions with the same route exist!
 universal_notCreateInstMessage6=The next device is not a conveyor line directive!
-universal_notCreateInstMessage9=The plugging and unplugging shaft station conditions are not met, and the instruction cannot be generated!
+universal_notCreateInstMessage9=Plugging and unplugging axis station mode!=2, unable to generate command!
+universal_notCreateInstMessage10=Plug and unplug shaft station move!=0, command cannot be generated!
+universal_notCreateInstMessage11=Plugging and unplugging axis station action!=2, unable to generate command!
+universal_notCreateInstMessage12=Plugging and unplugging axis station action!=1, unable to generate command!
 universal_actionMessage1=Pick-and-place is not permitted
 universal_actionMessage2=Pick-and-place is allowed
 universal_actionMessage3=Permission to leave

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_in_ID.properties

@@ -54,7 +54,10 @@ universal_notCreateInstMessage3=Siaga perangkat atau tidak diizinkan masuk
 universal_notCreateInstMessage4=DDJ mendarat di dok, tidak ada perintah yang diberikan!
 universal_notCreateInstMessage5=Ada instruksi tentang rute yang sama!
 universal_notCreateInstMessage6=Perangkat berikutnya bukan arahan jalur konveyor!
-universal_notCreateInstMessage9=Kondisi stasiun poros penyumbatan dan pencabutan tidak terpenuhi, dan instruksi tidak dapat dibuat!
+universal_notCreateInstMessage9=Memasukkan dan mencabut mode stasiun sumbu!=2, tidak dapat menghasilkan perintah!
+universal_notCreateInstMessage10=Pasang dan cabut stasiun poros bergerak!=0, perintah tidak dapat dihasilkan!
+universal_notCreateInstMessage11=Memasukkan dan mencabut tindakan stasiun sumbu!=2, tidak dapat menghasilkan perintah!
+universal_notCreateInstMessage12=Memasukkan dan mencabut tindakan stasiun sumbu!=1, tidak dapat menghasilkan perintah!
 universal_actionMessage1=Pick-and-place tidak diizinkan
 universal_actionMessage2=Pick-and-place diperbolehkan
 universal_actionMessage3=Izin untuk pergi

acs2/nladmin-system/nlsso-server/src/main/resources/language/monitor/universal/universal_zh_CN.properties

@@ -59,7 +59,10 @@ universal_notCreateInstMessage3=\u8BBE\u5907\u5F85\u673A\u6216\u4E0D\u5141\u8BB8
 universal_notCreateInstMessage4=ddj\u5BF9\u63A5\u4F4D\u6709\u8D27,\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_notCreateInstMessage5=\u5B58\u5728\u76F8\u540C\u8DEF\u7EBF\u7684\u6307\u4EE4!
 universal_notCreateInstMessage6=\u4E0B\u4E00\u4E2A\u8BBE\u5907\u4E0D\u662F\u8F93\u9001\u7EBF\u6307\u4EE4!
-universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4D\u6761\u4EF6\u4E0D\u6EE1\u8DB3\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage9=\u63D2\u62D4\u8F74\u5DE5\u4F4Dmode!=2\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage10=\u63D2\u62D4\u8F74\u5DE5\u4F4Dmove!=0\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage11=\u63D2\u62D4\u8F74\u5DE5\u4F4Daction!=2\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
+universal_notCreateInstMessage12=\u63D2\u62D4\u8F74\u5DE5\u4F4Daction!=1\uFF0C\u65E0\u6CD5\u751F\u6210\u6307\u4EE4!
 universal_notCreateInstMessage7=\u6258\u76D8\u7C7B\u578B\u4E3A\u7A7A!
 universal_notCreateInstMessage8=\u6761\u7801\u4E3A\u7A7A!
 universal_directives=\u6307\u4EE4