*

lsh

2025-04-28 aede5c5c19740a9903dfe2873caaacc10eebda66

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

@@ -14,11 +14,13 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.CrnThread;
import com.zy.core.cache.RgvStatusCache;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
import com.zy.core.model.CrnSlave;
import com.zy.core.model.RgvSlave;
import com.zy.core.model.protocol.CrnProtocol;
import com.zy.core.model.protocol.RgvProtocol;
import com.zy.core.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +57,10 @@
    private StaDescService staDescService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private BasRgvErrService basRgvErrService;
    @Autowired
    private BasCrnErrorServiceImpl basCrnErrorService;

    @Value("${wms.url}")
    private String wmsUrl;
@@ -64,8 +70,6 @@
    public static final ArrayList<String> APP_KEY_LIST = new ArrayList<String>() {{
        add("ea1f0459efc02a79f046f982767939ae");
    }};
    @Autowired
    private BasCrnErrorServiceImpl basCrnErrorService;

    //agv任务完成
    @PostMapping("/toAgvTaskOver")
@@ -476,7 +480,16 @@
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        List<Object> list = new ArrayList<>();
        for (BasDevp basDevp:basDevps){
            list.add(basDevp);
            BasDevpWmsParam basDevpWmsParam = new BasDevpWmsParam();
            basDevpWmsParam.setDevNo(basDevp.getDevNo());
            basDevpWmsParam.setWrkNo(basDevp.getWrkNo().longValue());
            basDevpWmsParam.setAutoing(basDevp.getAutoing());
            basDevpWmsParam.setLoading(basDevp.getLoading());
            basDevpWmsParam.setInEnable(basDevp.getInEnable());
            basDevpWmsParam.setOutEnable(basDevp.getOutEnable());
            basDevpWmsParam.setDevErr(basDevp.getStaErr().longValue());
            basDevpWmsParam.setDevErrM(basDevpWmsParam.getDevErr$());
            list.add(basDevpWmsParam);
        }
        List<BasCrnpWmsParam> basCrnpWmsParamList = new ArrayList<>();
        for (CrnSlave crn : slaveProperties.getCrn()) {
@@ -495,13 +508,34 @@
            basCrnpWmsParam.setCrnNoH(crnProtocol.getLaneNo());
            basCrnpWmsParamList.add(basCrnpWmsParam);

            BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
            basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            try{
                BasCrnError basCrnError = basCrnErrorService.selectById(basCrnp.getCrnErr());
                basCrnpWmsParam.setCrnErrM(basCrnError.getErrName());
            } catch (Exception e){
                basCrnpWmsParam.setCrnErrM("未知异常");
            }

            list.add(basCrnpWmsParam);
        }
        for (RgvSlave rgvSlave : slaveProperties.getRgv()) {
            RgvProtocol rgvStatus = RgvStatusCache.getRgvStatus(rgvSlave.getId());
            if (Cools.isEmpty(rgvStatus)){
                continue;
            }
            BasRgvWmsParam basRgvWmsParam = new BasRgvWmsParam();
            basRgvWmsParam.setWrkNo(rgvStatus.getTaskNo());
            basRgvWmsParam.setCrnSts(rgvStatus.getStatus().intValue());
            basRgvWmsParam.setStatusType(rgvStatus.getStatusType().desc);
            basRgvWmsParam.setSteNo(rgvSlave.getId());
            basRgvWmsParam.setSteErr(rgvStatus.getAlarm().longValue());
            try{
                BasRgvErr basRgvErr = basRgvErrService.selectById(rgvStatus.getAlarm().longValue());

                basRgvWmsParam.setSteErrM(basRgvErr.getErrName());
            } catch (Exception e){
                basRgvWmsParam.setSteErrM("未知异常");
            }
            list.add(basRgvWmsParam);
        }
//        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
//        for (BasCrnp basCrnp:basCrnps){