#1

rqdz

21 小时以前 63917bb21dd70466ec9f2b2f340d477257497965

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

@@ -123,7 +123,7 @@
    @Transactional
    public StartupDto getLocNo(Integer whsType, Integer staDescId, Integer sourceStaNo, String matnr, String batch, String grade, LocTypeDto locTypeDto) {
         whsType = Utils.GetWhsType(sourceStaNo);
        return getLocNo(whsType,staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
        return getLocNo(whsType, staDescId,sourceStaNo,matnr,batch,grade,0,locTypeDto,0);
    }

    /**
@@ -320,7 +320,25 @@

        // 1.按规则查找库位
        if (Cools.isEmpty(locMast) && crnNo != 0) {
            List<LocMast> locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow).eq("loc_sts", "O"));
            List<LocMast> locMasts = new ArrayList<>();
            locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow)
                    .eq("loc_sts", "O")
                    .eq("loc_type1",locTypeDto.getLocType1()));
            if (Cools.isEmpty(locMasts) || locMasts.size() <= 5){
                if (nearRow == 2){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow + 1)
                            .eq("loc_sts", "O")
                            .eq("loc_type1",locTypeDto.getLocType1()));
                }else if (nearRow == 3){
                    locMasts = locMastService.selectList(new EntityWrapper<LocMast>().eq("row1", nearRow - 1)
                            .eq("loc_sts", "O")
                            .eq("loc_type1",locTypeDto.getLocType1()));

                }
            }
            if (locMasts.size() <= 5){
                throw new CoolException("无空库位可用");
            }
            for (LocMast locMast1 : locMasts) {
//                if (!VersionUtils.locMoveCheckLocTypeComplete(locMast1, locTypeDto)) {
//                    continue;