fixed

Junjie

2023-05-22 6e65e575aedd776432cda5a88f7434320f42e3f4

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

@@ -7,6 +7,7 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.domain.enums.WmsWrkStatusType;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.BasCrnErrorMapper;
import com.zy.asrs.mapper.WaitPakinMapper;
@@ -87,6 +88,8 @@
    private BasErrLogService basErrLogService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private WmsWrkService wmsWrkService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -305,6 +308,13 @@
                        if (wrkMastMapper.updateById(wrkMast) == 0) {
                            log.error("更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
                        }

                        //更新WMS任务状态
                        WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
                        wmsWrk.setWmsStatus(WmsWrkStatusType.WORKING.id);//执行中
                        wmsWrk.setModiTime(new Date());
                        wmsWrkService.updateById(wmsWrk);

                    } else {
                        log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
                    }
@@ -1029,8 +1039,9 @@
                Date now = new Date();
                wrkMast.setCrnEndTime(now);
                wrkMast.setModiTime(now);
                Integer integerWrkMast = wrkMastMapper.updateById(wrkMast);
                // 修改成功后复位堆垛机
                if (wrkMastMapper.updateById(wrkMast) > 0) {
                if (integerWrkMast > 0) {
                    // 堆垛机复位
                    crnThread.setResetFlag(true);
                }