库存上下限预警，物料高低频摆放

pang.jiabao

5 天以前 8407e277e156a55fee38e7bb7b8930ec16a15f0e

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

@@ -9,6 +9,7 @@
import com.zy.asrs.entity.param.EmptyPlateOutParam;
import com.zy.asrs.entity.result.FindLocNoAttributeVo;
import com.zy.asrs.mapper.LocMastMapper;
import com.zy.asrs.mapper.MatMapper;
import com.zy.asrs.service.*;
import com.zy.asrs.utils.Utils;
import com.zy.common.CodeRes;
@@ -29,6 +30,7 @@
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.stream.Collectors;

/**
 * Created by vincent on 2020/10/30
@@ -231,7 +233,7 @@
            rows.add(row[i * 4 + 1]);
            rows.add(row[i * 4 + 2]);
            rows.add(row[i * 4 + 3]);
            dto = commonService.getLocNoNew(1, 0, Integer.valueOf(locTypeDto.getLocType1()),rows);
            dto = commonService.getLocNoNew(1, 0, Integer.valueOf(locTypeDto.getLocType1()),rows,0);
            if (dto != null) {
                break;
            }
@@ -373,6 +375,9 @@
        return R.ok(!Cools.isEmpty(wrkMast) ? R.ok("自动空托出库成功,工作号:" + wrkMast.getWrkNo()) : R.error("生成自动空托出库失败"));
    }

    @Resource
    private MatMapper matMapper;

    /**
     * 全板入库
     */
@@ -380,6 +385,12 @@
    public StartupDto startupFullPutStore(Integer devpNo, String barcode, LocTypeDto locTypeDto, List<WaitPakin> waitPakins, int[] row) {
        // 源站点状态检测
        BasDevp sourceStaNo = basDevpService.checkSiteStatus(devpNo, true);
        /// 判断是否有低频物料
        int sortRole = 0;
        if(!waitPakins.isEmpty()) {
            sortRole = matMapper.selectCount(new EntityWrapper<Mat>().eq("be_batch",1).in("matnr", waitPakins.stream().map(WaitPakin::getMatnr).distinct().collect(Collectors.toList())));
        }

        // 检索库位
//        FindLocNoAttributeVo findLocNoAttributeVo = new FindLocNoAttributeVo(waitPakins.get(0));
//        StartupDto dto = commonService.getLocNo(1, devpNo, findLocNoAttributeVo, locTypeDto);
@@ -396,7 +407,7 @@
//                break;
//            }
//        }
        StartupDto dto = commonService.getLocNoNew(1, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null);;
        StartupDto dto = commonService.getLocNoNew(1, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null,sortRole);;
        if (dto == null) {
            throw new CoolException("没有匹配到库位，检查可用库位/堆垛机报警");
        }
@@ -491,7 +502,7 @@
//                break;
//            }
//        }
        StartupDto dto = commonService.getLocNoNew(10, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null);;
        StartupDto dto = commonService.getLocNoNew(10, devpNo, Integer.valueOf(locTypeDto.getLocType1()),null,0);;
        if (dto == null) {
            throw new CoolException("没有匹配到库位，检查可用库位/堆垛机报警");
        }