#

Junjie

2023-08-04 9101ad488486cd57be5f27ca4ad6071c07ab9557

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

@@ -6,9 +6,7 @@
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.SpringUtils;
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;
@@ -89,8 +87,6 @@
    private BasErrLogService basErrLogService;
    @Autowired
    private BasCrnErrorMapper basCrnErrorMapper;
    @Autowired
    private WmsWrkService wmsWrkService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -297,28 +293,28 @@

                    // 命令下发区 --------------------------------------------------------------------------

                    // 更新站点信息 且 下发plc命令
                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
                    devpThread.setPakMk(staProtocol.getSiteId(), false);
                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
                    if (result) {
                        // 更新工作主档
                        wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
                        wrkMast.setModiTime(new Date());
                        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());
                    }
//                    // 更新站点信息 且 下发plc命令
//                    staProtocol.setWorkNo(wrkMast.getWrkNo().shortValue());
//                    staProtocol.setStaNo(wrkMast.getStaNo().shortValue());
//                    devpThread.setPakMk(staProtocol.getSiteId(), false);
//                    boolean result = MessageQueue.offer(SlaveType.Devp, devp.getId(), new Task(2, staProtocol));
//                    if (result) {
//                        // 更新工作主档
//                        wrkMast.setWrkSts(2L); // 工作状态：2.设备上走
//                        wrkMast.setModiTime(new Date());
//                        if (wrkMastMapper.updateById(wrkMast) == 0) {
//                            log.error("更新工作档失败！！！ [工作号：{}]", wrkMast.getWrkNo());
//                        }
//
//                        //更新WMS任务状态
//                        WmsWrk wmsWrk = wmsWrkService.selectByWmsWrkNo(wrkMast.getWmsWrkNo());
//                        wmsWrk.setWmsStatus(WmsStatusType.WORKING.id);//执行中
//                        wmsWrk.setModiTime(new Date());
//                        wmsWrkService.updateById(wmsWrk);
//
//                    } else {
//                        log.error("发布命令至输送线队列失败！！！ [plc编号：{}]", devp.getId());
//                    }

                }