Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

ZY

2024-09-06 d13d4c2ed3d3590946134b7e21534036fe3a16c1

Merge remote-tracking branch 'origin/xgmFlWcs' into xgmFlWcs

# Conflicts:
#	src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

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

@@ -175,7 +175,7 @@
                    staProtocol.setStaNo(inSta.getBackSta().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    log.error("输送线下发1："+wrkNo+","+inSta.getBackSta());
                    log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
                }

                // 判断是否满足入库条件
@@ -184,7 +184,7 @@
                        && staProtocol.isInEnable()
                        && !staProtocol.isEmptyMk()
                        && staProtocol.isPakMk()) {
                    if(Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                    if (Cools.isEmpty(barcode) || "NG".endsWith(barcode) || "NoRead".equals(barcode) || "00000000".equals(barcode)) {
                        News.info("{}号条码扫描器检测条码信息：{}", inSta.getBarcode(), barcode);

                        staProtocol.setWorkNo(wrkNo);
@@ -193,7 +193,7 @@
                        staProtocol.setStaNo(inSta.getBackSta().shortValue());
                        devpThread.setPakMk(staProtocol.getSiteId(), false);
                        MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                        log.error("输送线下发1："+wrkNo+","+inSta.getBackSta());
                        log.error("输送线下发1：" + wrkNo + "," + inSta.getBackSta());
                        continue;
                    }
                    // 判断重复工作档
@@ -256,7 +256,7 @@
                            staProtocol.setStaNo(dto.getStaNo().shortValue());
                            devpThread.setPakMk(staProtocol.getSiteId(), false);
                            boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                            log.error("输送线下发2："+dto.getWorkNo()+","+dto.getStaNo());
                            log.error("输送线下发2：" + dto.getWorkNo() + "," + dto.getStaNo());

                            ledThread.errorReset();
                            log.error("组托请求后LED错误清除");
@@ -267,6 +267,27 @@
                                throw new CoolException("更新plc站点信息失败");
                            }
                        } else {
                            if (jsonObject.getString("msg").equals("工作档已存在")) {
                                //工作档已存在    再次进去
                                wrkMast = wrkMastMapper.selectPakInStepBarcode(barcode);
                                if (wrkMast != null) {
                                    barcodeThread.setBarcode("");
                                    staProtocol.setWorkNo(wrkMast.getWrkNo());
                                    //staProtocol.setStaNo(RouteUtils.SouStaEnd(dto.getStaNo(),dto.getSourceStaNo()));
                                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                                    log.error("输送线下发2：" + wrkMast.getWrkNo() + "," + wrkMast.getStaNo());
                                    ledThread.errorReset();
                                    log.error("组托请求后LED错误清除");
                                    if (!result) {
                                        News.error(methodName + ":更新plc站点信息失败");

                                        throw new CoolException("更新plc站点信息失败");
                                    }
                                }
                                continue;
                            }
                            staProtocol.setWorkNo(wrkNo);
                            wrkNo++;
                            staProtocol.setStaNo(inSta.getBackSta().shortValue());
@@ -274,10 +295,10 @@
                            MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//
//                            if (ledThread != null) {
                                String errorMsg = jsonObject.getString("msg");
                                if (!Cools.isEmpty(errorMsg)) {
                                    MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                                }
                            String errorMsg = jsonObject.getString("msg");
                            if (!Cools.isEmpty(errorMsg)) {
                                MessageQueue.offer(SlaveType.Led, inSta.getLed(), new Task(3, errorMsg));
                            }
//                            }
//                            News.error(methodName + ":请求接口失败！！！url：{}；request：{}；response：{}", wmsUrl + "/rpc/pakin/loc/v1", JSON.toJSONString(param), response);
                        }

 src/main/java/com/zy/core/MainProcess.java

@@ -50,8 +50,7 @@
                    // 入出库模式切换函数
//                    mainService.ioConvert();

                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick(3);

                  //  mainService.stnToCrnStnPick2();

                    // 入库  ===>> 入库站到堆垛机站，根据条码扫描生成入库工作档
@@ -59,6 +58,9 @@
//                    mainService.generateStoreWrkFile0(2); // WMS入库
                    Thread.sleep(500);


                    // 拣料、并板、盘点再入库
                    mainService.stnToCrnStnPick(3);
                    // 出库  ===>>  堆垛机出库站到出库站
                    mainService.crnStnToOutStn(4);
                    // 入出库  ===>>  堆垛机入出库作业下发