而且回退修改，led显示

pjb

2024-06-26 ecb93482982b82008b37de0ec67d2afa9cb60b13

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -162,16 +162,16 @@
                    back = true;
                }

                if (!back && devp.getId() == 2) {
                    if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
                        errMsg = "条码5只能入7排";
                        back = true;
                    }
                    if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
                        errMsg = "条码5不能入6排";
                        back = true;
                    }
                }
//                if (!back && devp.getId() == 2) {
//                    if(staProtocol.getWorkNo() == 9907 && '5' != barcode.charAt(0)){
//                        errMsg = "条码5只能入7排";
//                        back = true;
//                    }
//                    if(staProtocol.getWorkNo() == 9906 && '5' == barcode.charAt(0)){
//                        errMsg = "条码5不能入6排";
//                        back = true;
//                    }
//                }

                // 退回
                if (back && devp.getId() == 2) {
@@ -262,6 +262,7 @@
                                ledCommand.setTitle("全板入库");
                                ledCommand.setLocNo(dto.getLocNo());
                                ledCommand.setStaNo(dto.getStaNo());
                                ledCommand.setBarcode(barcode);
                                commands.add(ledCommand);
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, commands));
//                                ledThread.errorReset();
@@ -1649,6 +1650,7 @@
                ledCommand.setSourceLocNo(wrkMast.getSourceLocNo());
                ledCommand.setLocNo(wrkMast.getLocNo());
                ledCommand.setStaNo(wrkMast.getStaNo());
                ledCommand.setBarcode(wrkMast.getBarcode());
//                ledCommand.setSourceStaNo(wrkMast.getSourceStaNo());
                if (wrkMast.getIoType() != 110 && wrkMast.getIoType() != 10) {
                    List<WrkDetl> wrkDetls = wrkDetlService.findByWorkNo(wrkMast.getWrkNo());