初始化

dubin

1 天以前 dd76858f35bb4fdd76d5976465e9bd96267b0f0b

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

@@ -103,11 +103,16 @@
//        Config outModel = configService.selectConfigByCode("outModel");
//        if (outModel.getValue().equals("Y")) {
//            // 没有到305的出库任务(305的出库任务优先)
//            int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
//                    .eq("sta_no", 305));
//            if (count > 0) {
//                return R.parse("存在305出库任务");
//        int count = wrkMastService.selectCount(new EntityWrapper<WrkMast>().eq("io_type", 101)
//                .eq("sta_no", 305));
//        if (count > 0) {
//            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
//            if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y") && basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000) {
//                log.info("出库转运架到达305");
//                return R.ok("出库转运架到达305");
//            }
//            return R.parse("出库任务执行中");
//        }
//            outModel.setValue("N");
//            configService.updateById(outModel);
//        }
@@ -155,7 +160,9 @@
            waitPakin.setModiTime(now);

            // 源站点状态检测
            BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
            Integer inStaNo = combMat.getInStaNo(); // 入库站点
//            BasDevp sourceStaNo = basDevpService.checkSiteStatus(305, true);
            BasDevp sourceStaNo = basDevpService.checkSiteStatus(inStaNo, true);

            // 长度>3500放宽库位
            sourceStaNo.setLocType2((short) (waitPakin.getLength() > 4600 ? 2 : 1));
@@ -172,7 +179,7 @@
            wrkMast.setIoTime(new Date());
            wrkMast.setWrkSts(1L); // 工作状态：生成入库ID
            wrkMast.setIoType(1); // 入出库状态：1.入库
            wrkMast.setIoPri(13D); // 优先级
            wrkMast.setIoPri(15D); // 优先级
            wrkMast.setCrnNo(dto.getCrnNo());
            wrkMast.setSourceStaNo(dto.getSourceStaNo());
            wrkMast.setStaNo(dto.getStaNo());
@@ -228,7 +235,9 @@
    @Override
    public R agvAskOpen(AgvAskOpenParam param) {
        if (param.getFlag() == 0) { // 出库请求wms开门
            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
            Integer staNo = param.getStaNo(); // 需要开、关门的站点
//            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", staNo));
            if (basDevp.getWrkNo() > 6000 && basDevp.getWrkNo() <= 9000 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")
                    && basDevp.getOutEnable().equals("Y")) { // 出库工作档
                WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
@@ -254,12 +263,12 @@
                return R.error("不满足出库条件");
            }
        } else if(param.getFlag() == 1) { // 入库请求wms开门
            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
//            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", 305));
            BasDevp basDevp = basDevpService.selectOne(new EntityWrapper<BasDevp>().eq("dev_no", param.getStaNo()));
            if (basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("Y")
                    && basDevp.getInEnable().equals("Y")) { // 入库底座
                WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("io_type",1)
                        .eq("source_sta_no",305).lt("wrk_sts",3));
                if (wrkMast.getWhsType() == null) {
                    && basDevp.getInEnable().equals("Y") && basDevp.getWrkNo() <= 3000) { // 入库底座
                WrkMast wrkMast = wrkMastService.selectById(basDevp.getWrkNo());
                if (wrkMast == null || wrkMast.getWhsType() == null) {
                    throw new CoolException("没有入库任务");
                } else if (wrkMast.getWhsType() == 1) {
                    WrkDetl wrkDetl = wrkDetlService.selectOne(new EntityWrapper<WrkDetl>().eq("wrk_no", wrkMast.getWrkNo()));