#

pang.jiabao

2024-07-28 58e3e7fa3263151abde86739b21d6995c8f85ee9

#

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

@@ -175,27 +175,27 @@
        /*
          判断如果是深库位，对应的浅库位不为空则不能出
         */
        for (String locNo : locNos) {
            if (sign) {
                break;
            }
            List<String> groupOuterLoc = Utils.getGroupOuterLocNo(locNo);
            if (!Cools.isEmpty(groupOuterLoc)) {
                for (String outerLoc : groupOuterLoc) {
                    if (locNos.contains(outerLoc)) {
                        continue;
                    }
                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
                    if (locMast != null) {
                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
                            sign = true;
                            tips = "库位号：" + locNo + " 浅库位有非空库位！";
                            break;
                        }
                    }
                }
            }
        }
//        for (String locNo : locNos) {
//            if (sign) {
//                break;
//            }
//            List<String> groupOuterLoc = Utils.getGroupOuterLocNo(locNo);
//            if (!Cools.isEmpty(groupOuterLoc)) {
//                for (String outerLoc : groupOuterLoc) {
//                    if (locNos.contains(outerLoc)) {
//                        continue;
//                    }
//                    LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", outerLoc));
//                    if (locMast != null) {
//                        if (!locMast.getLocSts().equals("O") && !locMast.getLocSts().equals("R")) {
//                            sign = true;
//                            tips = "库位号：" + locNo + " 浅库位有非空库位！";
//                            break;
//                        }
//                    }
//                }
//            }
//        }

        if (sign) {
            throw new CoolException("出库失败；" + tips);

 src/main/java/com/zy/common/model/LocTypeDto.java

@@ -1,6 +1,5 @@
package com.zy.common.model;

import com.alibaba.fastjson.JSON;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasDevp;
import lombok.Data;
@@ -31,7 +30,7 @@
        }
        this.locType2 = basDevp.getLocType2();

        log.info(JSON.toJSONString(this));
//        log.info(JSON.toJSONString(this));
    }

}

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

@@ -271,9 +271,9 @@
//            locMast = locMasts.get(0);
//        }

        if (locMast != null) {
            log.info("-------------：找到了新库位【{}】", locMast.getLocNo());
        }
//        if (locMast != null) {
//            log.info("-------------：找到了新库位【{}】", locMast.getLocNo());
//        }
        return locMast;
    }


 src/main/java/com/zy/common/web/WcsController.java

@@ -84,7 +84,11 @@

        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(param.getSourceStaNo(), true);
        sourceStaNo.setLocType2(param.getLocType1());

        // 长度>3500放宽库位
        if (param.getIoType() == 1) {
            sourceStaNo.setLocType2((short) (waitPakins.get(0).getLength() > 3500 ? 2 : 1));
        }
        LocTypeDto locTypeDto = new LocTypeDto(sourceStaNo);

        StartupDto dto = null;

 src/main/resources/mapper/LocMastMapper.xml

@@ -118,12 +118,12 @@
    <select id="selectLocByWidthToList" resultType="com.zy.asrs.entity.LocMast">
        select loc_no locNo,loc_type2 locType2,crn_no crnNo from asr_loc_mast where loc_sts = 'O' and loc_type2 = #{locType2}
        <choose>
            <when  test="sourceStaNo == 100">
                AND crn_no = 1
            </when >
            <when  test="sourceStaNo == 102">
            <when  test="sourceStaNo == 101">
                AND crn_no = 2
            </when >
            <when  test="sourceStaNo == 103">
                AND crn_no = 1
            </when >
        </choose>
        order by lev1,bay1,row1
    </select>