#

Junjie

17 小时以前 0ed68cc1d412d1722d52c5c41777970924221be4

 src/main/java/com/zy/core/thread/impl/ZySiemensCrnThread.java

@@ -24,6 +24,7 @@
import com.zy.core.network.DeviceConnectPool;
import com.zy.core.network.ZyCrnConnectDriver;
import com.zy.core.network.entity.ZyCrnStatusEntity;
import com.zy.core.service.WrkCommandRollbackService;
import com.zy.core.thread.CrnThread;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
@@ -288,7 +289,7 @@
        crnCommand.setCrnNo(crnNo); // 堆垛机编号
        crnCommand.setTaskNo(taskNo); // 工作号
        crnCommand.setAckFinish(1);  // 任务完成确认位
        crnCommand.setTaskMode(CrnTaskModeType.NONE.id); // 任务模式
        crnCommand.setTaskMode(CrnTaskModeType.RESET.id); // 任务模式
        crnCommand.setSourcePosX(0);     // 源库位排
        crnCommand.setSourcePosY(0);     // 源库位列
        crnCommand.setSourcePosZ(0);     // 源库位层
@@ -307,27 +308,35 @@
            response = zyCrnConnectDriver.sendCommand(command);
            return response;
        } finally {
            String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
            String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
            BasCrnpOptService bean = SpringUtils.getBean(BasCrnpOptService.class);
            ZyCrnStatusEntity statusEntity = zyCrnConnectDriver.getStatus();
            BasCrnpOpt basCrnpOpt = new BasCrnpOpt(
                    command.getTaskNo().intValue(),
                    command.getCrnNo(),
                    new Date(),
                    String.valueOf(command.getTaskMode()),
                    sourceLocNo,
                    targetLocNo,
                    null,
                    null,
                    null,
                    JSON.toJSONString(command),
                    JSON.toJSONString(statusEntity),
                    1,
                    JSON.toJSONString(response)
            );
            if (bean != null) {
            if (command != null) {
                String sourceLocNo = Utils.getLocNo(command.getSourcePosX(), command.getSourcePosY(), command.getSourcePosZ());
                String targetLocNo = Utils.getLocNo(command.getDestinationPosX(), command.getDestinationPosY(), command.getDestinationPosZ());
                BasCrnpOptService bean = SpringUtils.getBean(BasCrnpOptService.class);
                ZyCrnStatusEntity statusEntity = zyCrnConnectDriver.getStatus();
                BasCrnpOpt basCrnpOpt = new BasCrnpOpt(
                        command.getTaskNo(),
                        command.getCrnNo(),
                        new Date(),
                        String.valueOf(command.getTaskMode()),
                        sourceLocNo,
                        targetLocNo,
                        null,
                        null,
                        null,
                        JSON.toJSONString(command),
                        JSON.toJSONString(statusEntity),
                        1,
                        JSON.toJSONString(response)
                );
                bean.save(basCrnpOpt);
                try {
                    WrkCommandRollbackService rollbackService = SpringUtils.getBean(WrkCommandRollbackService.class);
                    if (rollbackService != null) {
                        rollbackService.handleSingleCrnSendResult(command, response, "单工位堆垛机");
                    }
                } catch (Exception e) {
                    log.error("处理单工位命令下发结果失败, wrkNo={}", command.getTaskNo(), e);
                }
            }
        }
    }