*

L

6 天以前 e4a7d5239f176c5cf5ba95b52c88366908d2ecfa

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

@@ -2,10 +2,7 @@

import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.SnowflakeIdWorker;
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.*;
@@ -80,6 +77,8 @@
    private StaDescService staDescService;
    @Autowired
    private LocMastService locMastService;
    @Autowired
    private RgvOneSignService rgvOneSignService;

    @Override
    @Transactional
@@ -725,12 +724,13 @@
            }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：净重 weight为空");
            }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：毛重 roughWeight");
                throw new CoolException("规格："+matList.getMatnr()+"、参数：毛重 roughWeight为空");
            }else if (Cools.isEmpty(matList.getRollExtent()) || matList.getRollExtent().equals(0D)){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷长度 rollExtent");
            }else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：接头数 joint");
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷长度 rollExtent为空");
            }
//            else if (Cools.isEmpty(matList.getJoint()) || matList.getJoint()==0){
//                throw new CoolException("规格："+matList.getMatnr()+"、参数：接头数 joint");
//            }

            if (matList.getPosition().equals("1")){//1、左  2、右
                if (!matnrOne.equals("")){
@@ -802,12 +802,24 @@
            waitPakin.sync(mat);
            waitPakin.setBatch(matList.getBatch());       //木箱编码  //批次  唯一值  箱号
            waitPakin.setModel(matList.getModel());       //卷号  唯一值
            waitPakin.setBrand(param.getBoxType());     //木箱类型
            String boxType = param.getBoxType();
            try{
                BasBoxTypeService basBoxTypeService = SpringUtils.getBean(BasBoxTypeService.class);
                BasBoxType basBoxType = basBoxTypeService.selectOne(new EntityWrapper<BasBoxType>().eq("box_specs", boxType));
                if (!Cools.isEmpty(basBoxType)){
                    boxType = basBoxType.getBoxType();
                }
            } catch (Exception e){

            }
            waitPakin.setBrand(boxType);     //木箱类型
            waitPakin.setZpallet(param.getBarcode());   //托盘码
            waitPakin.setOrigin(matList.getPosition()); //木箱在托盘上的位置
            waitPakin.setWeight(matList.getWeight());  //净重
//            waitPakin.setRoughWeight(matList.getRoughWeight());  //毛重
//            waitPakin.setRollExtent(matList.getRollExtent());   //长度
            waitPakin.setVolume(matList.getRoughWeight());  //毛重
            waitPakin.setPrice(matList.getRollExtent());   //长度
            waitPakin.setSpecs(String.valueOf(matList.getJoint()));   //接头
            waitPakin.setDanger(matList.getQualified());   //待判
            waitPakin.setIoStatus("N");     // 入出状态
            waitPakin.setAnfme(matList.getAnfme());  // 数量
            waitPakin.setStatus("Y");    // 状态
@@ -818,6 +830,11 @@
            if (!waitPakinService.insert(waitPakin)) {
                throw new CoolException("保存入库通知档失败");
            }

            RgvOneSign armNo = rgvOneSignService.selectOne(new EntityWrapper<RgvOneSign>().eq("rgv_one_type","armNo"+param.getPalletizingNo()));
            armNo.setRgvOneSign(1);
            rgvOneSignService.updateById(armNo);

        }

    }
@@ -872,6 +889,17 @@
            throw new CoolException("参数：码垛位编号 palletizingNo为空");
        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
            throw new CoolException("参数：物料明细 matLists为空");
        }

        if (Cools.isEmpty(param.getBarcode())){
            throw new CoolException("参数：托盘码 barcode为空");
        }
        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

        ArrayList<WrkDetl> wrkDetlsNew = new ArrayList<>();
@@ -956,8 +984,11 @@
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

        wrkMastMatrix.setSheetNo("2");
        wrkMastMatrix.setSheetNo("3");
        if (!wrkMastService.updateById(wrkMastMatrix)){
            throw new CoolException("更新工作档失败==》桁架上位软件：单托拆垛完成通知");
        }