#

lsh

2024-04-15 5fbba91d04be40f7b1438806ff8973dcb0aeb69c

#

 src/main/java/com/zy/asrs/entity/BasDevp.java

@@ -70,6 +70,13 @@
    private String loading;

    /**
     * 有物
     */
    @ApiModelProperty(value= "超级有物")
    @TableField("loading_super")
    private String loadingSuper;

    /**
     * 能入
     */
    @ApiModelProperty(value= "能入")

 src/main/java/com/zy/asrs/task/BareBoardScheduler.java

@@ -40,7 +40,7 @@
        Config config = configService.selectOne(new EntityWrapper<Config>().eq("code","bareBoard"));
        if (!Cools.isEmpty(config) && !Cools.isEmpty(config.getValue()) && config.getValue().equals("Y")){
            BasDevp basDevp = basDevpService.selectById(213);
            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoading().equals("N") && basDevp.getReportSign()==0){
            if (!Cools.isEmpty(basDevp) && basDevp.getWrkNo()==0 && basDevp.getAutoing().equals("Y") && basDevp.getLoadingSuper().equals("N") && basDevp.getLoading().equals("N") && basDevp.getReportSign()==0){
                bareBoardHandler.start(213);
            }
        }
@@ -55,7 +55,7 @@
                    .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 2));
            List<WrkMastSta> wrkMastStaList = wrkMastStaService.selectList(new EntityWrapper<WrkMastSta>()
                    .eq("type", 2).eq("wrk_sts", 0).eq("wrk_type", 1));
            if (Cools.isEmpty(wrkMastStas) || wrkMastStas.size()==0 || !Cools.isEmpty(wrkMastStaList) || wrkMastStaList.size()!=0){
            if (Cools.isEmpty(wrkMastStas) || wrkMastStas.isEmpty() || !Cools.isEmpty(wrkMastStaList) || !wrkMastStaList.isEmpty()){
                sign=false;
            }
            RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));

 src/main/java/com/zy/asrs/task/WrkMastStaInItScheduler.java

@@ -69,6 +69,11 @@
            try{
                BasDevp basDevp = basDevpService.selectById(staNo);
                if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                    if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                        if (!basDevp.getLoadingSuper().equals("Y")){
                            continue;
                        }
                    }
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                    if(Cools.isEmpty(wrkMast)){
                        continue;
@@ -111,7 +116,7 @@
        for(Integer staNo : STA_WORK_RU){
            try{
                BasDevp basDevp = basDevpService.selectById(staNo);
                if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getLoadingSuper().equals("Y") && basDevp.getAutoing().equals("Y")){
                    WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                    if (Cools.isEmpty(wrkMast)){
                        continue;
@@ -145,6 +150,11 @@
                try{
                    BasDevp basDevp = basDevpService.selectById(staNo);
                    if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                        if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                            if (!basDevp.getLoadingSuper().equals("Y")){
                                continue;
                            }
                        }
                        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                        if(Cools.isEmpty(wrkMast)){
                            continue;
@@ -170,6 +180,11 @@
                        if (!basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0){
                            continue;
                        }
                        if (basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
                            if (basDevpEnd.getLoadingSuper().equals("Y")){
                                continue;
                            }
                        }
                        if (wrkMast.getStaNo()==118 || wrkMast.getStaNo()==119){
                            RgvOneSign rgvOneSign = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","oneSign"));
                            if (rgvOneSign.getRgvOneSign()==1){
@@ -178,7 +193,7 @@
                        }
                        if (wrkMast.getIoType()!=101){
                            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                            if (wrkDetls.size()!=0){
                            if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
                                String origin = wrkDetls.get(0).getOrigin();
                                if (origin.equals("1")){
                                    if (!STA_WORK_CU_CAR_FOUR.contains(wrkMast.getStaNo())){
@@ -216,6 +231,11 @@
                try{
                    BasDevp basDevp = basDevpService.selectById(staNo);
                    if (basDevp.getWrkNo()!=0 && basDevp.getLoading().equals("Y") && basDevp.getAutoing().equals("Y")){
                        if (basDevp.getDevNo()>117 && basDevp.getDevNo()<124){
                            if (!basDevp.getLoadingSuper().equals("Y")){
                                continue;
                            }
                        }
                        List<Integer> STA_WORK_CU_CAR_NOW = STA_WORK_CU_CAR;
                        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
                        if(Cools.isEmpty(wrkMast)){
@@ -235,7 +255,7 @@
                        boolean sign = false;
                        if (wrkMast.getIoType()!=101){
                            List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNo(wrkMast.getWrkNo());
                            if (wrkDetls.size()!=0){
                            if (!Cools.isEmpty(wrkDetls) && !wrkDetls.isEmpty()){
                                origin = wrkDetls.get(0).getOrigin();
                                if (origin.equals("1")){
                                    if (!STA_WORK_CU_CAR_FOUR.contains(wrkMastStaNo)){
@@ -265,11 +285,22 @@
                        }

                        BasDevp basDevpEnd = basDevpService.selectById(wrkMastStaNo);
                        if (Cools.isEmpty(basDevpEnd)){
                            sign = true;
                        }
                        if (!sign && basDevpEnd.getDevNo()>117 && basDevpEnd.getDevNo()<124){
                            if (basDevpEnd.getLoadingSuper().equals("Y")){
                                sign = true;
                            }
                        }
                        if (sign || !basDevpEnd.getAutoing().equals("Y") || basDevpEnd.getWrkNo()!=0 || basDevpEnd.getLoading().equals("Y") || basDevpEnd.getReportSign()!=0) {
                            for (Integer staNoOther : STA_WORK_CU_CAR_NOW) {
                                if (staNoOther.equals(wrkMastStaNo)) continue;

                                if (sign){
                                    if (Cools.isEmpty(origin)){
                                        continue;
                                    }
                                    if (origin.equals("1")){
                                        if (!STA_WORK_CU_CAR_FOUR.contains(staNoOther)){
                                            continue;
@@ -289,6 +320,11 @@
                                if (!basDevpOther.getAutoing().equals("Y") || basDevpOther.getWrkNo()!=0 || basDevpOther.getLoading().equals("Y") || basDevpOther.getReportSign()!=0) {
                                    continue;
                                }
                                if (basDevpOther.getDevNo()>117 && basDevpOther.getDevNo()<124){
                                    if (basDevpOther.getLoadingSuper().equals("Y")){
                                        continue;
                                    }
                                }
                                wrkMast.setStaNo(staNoOther);
                                wrkMastService.updateById(wrkMast);
                                log.info("工作号"+wrkMast.getWrkNo()+"修改目标站为:"+staNoOther+";原目标站为:"+wrkMastStaNo);

 src/main/resources/mapper/BasDevpMapper.xml

@@ -43,6 +43,7 @@
        <result column="cart_pos" property="cartPos" />
        <result column="report_sign" property="reportSign" />
        <result column="empty_mk" property="emptyMk" />
        <result column="loading_super" property="loadingSuper" />

    </resultMap>