初始化

dubin

3 天以前 e2aa3f9c79ae688a56ea3bb5bc96ba1600f215de

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

@@ -14,6 +14,7 @@
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import com.zy.core.model.DevpSlave;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -129,7 +130,7 @@
                        .eq("stn_no",param.getTerminalNo()));
                if(Cools.isEmpty(staDesc)){
                    map.put("ReturnStatus",1);
                    map.put("ErrorMessage","出库路劲不存在！");
                    map.put("ErrorMessage","出库路径不存在！");
                    return map;
                }
                r = openService.taskCreate(new TaskCreateParam(param,staDesc.getCrnNo()));
@@ -221,6 +222,7 @@
        HashMap<String,Object> map=new HashMap<>();
        List<CrnStatusParam> crnStatusParams=new ArrayList<>();
        List<BasCrnp> basCrnps = basCrnpService.selectList(new EntityWrapper<>());
        List<BasDevp> basDevps = basDevpService.selectList(new EntityWrapper<>());
        for (BasCrnp basCrnp:basCrnps){
            CrnStatusParam crnStatusParam=new CrnStatusParam();
            crnStatusParam.setCrnNo(basCrnp.getCrnNo());
@@ -234,7 +236,19 @@
            }
            crnStatusParams.add(crnStatusParam);
        }

        for (BasDevp basDevp : basDevps) {
            CrnStatusParam crnStatusParam=new CrnStatusParam();
            crnStatusParam.setDevpNo(basDevp.getDevNo());
            crnStatusParam.setOutEnable(basDevp.getOutEnable());
            crnStatusParam.setInEnable(basDevp.getInEnable());
            crnStatusParam.setLoading(basDevp.getLoading());
            if(!Cools.isEmpty(basDevp.getAutoing())&&basDevp.getAutoing().equals("Y")){
                crnStatusParam.setCrnSts(3);
            }else{
                crnStatusParam.setCrnSts(2);
            }
            crnStatusParams.add(crnStatusParam);
        }
        map.put("ReturnStatus",0);
        map.put("ErrorMessage","");
        map.put("data",crnStatusParams);