#

yxFwq

2024-07-12 b9e42e18fcc90f53f23fdee06d1ba2caa550f96c

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

@@ -1091,8 +1091,6 @@
            throw new CoolException("参数：物料编码 matnr为空");
        }else if (Cools.isEmpty(param.getWeight())){
            throw new CoolException("参数：物料重量 wright为空");
        }else if (Cools.isEmpty(param.getColor())){
            throw new CoolException("参数：物料颜色 color为空");
        }

        Mat mat = matService.selectByMatnr(param.getMatnr());
@@ -1126,7 +1124,7 @@
        if (Cools.isEmpty(basDevp.getBarcode())){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码==》为空"+basDevp.getBarcode());
        }
        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码："+basDevp.getBarcode());
        }

@@ -1142,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,8 +1178,11 @@
            throw new CoolException("参数：品号 matnr为空");
        }else if (Cools.isEmpty(param.getWeight())){
            throw new CoolException("参数：物料重量 wright为空");
        }else if (Cools.isEmpty(param.getColor())){
            throw new CoolException("参数：物料颜色 color为空");
        }
        if (param.getDevNo()==131){
            param.setDevNo(130);
        } else if (param.getDevNo()==126){
            param.setDevNo(125);
        }

        List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("matnr", param.getMatnr()).eq("weight", param.getWeight()).eq("color", param.getColor()));
@@ -1194,8 +1195,10 @@
        for (LocDetl locDetl : locDetls){
            StockOutParam stockOutParam = new StockOutParam(param,locDetl);
            workService.startupFullTakeStore(stockOutParam, userId);
            return;
        }
    }

    public void smallContainersJar(SmallCompleteParam param) {
        Long userId = 7777L;//mes
        //判断param参数
@@ -1209,10 +1212,7 @@
            throw new CoolException("参数：物料编码 matnr为空");
        }else if (Cools.isEmpty(param.getWeight())){
            throw new CoolException("参数：物料重量 wright为空");
        }else if (Cools.isEmpty(param.getColor())){
            throw new CoolException("参数：物料颜色 color为空");
        }

        Mat mat = matService.selectByMatnr(param.getMatnr());
        if (Cools.isEmpty(mat)) {
//            mat = new Mat();
@@ -1244,7 +1244,7 @@
        if (Cools.isEmpty(basDevp.getBarcode())){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码==》为空"+basDevp.getBarcode());
        }
        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码："+basDevp.getBarcode());
        }

@@ -1297,8 +1297,6 @@
            throw new CoolException("参数：物料编码 matnr为空");
        }else if (Cools.isEmpty(param.getWeight())){
            throw new CoolException("参数：物料重量 wright为空");
        }else if (Cools.isEmpty(param.getColor())){
            throw new CoolException("参数：物料颜色 color为空");
        }

        Mat mat = matService.selectByMatnr(param.getMatnr());
@@ -1321,7 +1319,7 @@
        if (Cools.isEmpty(basDevp.getBarcode())){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码==》为空"+basDevp.getBarcode());
        }
        if (CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
        if (!CodeDetectionUtil.barcodeDetection(basDevp.getBarcode(),8)){
            throw new CoolException("码垛位编号 palletizingNo="+param.getStaNo()+" 所处站点料箱码异常状态；料箱码："+basDevp.getBarcode());
        }

@@ -1339,11 +1337,12 @@
        WrkMast wrkMast = new WrkMast();
        wrkMast.setWrkNo(workNo);
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(51L); // 工作状态：生成入库ID
        wrkMast.setWrkSts(51L); // 工作状态：生成ID
        wrkMast.setIoType(202); // 入出库状态：202.直供产线
        wrkMast.setIoPri(99D); // 优先级
        wrkMast.setSourceStaNo(param.getStaNo());
        wrkMast.setStaNo(param.getDevNo());
        wrkMast.setBarcode(basDevp.getBarcode());
        // 操作人员数据
        wrkMast.setAppeUser(userId);
        wrkMast.setAppeTime(now);
@@ -1358,6 +1357,8 @@
        wrkDetl.setMatnr(param.getMatnr());
        wrkDetl.setAnfme(1D);
        wrkDetl.setWeight(param.getWeight());
        wrkDetl.setBarcode(basDevp.getBarcode());
        wrkDetl.setZpallet(basDevp.getBarcode());
        wrkDetl.setAppeTime(now);
        wrkDetl.setModiTime(now);
        if (!wrkDetlService.insert(wrkDetl)) {