#

yxFwq

2024-07-13 465475865bf545f638f21f4a85f5986a47c552ab

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

@@ -1140,7 +1140,7 @@

        WaitPakin waitPakin = new WaitPakin();
        waitPakin.sync(mat);
//        waitPakin.setBatch(matList.getBatch());       //木箱编码  //批次  唯一值  箱号
        waitPakin.setBatch(param.getBatch());       //木箱编码  //批次  唯一值  箱号
//        waitPakin.setModel(matList.getModel());       //卷号  唯一值
//        waitPakin.setBrand(param.getBoxType());     //木箱类型
        waitPakin.setZpallet(basDevp.getBarcode());   //托盘码
@@ -1180,18 +1180,28 @@
            throw new CoolException("参数：物料重量 wright为空");
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()).eq("color", param.getColor()));
        ArrayList<LocDetl> locDetlArrayList = new ArrayList<>();
        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()));
        if (locDetls.isEmpty()){
            locDetls = new ArrayList<LocDetl>();
        }
        if (locDetls.isEmpty()){
        for (LocDetl locDetl:locDetls){
            LocMast locMast = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", locDetl.getLocNo()));
            if (locMast.getLocSts().equals("F")){
                locDetlArrayList.add(locDetl);
                break;
            }
        }
        if (locDetlArrayList.isEmpty()){
            throw new CoolException("未找到符合条件的物料明细：品号==》matnr:"+param.getMatnr()+"；重量==》wright:"+param.getWeight()+"；颜色==》color:"+param.getColor());
        }
        for (LocDetl locDetl : locDetls){
        for (LocDetl locDetl : locDetlArrayList){
            StockOutParam stockOutParam = new StockOutParam(param,locDetl);
            workService.startupFullTakeStore(stockOutParam, userId);
            return;
        }
    }

    public void smallContainersJar(SmallCompleteParam param) {
        Long userId = 7777L;//mes
        //判断param参数
@@ -1360,5 +1370,18 @@

    }

    public Integer getStaEnd(Integer staNo){
        switch (staNo){
            case 118:
            case 119:
                return 131;
            case 120:
            case 121:
                return 135;
            default:
                return staNo;
        }
    }

    /*...........................亳州煜星..............以上.............亳州煜星...........................*/
}