#

luxiaotao1123

2022-10-24 04bd02d1acaa4715fc7d9b3d31d7769c04b3a31f

#

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

@@ -59,15 +59,16 @@

            if(station.getWrkNo()!=null && station.getWrkNo()>0 && station.getWrkNo() < 9990) {
                WrkMast wrkMast = wrkMastService.selectById(station.getWrkNo());
                if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
                    throw new CoolException(devpNo+"站点已有工作号");
                if (wrkMast != null) {
                    if (wrkMast.getIoType() != 103 && wrkMast.getIoType() != 104 && wrkMast.getIoType() != 107) {
                        throw new CoolException(devpNo+"站点已有工作号");
                    }
                }

            }
//            if(!station.getInEnable().equals("Y")) {
//                throw new CoolException(devpNo+"站点不是可入状态");
//            }
            if(wrkMastService.getWorkingMast(devpNo)>0){
            if(wrkMastService.getWorkingMast(devpNo) > 0){
                throw new CoolException(devpNo+"站点不能同时生成两笔入库工作档");
            }
        }

 src/main/java/com/zy/common/service/CommonService.java

@@ -10,7 +10,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.asrs.utils.VersionUtils;
import com.zy.common.model.LocTypeDto;
import com.zy.common.model.Shelves;
import com.zy.common.model.StartupDto;
import com.zy.common.properties.SlaveProperties;
import lombok.extern.slf4j.Slf4j;
@@ -115,16 +114,15 @@
        int end = 30;
        switch (sourceStaNo) {
            case 107:
                whsType = 2;
                end = 17;
                break;
            case 118:
                whsType = 3;
                start = 18;
                break;
            default:
                whsType = 1;
                break;
            case 118:
                whsType = 2;
                start = 31;
                end = 32;
                break;
            default:
                throw new CoolException("数据异常，请联系管理员");
        }
        // 生成工作号
        int workNo = getWorkNo(0);
@@ -136,7 +134,13 @@
        int sRow = rowLastno.getsRow();          // 起始列
        int eRow = rowLastno.geteRow();          // 终止列
        int crn_qty = rowLastno.getCrnQty();     // 堆垛机数量（巷道数量）
        int rowCount = eRow - sRow + 1;          // 库排总数
        int rowCount;
        if (whsType == 1) {
            rowCount = 2;
        } else {
            rowCount = 1;
        }
//        int rowCount = eRow - sRow + 1;          // 库排总数
        // 目标堆垛机号
        int crnNo = 0;
        // 目标库位
@@ -150,9 +154,15 @@
                if (null != locMast0) {
                    // 浅库位符合尺寸检测
                    if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                        int locCrnNo;
                        if (whsType == 1) {
                            locCrnNo = 2;
                        } else {
                            locCrnNo = 3;
                        }
                        // 浅库位对应堆垛机必须可用且无异常
                        if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                            crnNo = locMast0.getCrnNo();
                        if (basCrnpService.checkSiteError(locCrnNo, true)) {
                            crnNo = locCrnNo;
                            locMast = locMast0;
                            break;
                        }
@@ -171,9 +181,15 @@
                    if (null != locMast0) {
                        // 浅库位符合尺寸检测
                        if (VersionUtils.locMoveCheckLocType(locMast0, locTypeDto)) {
                            int locCrnNo;
                            if (whsType == 1) {
                                locCrnNo = 2;
                            } else {
                                locCrnNo = 3;
                            }
                            // 浅库位对应堆垛机必须可用且无异常
                            if (basCrnpService.checkSiteError(locMast0.getCrnNo(), true)) {
                                crnNo = locMast0.getCrnNo();
                            if (basCrnpService.checkSiteError(locCrnNo, true)) {
                                crnNo = locCrnNo;
                                locMast = locMast0;
                                break;
                            }
@@ -184,21 +200,15 @@
        }

        // 如果没有相近物料，则按规则轮询货架
        if (null == locMast) {
            Shelves shelves = new Shelves(rowCount, crn_qty);
            for (int i = 0; i < shelves.group; i ++) {
                curRow = shelves.start(curRow);
                if (curRow < 0) {
                    throw new CoolException("检索库位失败，请联系管理员");
                }
                Integer crnNo1 = shelves.get(curRow) + 1;
                if (whsType != 1) {
                    crnNo1 = whsType;
                }
                if (basCrnpService.checkSiteError(crnNo1, true)) {
                    crnNo = crnNo1;
                    break;
                }
        if (null == locMast && whsType == 1) {
            if (curRow == 2) {
                curRow = 30;
            } else if (curRow == 30) {
                curRow = 2;
            }
            int crnNo1 = 2;
            if (basCrnpService.checkSiteError(crnNo1, true)) {
               crnNo = crnNo1;
            }
        }


 src/main/resources/mapper/LocMastMapper.xml

@@ -66,7 +66,7 @@
                <if test="locType1 != null">
                    and loc_type1 = #{locType1}
                </if>
                and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')
                /*and loc_no not in ('0100101', '0200101', '0300101', '1200701', '1300701', '1400701', '1900401', '2000401', '2100401')*/
                group by ctn_no
            ) a
            where count = #{rowsLen}