#

zjj

2 天以前 8f9fa425d667e3d6330a3ed4553834783bb30099

 src/main/java/com/zy/asrs/controller/RgvController.java

@@ -14,10 +14,12 @@
import com.zy.asrs.entity.BasRgv;
import com.zy.asrs.entity.BasRgvErr;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.entity.WrkMastSta;
import com.zy.asrs.mapper.BasRgvErrMapper;
import com.zy.asrs.service.BasRgvService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
import com.zy.asrs.service.WrkMastStaService;
import com.zy.asrs.service.impl.MainServiceImpl;
import com.zy.core.CrnThread;
import com.zy.core.RgvThread;
@@ -70,6 +72,8 @@
    private MainServiceImpl mainService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private WrkMastStaService wrkMastStaService;
    int wrkNo = 9990;


@@ -441,15 +445,29 @@
            if (rgvProtocol == null) {
                continue;
            }
            if (rgvProtocol.getTaskNo1() != 0){
                WrkMastSta wrkMastSta = wrkMastStaService.selectOne(new EntityWrapper<WrkMastSta>()
                        .setSqlSelect("TOP 1 wrk_no as wrkNo , wrk_sts as wrkSts, create_time as createTime")
                        .eq("wrk_No", rgvProtocol.getTaskNo1())

                        .orderBy("create_time", false)

                );
                if (!Cools.isEmpty(wrkMastSta)){
                    vo.setWrkSts(wrkMastSta.getWrkSts());
                }
            }
            vo.setStatusType(rgvProtocol.modeType.desc);   //  模式状态
            vo.setStatus(rgvProtocol.getStatusType1().desc);     //  状态
            vo.setWorkNo1(rgvProtocol.getTaskNo1());  //  工位1任务号
            vo.setRgvPos(rgvProtocol.getRgvPos());
            vo.setRgvPos(rgvProtocol.getCode());
            vo.setPakMk(rgvThread.isPakMk()?"无锁":"锁定");
            vo.setWalkPos(rgvProtocol.getAlarm() == 0?"正常":"报警");
            vo.setWarnCode(String.valueOf(rgvProtocol.getAlarm()));
//            vo.setStaNo(rgvProtocol.getSouSta().intValue());
//            vo.setSourceStaNo(rgvProtocol.getEndSta().intValue());
            vo.setList32(rgvProtocol.getList32());
            vo.setList33(rgvProtocol.getList33());
            vo.setList34(rgvProtocol.getList34());
            vo.setList35(rgvProtocol.getList35());
            if (rgvProtocol.getAlarm() > 0) {
                BasRgvErr rgvErr = basRgvErrMapper.selectById(rgvProtocol.getAlarm());
                vo.setAlarm(rgvErr==null?"未知异常":rgvErr.getErrName());