*

lsh

2025-03-01 d9119750c61e180c967bbab77cc27f8f5f66f794

*

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

@@ -16,6 +16,7 @@
import com.zy.asrs.utils.SortTheExecutionOfTheCarUtil;
import com.zy.asrs.utils.TimeCalculatorUtils;
import com.zy.common.CodeRes;
import com.zy.common.service.CommonService;
import com.zy.common.utils.HttpHandler;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
@@ -54,6 +55,8 @@
    private BasCircularShuttleService basCircularShuttleService;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private CommonService commonService;

    @Value("${constant-parameters.perimeter}")
    private Long perimeter;
@@ -386,15 +389,34 @@
                    wrkMast.setAppeTime(now);
                    try{
                        try{
                            RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
                            ReturnT<String> result = new PostMesDataUtils().postMesDataWcs("", "", rgvTaskReportingParam);
                            if (result.getCode()==200){
                                wrkMast.setWrkSts(4L);
                            if (true){
                                RgvTaskReportingParam rgvTaskReportingParam = new RgvTaskReportingParam(wrkMast);
                                ReturnT<String> result = new PostMesDataUtils().postMesDataWcs("", "", rgvTaskReportingParam);
                                if (result.getCode()==200){
                                    wrkMast.setWrkSts(4L);
                                    wrkMast.setAppeTime(now);
                                    wrkMastService.updateById(wrkMast);
                                    continue;
                                }else {
                                    log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败");
                                }
                            } else {
                                //测试用
                                wrkMast.setWrkSts(5L);
                                wrkMast.setAppeTime(now);
                                wrkMastService.updateById(wrkMast);
                                WrkMast wrkMast1 = new WrkMast();
                                int workNo = commonService.getWorkNo(0);
                                wrkMast1.setWrkNo((long) workNo);
                                wrkMast1.setSourceStaNo(wrkMast.getStaNo());
                                wrkMast1.setStaNo(wrkMast.getSourceStaNo());
                                wrkMast1.setWrkSts(1L);
                                wrkMast1.setIoType(1);
                                wrkMast1.setModiTime(now);
                                wrkMast1.setAppeTime(now);
                                wrkMast1.setMemo("测试数据");
                                wrkMastService.insert(wrkMast1);
                                continue;
                            }else {
                                log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败");
                            }
                        } catch (Exception e){
                            log.error("工作号"+wrkMast.getWrkNo()+"任务完成信息上传处理失败，异常信息："+e);