#

TQS

2023-06-21 60823e04a8fdc9a164cbb428f7feceff07965704

#

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

@@ -993,18 +993,22 @@
                                    }

                                }
                            } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
                                News.error("库位出库到堆垛机站 ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", shallowLoc.getLocNo());
//                            } else if (shallowLoc.getLocSts().equals("Q") || shallowLoc.getLocSts().equals("S")) {
//                                News.error("库位出库到堆垛机站 ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", shallowLoc.getLocNo());
//                                flag = true;
//                                break;
                            } else if (shallowLoc.getLocSts().equals("R") || shallowLoc.getLocSts().equals("P")) {
                                News.error("库位出库到堆垛机站 ===>> 库位状态在库，但是浅库位已存在工作档任务！出库库位={},浅库位号={}", shallowLoc.getLocNo());
                                flag = true;
                                break;
                            }

                            //20230307 ADD，再加一次判断，当浅库位状态不为O时，不执行当前出库任务
                            if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
                                News.error("做了浅库位阻塞处理后反复判断，浅库位状态不为O ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
                                flag = true;
                                break;
                            }
//                            //20230307 ADD，再加一次判断，当浅库位状态不为O时，不执行当前出库任务
//                            if (shallowLoc != null && !shallowLoc.getLocSts().equals("O")) {
//                                News.error("做了浅库位阻塞处理后反复判断，浅库位状态不为O ===>> 浅库位库位状态为入库预约！出库库位={},浅库位号={}", wrkMast.getSourceLocNo(), shallowLoc.getLocNo());
//                                flag = true;
//                                break;
//                            }
                        }
                    }
                }
@@ -1194,6 +1198,10 @@
                    }
                    // 堆垛机搬运小车
                    if (wrkMast.getWrkSts() == 3L) {
                        if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0){
                            News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
                            return false;
                        }
                        this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
                    }
                }
@@ -1324,7 +1332,7 @@
                                        if(wrkMast.getIoPri()>=9000.0){
                                            wrkMast.setIoPri(9999d);
                                        }else if (wrkMast.getIoPri()>20.0){
                                            wrkMast.setIoPri(waitWrkMast.getIoPri()-10.0);
                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
                                        }else {
                                            wrkMast.setIoPri(13.0d);
                                        }
@@ -1568,6 +1576,10 @@
                        }
                        // 堆垛机搬运小车
                        if (wrkMast.getWrkSts() == 12L) {
                            if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0) {
                                News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
                                return false;
                            }
                            this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
                        }
                    }
@@ -2466,6 +2478,10 @@
                }
                // 堆垛机搬运小车
                if (wrkMast.getWrkSts() == 12L) {
                    if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0) {
                        News.error("工作号={}即将开始搬运小车但是工作档没有小车号",wrkMast.getWrkNo());
                        return;
                    }
                    this.carMoveIn(wrkMast, wrkMast.getSteNo(), crnProtocol);
                }
            }
@@ -3410,6 +3426,10 @@
                    switch (wrkMast.getWrkSts().intValue()) {
                        case 2:
                            // 修改工作档状态 2.设备上走 => 3.小车待搬
                            if (Cools.isEmpty(wrkMast.getSteNo()) || wrkMast.getSteNo()==0){
                                News.error("修改工作档状态 2.设备上走 => 3.小车待搬 失败！！，工作号={}   原因：工作号没小车", wrkMast.getWrkNo());
                                break;
                            }
                            wrkMast.setWrkSts(3L);
                            wrkMast.setModiTime(now);
                            if (wrkMastMapper.updateById(wrkMast) == 0) {
@@ -4338,7 +4358,7 @@
                    || Utils.getBay(one.getLocNo()) != Utils.getBay(shallowLoc.getLocNo())
                    || Utils.getLev(one.getLocNo()) != Utils.getLev(shallowLoc.getLocNo())){

                    Integer steNo = this.hasCarOfIdle(one.getLocNo());
                    Integer steNo = this.hasCar(one.getLocNo());
                    if (steNo != null) {
                        //有小车
                        continue;

 src/main/java/com/zy/asrs/utils/Utils.java

@@ -604,7 +604,8 @@
            for (LocMast mast : insideLocMast) {
                if (!mast.getLocSts().equals("D")
                        && !mast.getLocSts().equals("F")
                        && !mast.getLocSts().equals("X")) {
                        && !mast.getLocSts().equals("X")
                && !mast.getLocSts().equals("O")) {
                    //D、F、X(不能选定这个外侧库位)
                    return true;
                }

 src/main/resources/mapper/WrkMastMapper.xml

@@ -250,7 +250,7 @@
        select top 1 *
        from dbo.asr_loc_mast
        where 1=1
        and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X'
        and loc_sts!='F' and loc_sts!='D' and loc_sts != 'X' and loc_sts != 'O'
        and bay1 = #{bay}
        and lev1 = #{lev}
        <if test="row &lt;= 3">