#

TQS

2023-09-07 202c135c0544ef438666e63a90e33b148b9a55fa

#

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

@@ -1369,11 +1369,11 @@
                                        }else {
                                            waitWrkMast.setIoPri(9999d);
                                        }
                                        if (wrkMast.getIoPri()>23.0){
                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
                                        }else {
                                            wrkMast.setIoPri(13.0d);
                                        }
//                                        if (wrkMast.getIoPri()>23.0){
//                                            wrkMast.setIoPri(wrkMast.getIoPri()-10.0);
//                                        }else {
                                            wrkMast.setIoPri(15.0d);
//                                        }
                                        if (wrkMastMapper.updateById(wrkMast)==0){
                                            News.error("调整优先级失败");
                                        }
@@ -4409,6 +4409,18 @@
                wrkMast.setIoPri((double) 9999);
                wrkMast.setCrnNo(crn.getId());
                wrkMast.setSourceLocNo(shallowLoc.getLocNo()); // 源库位
                if (shallowLoc.getCrnNo()==1){
                    wrkMast.setStaNo(100);
                    wrkMast.setSourceStaNo(108);
                }else if (shallowLoc.getCrnNo()==2){
                    wrkMast.setStaNo(100);
                    wrkMast.setSourceStaNo(104);
                }else {
                    wrkMast.setStaNo(200);
                    wrkMast.setSourceStaNo(208);
                }


//                wrkMast.setLocNo(loc.getLocNo()); // 目标库位
                wrkMast.setFullPlt("Y"); // 满板
                wrkMast.setPicking("N"); // 拣料

 src/main/java/com/zy/core/enums/CrnStatusType.java

@@ -16,7 +16,7 @@
    WAITING(10, "任务完成等待WCS确认"),
    PAUSE(11, "任务暂停"),
    SOS(99, "报警"),
    UNKNOW(100, "未知"),
    UNKNOW(100, "其他(100)"),
    ;

    public Integer id;