#

luxiaotao1123

2020-08-14 3008cbf144bd6f4cf80dcef9cf8246a31c3d8bc1

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

@@ -6,6 +6,10 @@
import com.zy.asrs.domain.enums.SiteStatusType;
import com.zy.asrs.domain.param.SystemSwitchParam;
import com.zy.asrs.domain.vo.*;
import com.zy.asrs.entity.BasDevp;
import com.zy.asrs.entity.WrkMast;
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.WrkMastService;
import com.zy.common.CodeRes;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.enums.SlaveType;
@@ -33,6 +37,10 @@

    @Autowired
    private SlaveProperties slaveProperties;
    @Autowired
    private WrkMastService wrkMastService;
    @Autowired
    private BasDevpService basDevpService;

    public static AtomicInteger integer = new AtomicInteger();

@@ -59,62 +67,6 @@
        Thread.sleep(2000L);
        SystemProperties.WCS_RUNNING_STATUS.set(param.getOperatorType()==1?Boolean.TRUE:Boolean.FALSE);
        return R.ok().add(Cools.add("status", SystemProperties.WCS_RUNNING_STATUS.get()));
    }

    @PostMapping("/site/detail")
    @ManagerAuth(memo = "输送设备数据详情")
    public R siteDetail(@RequestParam String siteId){
        if (Cools.isEmpty(siteId)){
            return R.parse(CodeRes.EMPTY);
        }
        SiteDetailVo vo = new SiteDetailVo();
        vo.setDevpNo(siteId);
        vo.setWorkNo("9998");
        vo.setWorkStatus("2.设备上移动");
        vo.setAutoing("Y");
        vo.setLoading("Y");
        vo.setCanining("N");
        vo.setCanouting("Y");
        vo.setIoType("1.入库");
        vo.setSourceStaNo("2303");
        vo.setStaNo("2410");
        vo.setSourceStock("");
        vo.setStock("");
        return R.ok().add(vo);
    }

    @PostMapping("/crn/detail")
    @ManagerAuth(memo = "堆垛机设备数据详情")
    public R crnDetail(@RequestParam String crnNo){
        if (Cools.isEmpty(crnNo)){
            return R.parse(CodeRes.EMPTY);
        }
        CrnDetailVo vo = new CrnDetailVo();
        vo.setCrnNo(crnNo);
        vo.setWorkNo("3387");
        vo.setSourceStaNo("2303");
        vo.setStaNo("2410");
        vo.setWorkStatus("3.吊车入库中");
        vo.setIoType("1.入库");
        vo.setSourceStock("");
        vo.setStock("05050040");
        vo.setCrnStatus("取货中");
        vo.setError("0");
        return R.ok().add(vo);
    }

    @Deprecated
    @PostMapping("/site/update")
    @ManagerAuth(memo = "输送设备数据修改")
    public R updateSite(){
        return R.ok();
    }

    @Deprecated
    @PostMapping("/crn/update")
    @ManagerAuth(memo = "堆垛机数据修改")
    public R updateCrn(){
        return R.ok();
    }

    /****************************************************************/
@@ -174,4 +126,88 @@
        return R.ok().add(list);
    }

    /****************************************************************/
    /************************** 详情操作 ******************************/
    /****************************************************************/

    @PostMapping("/site/detail")
    @ManagerAuth(memo = "输送设备数据详情")
    public R siteDetail(@RequestParam Integer siteId){
        if (Cools.isEmpty(siteId)){
            return R.parse(CodeRes.EMPTY);
        }
        SiteDetailVo vo = new SiteDetailVo();
        for (DevpSlave devp : slaveProperties.getDevp()) {
            DevpThread devpThread = (DevpThread) SlaveConnection.get(SlaveType.Devp, devp.getId());
            if (null != devpThread) {
                StaProtocol staProtocol = devpThread.getStation().get(siteId);
                if (staProtocol != null) {
                    BasDevp basDevp = basDevpService.selectById(siteId);
                    if (basDevp == null) {
                        return R.error("数据库维护异常");
                    }

                    vo.setSiteId(siteId);   // 站点编号
                    vo.setWorkNo(staProtocol.getWorkNo());   // 工作号

                    if (staProtocol.getWorkNo() > 0) {
                        WrkMast wrkMast = wrkMastService.selectById(staProtocol.getWorkNo());
                        if (wrkMast != null) {
                            vo.setWrkSts(wrkMast.getWrkSts$());   // 工作状态
                            vo.setIoType(wrkMast.getIoType$());   //  入出库类型
                            vo.setSourceStaNo(wrkMast.getSourceStaNo$());
                            vo.setStaNo(wrkMast.getStaNo$());
                            vo.setSourceLocNo(wrkMast.getSourceLocNo$());
                            vo.setLocNo(wrkMast.getLocNo$());
                        }
                    }

                    vo.setAutoing(staProtocol.isAutoing()?"Y":"N"); //  自动
                    vo.setLoading(staProtocol.isLoading()?"Y":"N"); //  有物

                    vo.setCanining(basDevp.getCanining());  //  能入
                    vo.setCanouting(basDevp.getCanouting());    //  能出

                    return R.ok().add(vo);
                }
            }
        }
        return R.error();

    }

    @PostMapping("/crn/detail")
    @ManagerAuth(memo = "堆垛机设备数据详情")
    public R crnDetail(@RequestParam String crnNo){
        if (Cools.isEmpty(crnNo)){
            return R.parse(CodeRes.EMPTY);
        }
        CrnDetailVo vo = new CrnDetailVo();
        vo.setCrnNo(crnNo);
        vo.setWorkNo("3387");
        vo.setSourceStaNo("2303");
        vo.setStaNo("2410");
        vo.setWorkStatus("3.吊车入库中");
        vo.setIoType("1.入库");
        vo.setSourceStock("");
        vo.setStock("05050040");
        vo.setCrnStatus("取货中");
        vo.setError("0");
        return R.ok().add(vo);
    }

    @Deprecated
    @PostMapping("/site/update")
    @ManagerAuth(memo = "输送设备数据修改")
    public R updateSite(){
        return R.ok();
    }

    @Deprecated
    @PostMapping("/crn/update")
    @ManagerAuth(memo = "堆垛机数据修改")
    public R updateCrn(){
        return R.ok();
    }

}