#

Junjie

10 小时以前 1cf7590b223651d17120db0888808ce7aa6a9dbe

#

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

@@ -411,6 +411,11 @@
                        }

                        if (wrkMast.getIoType() == 53 || wrkMast.getIoType() == 57) {
                            if (wrkMast.getWrkSts() != 2) {
                                News.error("" + mark + " - 3" + " - 拣选盘点回库工作档状态异常！！！ [plc编号：{}]", devp.getId());
                                continue;
                            }

                            LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                            // 更新站点信息 且 下发plc命令
                            staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
@@ -466,10 +471,27 @@
                                    .doPost();
                            JSONObject jsonObject = JSON.parseObject(response);
                            if (jsonObject.getInteger("code").equals(200)) {
                                LocMast locMast = locMastService.selectById(wrkMast.getLocNo());
                                WrkMast newWrkMast = wrkMastMapper.selectPakInStepBarcode(wrkMast.getBarcode());
                                if (newWrkMast == null) {
                                    // 无拣料数据
                                    News.error("" + mark + " - 3" + " - 拣选盘点回库获取工作档失败！！！ [plc编号：{}]", devp.getId());
                                    continue;
                                }

                                if(newWrkMast.getWrkSts() != 53 && newWrkMast.getWrkSts() != 57) {
                                    News.error("" + mark + " - 3" + " - 拣选盘点回库工作档类型异常！！！ [plc编号：{}]", devp.getId());
                                    continue;
                                }

                                if (wrkMast.getWrkSts() != 2) {
                                    News.error("" + mark + " - 3" + " - 拣选盘点回库工作档状态异常！！！ [plc编号：{}]", devp.getId());
                                    continue;
                                }

                                LocMast locMast = locMastService.selectById(newWrkMast.getLocNo());
                                // 更新站点信息 且 下发plc命令
                                staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                                staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                                staProtocol.setWorkNo(newWrkMast.getWrkNo().shortValue());
                                staProtocol.setStaNo(newWrkMast.getStaNo().shortValue());
                                staProtocol.setPalletSize(locMast.getLocType2());
                                devpThread.setPakMk(staProtocol.getSiteId(), false);
                                boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));