#

zjj

2025-03-12 318b01bda7bd75d1979e6a8c8ab303327582dabb

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

@@ -3085,10 +3085,26 @@
                    command.setWeight2(weight2);

                    if (workNo1 == 0 && workNo2 !=0){
                        if("0".equals(matnr2) || "".equals(batch2) ){
                            log.error("源站"+souSta2+"工位一任务缺少信息，物料代码:"+matnr+",batch:"+batch);
                            continue;
                        }
                        command.setTaskMode(RgvTaskModeType.FETCH_PUT2); // 任务模式: 2取放货
                    } else if (workNo1 != 0 && workNo2 ==0) {
                        if("0".equals(matnr) || "".equals(batch) ){
                            log.error("源站"+souSta1+"工位二任务缺少信息，物料代码:"+matnr+",batch:"+batch);
                            continue;
                        }
                        command.setTaskMode(RgvTaskModeType.FETCH_PUT1); // 任务模式: 1取放货
                    }else {
                        if("0".equals(matnr) || "".equals(batch) ){
                            log.error("源站"+souSta1+"工位一任务缺少信息，物料代码:"+matnr+",batch:"+batch);
                            continue;
                        }
                        if("0".equals(matnr2) || "".equals(batch2) ){
                            log.error("源站"+souSta2+"工位二任务缺少信息，物料代码:"+matnr+",batch:"+batch);
                            continue;
                        }
                        command.setTaskMode(RgvTaskModeType.FETCH_PUT_ALL); // 任务模式: all取放货
                    }
                    command.setCommand(false);
@@ -3432,6 +3448,11 @@
                                wrkMast.setWrkSts(105L);
                                wrkMast.setModiTime(date);
                                wrkMastService.updateById(wrkMast);
                            } else if (wrkMast.getIoType() == 105){
                                Date date = new Date();
                                wrkMast.setWrkSts(14L);
                                wrkMast.setModiTime(date);
                                wrkMastService.updateById(wrkMast);
                            }
                        }

@@ -3747,12 +3768,13 @@
                    String response = new HttpHandler.Builder()
                            .setUri(wmsUrl)
                            .setPath("/rpc/process/loc/v1")
                            .setJson(JSON.toJSONString(""))
                            .build()
                            .doPost();
                    JSONObject jsonObject = JSON.parseObject(response);
                    if (jsonObject.getInteger("code").equals(200)) {
                        log.info("任务下发成功");
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, null));
                        boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(4, null));
                    } else {
                        log.error("请求接口失败！！！url：{}；response：{}", wmsUrl + "/mobile/comb/auth", response);
                    }