堆垛机移库任务等待确认调整

dubin

4 天以前 eddc7010369c735de1c4931a46b9d87a1008ae1e

 src/main/java/com/zy/core/thread/SiemensCrnThread.java

@@ -10,8 +10,10 @@
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasCrnOpt;
import com.zy.asrs.entity.BasCrnp;
import com.zy.asrs.entity.DeviceDataLog;
import com.zy.asrs.service.BasCrnOptService;
import com.zy.asrs.service.BasCrnpService;
import com.zy.asrs.service.DeviceDataLogService;
import com.zy.common.utils.News;
import com.zy.core.CrnThread;
import com.zy.core.cache.MessageQueue;
@@ -27,6 +29,7 @@
import lombok.extern.slf4j.Slf4j;

import java.text.MessageFormat;
import java.util.Base64;
import java.util.Date;

/**
@@ -75,6 +78,7 @@
                    // 写入数据 1号工位
                    case 2:
                        CrnCommand data = (CrnCommand) task.getData();
                        crnProtocol.setLastCommandTime(System.currentTimeMillis());
                        if (data.getPltType() == null || data.getPltType() == 1) {
                            write(data);
                        } else if (data.getPltType() == 2) {
@@ -270,6 +274,22 @@
                    }
                }

                if (System.currentTimeMillis() - crnProtocol.getDeviceDataLog() > 200) {
                    //采集时间超过5s，保存一次数据记录
                    //保存数据记录
                    DeviceDataLogService deviceDataLogService = SpringUtils.getBean(DeviceDataLogService.class);
                    DeviceDataLog deviceDataLog = new DeviceDataLog();
                    deviceDataLog.setOriginData(Base64.getEncoder().encodeToString(result.Content));
                    deviceDataLog.setWcsData(JSON.toJSONString(crnProtocol));
                    deviceDataLog.setType("crn");
                    deviceDataLog.setDeviceNo(crnProtocol.getCrnNo());
                    deviceDataLog.setCreateTime(new Date());
                    deviceDataLogService.insert(deviceDataLog);

                    //更新采集时间
                    crnProtocol.setDeviceDataLog(System.currentTimeMillis());
                }

                try {
                    // 根据实时信息更新数据库
                    BasCrnpService basCrnpService = SpringUtils.getBean(BasCrnpService.class);