一期输送线不回退

pjb

2024-06-25 8ffff6a25190ee55bd981d2d1825f0dd813dc4e9

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

@@ -174,7 +174,7 @@
                }

                // 退回
                if (back) {
                if (back && devp.getId() == 2) {
//                    News.warn("扫码入库失败，{}入库站因{}异常，托盘已被退回", inSta.getStaNo(), errMsg);
//                    if(!staProtocol.isOutEnable()){
//                        continue;
@@ -206,7 +206,7 @@
                            continue;
                        }
                    }
                    if (wrkMast != null) {
                    if (wrkMast != null && devp.getId() == 2) {
                        News.warn(""+mark+" - 4"+" - 工作档中已存在该站状态为（ 2.设备上走 ）的数据,工作号={}", wrkMast.getWrkNo());
                        staProtocol.setWorkNo((short)9999);
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -268,6 +268,7 @@
                            }
                        } else {
                            News.error(""+mark+" - 5"+" - 请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                            if(devp.getId() == 2) {
                            staProtocol.setWorkNo((short)9999);
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
@@ -275,6 +276,7 @@
                            if (!result) {
                                throw new CoolException("更新plc站点信息失败");
                            }
                            }

                            // led 异常显示
                            if (ledThread != null) {