*

L

2026-04-23 702549f5d846ae76cc005c56d03fd774a3caa341

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

@@ -77,6 +77,8 @@
    private String wmsOutPath;
    @Value("${wms.reportSwitch}")
    private boolean reportSwitch;
    @Value("${wms.reportSwitchCs}")
    private boolean reportSwitchCs;
    @Value("${wms.reportSwitchAuto}")
    private boolean reportSwitchAuto;
    @Value("${constant-parameters.priority.distance-threshold:10000}")
@@ -815,36 +817,44 @@
                    wrkMast.setCrnEndTime(now);
                    try{
                        try{
                            if (reportSwitch){
                                RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
                                ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
                                if (result.getCode()==200){
                                    wrkMast.setWrkSts(4L);
                                    wrkMast.setAppeTime(now);
                                    wrkMastService.updateById(wrkMast);
                                    continue;
                                }else {
                                    log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败1");
                                }
                            } else {
                                //测试用
                            if (reportSwitchCs){
                                wrkMast.setWrkSts(4L);
                                wrkMast.setAppeTime(now);
                                wrkMastService.updateById(wrkMast);
                                if (reportSwitchAuto) {
                                    WrkMast wrkMast1 = new WrkMast();
                                    int workNo = commonService.getWorkNo(0);
                                    wrkMast1.setWrkNo((long) workNo);
                                    wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
                                    wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
                                    wrkMast1.setWrkSts(1L);
                                    wrkMast1.setIoType(1);
                                    wrkMast1.setModiTime(now);
                                    wrkMast1.setAppeTime(now);
                                    wrkMast1.setMemo("测试数据");
                                    wrkMastService.save(wrkMast1);
                                }
                                continue;
                            }else {
                                if (reportSwitch){
                                    RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
                                    ReturnT<String> result = new PostMesDataUtils().postMesDataWcs(wmsUrl, wmsOutPath, rgvTaskReportingParam);
                                    if (result.getCode()==200){
                                        wrkMast.setWrkSts(4L);
                                        wrkMast.setAppeTime(now);
                                        wrkMastService.updateById(wrkMast);
                                        continue;
                                    }else {
                                        log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败1");
                                    }
                                } else {
                                    //测试用
                                    wrkMast.setWrkSts(4L);
                                    wrkMast.setAppeTime(now);
                                    wrkMastService.updateById(wrkMast);
                                    if (reportSwitchAuto) {
                                        WrkMast wrkMast1 = new WrkMast();
                                        int workNo = commonService.getWorkNo(0);
                                        wrkMast1.setWrkNo((long) workNo);
                                        wrkMast1.setSourceStaNo(wrkMast.getSourceNoCs(autoZ));
                                        wrkMast1.setStaNo(wrkMast.getStaNoCs(autoZ));
                                        wrkMast1.setWrkSts(1L);
                                        wrkMast1.setIoType(1);
                                        wrkMast1.setModiTime(now);
                                        wrkMast1.setAppeTime(now);
                                        wrkMast1.setMemo("测试数据");
                                        wrkMastService.save(wrkMast1);
                                    }
                                    continue;
                                }

                            }
                        } catch (Exception e){
                            log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败，异常信息："+e);
@@ -860,6 +870,12 @@
                        log.error("小车复位失败，小车号{}！", rgvProtocol.getRgvNo());
                        break;
                    }
                } else if (rgvProtocol.getTaskNo1() == 0){
                    boolean rgvComplete = rgvComplete(rgvProtocol.getRgvNo());
                    if (!rgvComplete) {
                        log.error("小车复位失败，小车号{}！", rgvProtocol.getRgvNo());
                        break;
                    }
                }
            } catch (Exception e) {
                log.error("小车复位线程报错！" + e);