#

zjj

2 天以前 fccf8364364c36d15de26aa699f91228a74b6e10

#

 src/main/java/com/zy/asrs/service/BasRgvErrService.java

@@ -5,4 +5,5 @@

public interface BasRgvErrService extends IService<BasRgvErr> {

    BasRgvErr findLatest(int i);
}

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

@@ -9,4 +9,8 @@
@Service("basRgvErrService")
public class BasRgvErrServiceImpl extends ServiceImpl<BasRgvErrMapper, BasRgvErr> implements BasRgvErrService {

    @Override
    public BasRgvErr findLatest(int i) {
        return null;
    }
}

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

@@ -21,6 +21,7 @@
import com.zy.common.utils.HttpHandler;
import com.zy.core.CrnThread;
import com.zy.core.DevpThread;
import com.zy.core.RgvThread;
import com.zy.core.cache.MessageQueue;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.*;
@@ -66,6 +67,12 @@
    private FillingMastService fillingMastService;
    @Autowired
    private VacuumMastService vacuumMastService;
    @Autowired
    private BasErrLogService basErrLogService;
    @Autowired
    private WrkMastStaService wrkMastStaService;
    @Autowired
    private BasRgvErrService basRgvErrService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -547,6 +554,130 @@
        }
    }

    public synchronized void recCrnErr() {
        Date now = new Date();

            // 获取堆垛机信息
            SiemensRgvThread rgvThread = (SiemensRgvThread) SlaveConnection.get(SlaveType.Rgv, 1);
            RgvProtocol rgvProtocol = rgvThread.getRgvProtocol();
            if (rgvProtocol == null) {
                return;
            }
            if (true) {
//            if (crnProtocol.getModeType() != CrnModeType.STOP) {
                // 有任务
                if (rgvProtocol.getTaskNo1() != 0) {

                    BasErrLog latest = basErrLogService.findLatestByTaskNo(1, rgvProtocol.getTaskNo1());
                    // 有异常
                    if (latest == null) {
                        if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {
                            WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
                                    .setSqlSelect("TOP 1 wrk_no as wrkNo , wrk_sts as wrkSts,wrk_start as wrkStart,wrk_end as wrkEnd, create_time as createTime")
                                    .eq("wrk_No", rgvProtocol.getTaskNo1())
                                    .orderBy("create_time", false)

                            );
                            if (wrkMastSta == null) {
                               return;
                            }
                            BasRgvErr rgvErr = basRgvErrService.selectById(rgvProtocol.getAlarm());
                            String errName = rgvErr == null ? String.valueOf(rgvProtocol.getAlarm()) : rgvErr.getErrName();
                            BasErrLog basErrLog = new BasErrLog(
                                    null,    // 编号
                                    wrkMastSta.getWrkNo().intValue(),    // 工作号
                                    now,    // 发生时间
                                    null,    // 结束时间
                                    wrkMastSta.getWrkSts().longValue(),    // 工作状态
                                    wrkMastSta.getType(),    // 入出库类型
                                    1,    // 堆垛机
                                    null,    // plc
                                    null,    // 目标库位
                                    wrkMastSta.getWrkEnd(),    // 目标站
                                    wrkMastSta.getWrkEnd(),    // 源站
                                    null,    // 源库位
                                    null,    // 条码
                                    (int) rgvProtocol.getAlarm(),    // 异常码
                                    errName,    // 异常
                                    1,    // 异常情况
                                    now,    // 添加时间
                                    null,    // 添加人员
                                    now,    // 修改时间
                                    null,    // 修改人员
                                    "任务中异常"    // 备注
                            );
                            if (!basErrLogService.insert(basErrLog)) {

                            }
                        }
                    } else {
                        // 异常修复
                        if (rgvProtocol.getAlarm() == null || rgvProtocol.getAlarm() == 0) {
                            latest.setEndTime(now);
                            latest.setUpdateTime(now);
                            latest.setStatus(2);
                            if (!basErrLogService.updateById(latest)) {

                            }
                        }
                    }
                    // 无任务
                } else {
                    BasErrLog latest = basErrLogService.findLatest(1);

                    // 有异常
                    if (rgvProtocol.getAlarm() != null && rgvProtocol.getAlarm() > 0) {

                        // 记录新异常
                        if (latest == null || (latest.getErrCode() != rgvProtocol.getAlarm().intValue())) {
                            BasRgvErr rgvErr = basRgvErrService.selectById(rgvProtocol.getAlarm());
                            String errName = rgvErr == null ? String.valueOf(rgvProtocol.getAlarm()) : rgvErr.getErrName();
                            BasErrLog basErrLog = new BasErrLog(
                                    null,    // 编号
                                    null,    // 工作号
                                    now,    // 发生时间
                                    null,    // 结束时间
                                    null,    // 工作状态
                                    null,    // 入出库类型
                                    1,    // 堆垛机
                                    null,    // plc
                                    null,    // 目标库位
                                    null,    // 目标站
                                    null,    // 源站
                                    null,    // 源库位
                                    null,    // 条码
                                    (int) rgvProtocol.getAlarm(),    // 异常码
                                    errName,    // 异常
                                    1,    // 异常情况
                                    now,    // 添加时间
                                    null,    // 添加人员
                                    now,    // 修改时间
                                    null,    // 修改人员
                                    "无任务异常"    // 备注
                            );
                            if (!basErrLogService.insert(basErrLog)) {

                            }
                        }
                        // 无异常
                    } else {
                        // 异常修复
                        if (latest != null && latest.getStatus() == 1) {
                            latest.setEndTime(now);
                            latest.setUpdateTime(now);
                            latest.setStatus(2);
                            if (!basErrLogService.updateById(latest)) {

                            }
                        }
                    }
                }
            }


//        News.infoNoLog(""+mark+" - 0"+" - 堆垛机异常信息记录执行完成");
    }



}

 src/main/java/com/zy/core/MainProcess.java

@@ -43,14 +43,16 @@
                        continue;
                    }
                    // 演示
//                    mainService.getRgvTask();
//                    mainService.RGVDemoShow0();
//                    mainService.RGVDemoShow1();
//                    mainService.RGVDemoShow2();
                    //任务生成
//                    mainService.DevpTaskAndPut();
//                    //执行小车货物搬运任务
//                    mainService.rgvRunWrkMastFullSta();
                    mainService.getRgvTask();
                    mainService.RGVDemoShow0();
                    mainService.RGVDemoShow1();
                    mainService.RGVDemoShow2();
//                    任务生成
                    mainService.DevpTaskAndPut();
                    //执行小车货物搬运任务
                    mainService.rgvRunWrkMastFullSta();

                    mainService.recCrnErr();




 src/main/resources/license.lic

Binary files differ