1

zhang

2025-06-05 c48d0150aa9f6b297671f28adb6b9dc95b529cfc

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

@@ -261,7 +261,7 @@
                                String errorMsg = barcode + "托盘识别异常，请先进行组托！";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else if (redata.toString().contains("物料类型和实际种类不一致")) {
                        } else if (redata.toString().contains("物料类型和实际种类不一致")||redata.toString().contains("混放物料类型不一致")) {
                            staProtocol.setWorkNo((short) 9995);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -269,7 +269,18 @@

                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "物料类型和实际种类不一致！";
                                String errorMsg = barcode + redata.toString();
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        }else if (redata.toString().startsWith("800")){
                            staProtocol.setWorkNo((short) 9995);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));

                            // led 异常显示
                            if (ledThread != null) {
                                String errorMsg = barcode + "库位不足";
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
                        } else if ((code == 500 || code == 1000)) {
@@ -1229,7 +1240,8 @@
                                    // 没有作业中的入库任务时，才能生成移库任务
                                    WrkMast one2 = wrkMastService.selectOne(new EntityWrapper<WrkMast>()
                                            .eq("crn_no", slave.getId())
                                            .last(" and wrk_sts in (3,4,5,6,7,8)"));
                                            .eq("source_loc_no", shallowLocNo));
                                            //.last(" and wrk_sts in (3,4,5,6,7,8)"));
                                    if (one2 == null) {
                                        moveLocForDeepLoc(slave, shallowLoc);
                                        // 置顶任务