*待判接口开发

lsh

7 天以前 f6e17ebcf5e66b590391e13595968b7e05a7f966

 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
@@ -600,9 +599,10 @@
        WrkMast wrkMast = wrkMastService.selectOne(new EntityWrapper<WrkMast>().eq("wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkMast)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务不存在,任务号："+basDevp.getWrkNo());
        }else if (!wrkMast.getWrkSts().equals(52L)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务状态已变更，请勿重复申请,任务号："+basDevp.getWrkNo()+",任务状态:"+wrkMast.getWrkSts$());
        }
//        else if (!wrkMast.getWrkSts().equals(52L)){
//            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务状态已变更，请勿重复申请,任务号："+basDevp.getWrkNo()+",任务状态:"+wrkMast.getWrkSts$());
//        }

        List<WrkDetl> wrkDetls = wrkDetlService.selectList(new EntityWrapper<WrkDetl>().eq("wrk_no", basDevp.getWrkNo()));
        if (Cools.isEmpty(wrkDetls) || wrkDetls.size()==0){
@@ -634,10 +634,10 @@
//        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
//        labellerMatParam.setLabTemplate("1");
//        labellerMatParam.setOrderNo(orderNo);
        wrkMast.setWrkSts(53L);
        if (!wrkMastService.updateById(wrkMast)){
            throw new CoolException("异常，请重新申请");
        }
//        wrkMast.setWrkSts(53L);
//        if (!wrkMastService.updateById(wrkMast)){
//            throw new CoolException("异常，请重新申请");
//        }
        return labellerMatParam;
    }

@@ -694,7 +694,7 @@
     * */
    @Override
    @Transactional
    public void palletizingComplete(PalletizingCompleteParam param) {
    public void PalletizingCompleteTwoFloorParam(PalletizingCompleteTwoFloorParam param) {
        Long userId = 7777L;//中控
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
@@ -703,36 +703,60 @@
            throw new CoolException("参数：码垛位编号 palletizingNo为空");
        }else if (Cools.isEmpty(param.getBoxType())){
            throw new CoolException("参数：木箱类型 boxType为空");
        }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0){
        }else if (Cools.isEmpty(param.getMatList()) || param.getMatList().size()==0){
            throw new CoolException("参数：物料明细 matLists为空");
        }

        ArrayList<String> positions = new ArrayList<>();   //木箱位置查重      (orgin)
        String matnrOne = "";//木箱相同位置 规格 matnr校验  1、左
        String matnrTwo = "";//木箱相同位置 规格 matnr校验  2、右
        ArrayList<String> boxNos = new ArrayList<>();   //木箱唯一编码查重  （batch）
        //判断matLists参数
        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
            if (Cools.isEmpty(matList.getMatnr())){
                throw new CoolException("参数：物料编码 matnr为空");
                throw new CoolException("参数：规格 matnr为空");
            }else if (Cools.isEmpty(matList.getPosition())){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：码垛位置 position为空");
            }else if (Cools.isEmpty(matList.getBoxNo())){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：木箱编号 boxNo为空");
            }else if (Cools.isEmpty(matList.getAnfme()) || matList.getAnfme().equals(0)){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：木箱中铜箔数量 anfme为空");
                throw new CoolException("规格："+matList.getMatnr()+"、参数：码垛位置 position为空");
            }else if (Cools.isEmpty(matList.getBatch())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：木箱编号 batch为空");
            }else if (Cools.isEmpty(matList.getModel())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：卷号 model为空");
            }else if (Cools.isEmpty(matList.getBatch())){
                throw new CoolException("规格："+matList.getMatnr()+"、参数：木箱编号 boxNo为空");
            }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：重量 weight为空");
                throw new CoolException("规格："+matList.getMatnr()+"、参数：净重 weight为空");
            }else if (Cools.isEmpty(matList.getRoughWeight()) || matList.getRoughWeight().equals(0D)){
                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");
//            }

            if (matList.getPosition().equals("1")){//1、左  2、右
                if (!matnrOne.equals("")){
                    if (!matnrOne.equals(matList.getMatnr())){
                        throw new CoolException("木箱位置："+matList.getPosition()+"存在不同规格卷信息");
                    }
                }else {
                    matnrOne=matList.getMatnr();
                }
            }else if (matList.getPosition().equals("2")){
                if (!matnrTwo.equals("")){
                    if (!matnrTwo.equals(matList.getMatnr())){
                        throw new CoolException("木箱位置："+matList.getPosition()+"存在不同规格卷信息");
                    }
                }else {
                    matnrTwo=matList.getMatnr();
                }
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBatch()+",木箱位置错误："+matList.getPosition());
            }

            if (!positions.contains(matList.getPosition())){
                positions.add(matList.getPosition());
            if (!boxNos.contains(matList.getBatch())){
                boxNos.add(matList.getBatch());
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+",木箱位置存在重复："+matList.getPosition());
            }

            if (!boxNos.contains(matList.getBoxNo())){
                boxNos.add(matList.getBoxNo());
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+",木箱编码存在重复");
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBatch()+",木箱编码存在重复");
            }
        }

@@ -757,42 +781,75 @@
            throw new CoolException("托盘条码："+param.getBarcode()+"已存在，请勿重复组托");
        }

        try{
            int rgvOneType = rgvOneSignService.selectCount(new EntityWrapper<RgvOneSign>().eq("rgv_one_type", param.getPalletizingNo() + "barcode" + param.getBarcode()));
            if (rgvOneType==0){
                RgvOneSign rgvOneSign = new RgvOneSign();
                rgvOneSign.setRgvOneSign(param.getPalletizingNo());
                rgvOneSign.setRgvOneType(param.getPalletizingNo() + "barcode" + param.getBarcode());
                boolean insert = rgvOneSignService.insert(rgvOneSign);
                if (!insert){
                    throw new CoolException("托盘码标记添加失败，请重新下发！！！");
                }
            }
        }catch (Exception e){
            throw new CoolException("托盘码标记添加异常，请重新下发！！！");
        }

        Date now = new Date();
        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
            long rollUp = new Date().getTime();
        for (PalletizingCompleteTwoFloorParam.MatList matList:param.getMatList()){
            Mat mat = matService.selectByMatnr(matList.getMatnr());
            if (Cools.isEmpty(mat)) {
                throw new CoolException(matList.getMatnr() + "商品档案不存在");
                mat = new Mat();
                mat.setMatnr(matList.getMatnr());
                mat.setMaktx(matList.getMatnr());
                mat.setTagId(tagService.getTop().getId());
                mat.setCreateBy(userId);
                mat.setCreateTime(now);
                mat.setUpdateBy(userId);
                mat.setUpdateTime(now);
                mat.setStatus(1);
                if (!matService.insert(mat)) {
                    throw new CoolException("规格添加失败，请联系管理员");
                }
            }
            WaitPakin waitPakin = new WaitPakin();
            waitPakin.sync(mat);
            waitPakin.setModel(matList.getBatch());     //批次
            waitPakin.setSpecs(matList.getSpecs());     //规格
            waitPakin.setBatch(matList.getBoxNo());       //木箱编码
            waitPakin.setBrand(param.getBoxType());     //木箱类型
            waitPakin.setBatch(matList.getBatch());       //木箱编码  //批次  唯一值  箱号
            waitPakin.setModel(matList.getModel());       //卷号  唯一值
            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.setVolume(matList.getRoughWeight());  //毛重
            waitPakin.setPrice(matList.getRollExtent());   //长度
            waitPakin.setSpecs(String.valueOf(matList.getJoint()));   //接头
            waitPakin.setDanger(matList.getQualified());   //待判
            waitPakin.setIoStatus("N");     // 入出状态
            waitPakin.setAnfme(matList.getAnfme().doubleValue());  // 木箱中铜箔数量
            waitPakin.setAnfme(matList.getAnfme());  // 数量
            waitPakin.setStatus("Y");    // 状态
            waitPakin.setAppeUser(userId);
            waitPakin.setAppeTime(now);
            waitPakin.setModiUser(userId);
            waitPakin.setModiTime(now);
            waitPakin.setRollUp(rollUp);
            if (!Cools.isEmpty(matList.getMatDetlList())){
                for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
                    LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
                    locDetlRullUpDetail.setUuid(rollUp);
                    locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
                    locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
                    locDetlRullUpDetailService.insert(locDetlRullUpDetail);
                }
            }
            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);

        }

    }
@@ -803,165 +860,18 @@
    @Override
    @Transactional
    public void palletizingCompleteS(PalletizingCompleteParam param) {
        Long userId = 7776L;//松盛
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
            throw new CoolException("参数：托盘码 barcode为空");
        }else if (Cools.isEmpty(param.getPalletizingNo())){
            throw new CoolException("参数：码垛位编号 palletizingNo为空");
        }else if (Cools.isEmpty(param.getBoxType())){
            throw new CoolException("参数：木箱类型 boxType为空");
        }else if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()!=1){
            throw new CoolException("参数：物料明细 matLists为空");
        }

        ArrayList<String> positions = new ArrayList<>();   //木箱位置查重      (orgin)
        ArrayList<String> boxNos = new ArrayList<>();   //木箱唯一编码查重  （batch）
        //判断matLists参数
        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
            if (Cools.isEmpty(matList.getMatnr())){
                throw new CoolException("参数：物料编码 matnr为空");
            }else if (Cools.isEmpty(matList.getPosition())){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：码垛位置 position为空");
            }else if (Cools.isEmpty(matList.getBoxNo())){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：木箱编号 boxNo为空");
            }else if (Cools.isEmpty(matList.getAnfme()) || matList.getAnfme().equals(0)){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：木箱中铜箔数量 anfme为空");
            }else if (Cools.isEmpty(matList.getWeight()) || matList.getWeight().equals(0D)){
                throw new CoolException("物料编码："+matList.getMatnr()+"、参数：重量 weight为空");
            }

            if (!positions.contains(matList.getPosition())){
                positions.add(matList.getPosition());
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+",木箱位置存在重复："+matList.getPosition());
            }

            if (!boxNos.contains(matList.getBoxNo())){
                boxNos.add(matList.getBoxNo());
            }else {
                throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+",木箱编码存在重复");
            }
        WrkMast wrkMast = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMast) || wrkMast.getWrkSts()!=2){
            log.error("退库码垛完成，返回托盘码未查询到工作档案！");
            throw new CoolException("参数：托盘码 barcode未查询到工作档案");
        }

        BasDevp basDevp = basDevpService.selectById(param.getPalletizingNo2());
        if (Cools.isEmpty(basDevp)){
            throw new CoolException("参数：码垛位编号 palletizingNo="+param.getPalletizingNo2()+"不存在");
        }
        if (Cools.isEmpty(basDevp.getAutoing()) || !basDevp.getAutoing().equals("Y")){
            throw new CoolException("码垛位编号 palletizingNo="+param.getPalletizingNo()+" 所处站点不是自动状态");
        }
        if (Cools.isEmpty(basDevp.getLoading()) || !basDevp.getLoading().equals("Y")){
            throw new CoolException("码垛位编号 palletizingNo="+param.getPalletizingNo()+" 所处站点不是有物状态");
        }
//        if (Cools.isEmpty(basDevp.getCanining()) || !basDevp.getCanining().equals("Y")){
//            throw new CoolException("码垛位编号 palletizingNo="+param.getPalletizingNo()+" 所处站点不是能入状态");
//        }




//        if (locDetlService.selectCount(new EntityWrapper<LocDetl>().eq("zpallet", param.getBarcode()))!=0
//                || wrkDetlService.selectCount(new EntityWrapper<WrkDetl>().eq("zpallet", param.getBarcode()))!=0
//                || waitPakinService.selectCount(new EntityWrapper<WaitPakin>().eq("zpallet", param.getBarcode()))!=0){
//            throw new CoolException("托盘条码："+param.getBarcode()+"已存在，请勿重复组托");
//        }
//
//
//        Date now = new Date();
//        List<WaitPakin> waitPakins = new ArrayList<>();
//        String matnr = null;
//        for (PalletizingCompleteParam.MatList matList:param.getMatLists()){
//            long rollUp = new Date().getTime();
//            Mat mat = matService.selectByMatnr(matList.getMatnr());
//            if (Cools.isEmpty(mat)) {
//                throw new CoolException(matList.getMatnr() + "商品档案不存在");
//            }
//            matnr = mat.getMatnr();
//            WaitPakin waitPakin = new WaitPakin();
//            waitPakin.sync(mat);
//            waitPakin.setModel(matList.getBatch());     //批次
//            waitPakin.setSpecs(matList.getSpecs());     //规格
//            waitPakin.setBatch(matList.getBoxNo());       //木箱编码
//            waitPakin.setBrand(param.getBoxType());     //木箱类型
//            waitPakin.setZpallet(param.getBarcode());   //托盘码
//            waitPakin.setOrigin(matList.getPosition()); //木箱在托盘上的位置
//            waitPakin.setIoStatus("Y");     // 入出状态
//            waitPakin.setAnfme(matList.getAnfme().doubleValue());  // 木箱中铜箔数量
//            waitPakin.setStatus("Y");    // 状态
//            waitPakin.setAppeUser(userId);
//            waitPakin.setAppeTime(now);
//            waitPakin.setModiUser(userId);
//            waitPakin.setModiTime(now);
//            waitPakin.setRollUp(rollUp);
//            if (!Cools.isEmpty(matList.getMatDetlList())){
//                for (PalletizingCompleteParam.MatDetlList matDetlList:matList.getMatDetlList()){
//                    LocDetlRullUpDetail locDetlRullUpDetail = new LocDetlRullUpDetail();
//                    locDetlRullUpDetail.setUuid(rollUp);
//                    locDetlRullUpDetail.setRollNo(matDetlList.getBoxNoDetl());
//                    locDetlRullUpDetail.setRollWeight(matDetlList.getWeightDetl().toString());
//                    locDetlRullUpDetailService.insert(locDetlRullUpDetail);
//                }
//            }
//            if (!waitPakinService.insert(waitPakin)) {
//                throw new CoolException("保存入库通知档失败");
//            }
//            waitPakins.add(waitPakin);
//        }
//        LocTypeDto locTypeDto = new LocTypeDto();
//        locTypeDto.setLocType1((short)1);
//
//        StartupDto dto = commonService.getLocNo(1, 1, param.getPalletizingNo2(), matnr,null,null, locTypeDto);
//
//        int workNo = dto.getWorkNo();
//        // 生成工作档
//        WrkMast wrkMast = new WrkMast();
//        wrkMast.setWrkNo(workNo);
//        wrkMast.setIoTime(new Date());
//        wrkMast.setWrkSts(1L); // 工作状态：生成入库ID
//        wrkMast.setIoType(1); // 入出库状态：1.入库
//        wrkMast.setIoPri(13D); // 优先级
//        wrkMast.setCrnNo(dto.getCrnNo());
//        wrkMast.setSourceStaNo(dto.getSourceStaNo());
//        wrkMast.setStaNo(dto.getStaNo());
//        wrkMast.setLocNo(dto.getLocNo());
//        wrkMast.setBarcode(param.getBarcode()); // 托盘码
//        wrkMast.setFullPlt("Y"); // 满板：Y
//        wrkMast.setPicking("N"); // 拣料
//        wrkMast.setExitMk("N"); // 退出
//        wrkMast.setEmptyMk("N"); // 空板
//        wrkMast.setLinkMis("Y");
//        wrkMast.setCtnType(0); // 容器类型
//        // 操作人员数据
//        wrkMast.setAppeTime(now);
//        wrkMast.setModiTime(now);
//        boolean res = wrkMastService.insert(wrkMast);
//        if (!res) {
//            throw new CoolException("保存工作档失败");
//        }
//        // 生成工作档明细
//        waitPakins.forEach(waitPakin -> {
//            WrkDetl wrkDetl = new WrkDetl();
//            wrkDetl.sync(waitPakin);
//            wrkDetl.setWrkNo(wrkMast.getWrkNo());
//            wrkDetl.setIoTime(wrkMast.getIoTime());
//            wrkDetl.setAppeTime(now);
//            wrkDetl.setModiTime(now);
//            if (!wrkDetlService.insert(wrkDetl)) {
//                throw new CoolException("保存工作明细失败");
//            }
//        });
//        // 更新目标库位状态
//        LocMast locMast = locMastService.selectById(dto.getLocNo());
//        if (locMast.getLocSts().equals("O")){
//            locMast.setLocSts("S"); // S.入库预约
//            locMast.setModiTime(now);
//            if (!locMastService.updateById(locMast)){
//                throw new CoolException("改变库位状态失败");
//            }
//        } else {
//            throw new CoolException(dto.getLocNo()+"目标库位已被占用");
//        }
        wrkMast.setSheetNo("4");
        wrkMastService.updateById(wrkMast);
    }


@@ -996,6 +906,17 @@
            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<>();
        ArrayList<WrkDetlSingle> wrkDetlsOld = new ArrayList<>();
        //判断matLists参数
@@ -1005,17 +926,17 @@
            }else if (Cools.isEmpty(matList.getBoxNo())){
                throw new CoolException("参数：木箱编号 boxNo为空");
            }
            List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
            WrkDetlSingle wrkDetlSingleOne = wrkDetlSingleService.selectOne(new EntityWrapper<WrkDetlSingle>().eq("batch", matList.getBoxNo()));
            List<WrkDetlSingle> wrkDetlSingles = wrkDetlSingleService.selectList(new EntityWrapper<WrkDetlSingle>()
                    .eq("wrk_no", wrkDetlSingleOne.getWrkNo()).eq("io_time", wrkDetlSingleOne.getIoTime()));
            boolean sign=true;
            for (WrkDetlSingle wrkDetlSingle:wrkDetlSingles){
                if (wrkDetlSingle.getBatch().equals(matList.getBoxNo())){//木箱编码
                    WrkDetl wrkDetl = new WrkDetl();
                    wrkDetl.sync(wrkDetlSingle);
                    wrkDetlsNew.add(wrkDetl);
                    wrkDetlsOld.add(wrkDetlSingle);
                    sign=false;
                    break;
                }
                WrkDetl wrkDetl = new WrkDetl();
                wrkDetl.sync(wrkDetlSingle);
                wrkDetlsNew.add(wrkDetl);
                wrkDetlsOld.add(wrkDetlSingle);
                sign=false;
                break;
            }
            if (sign){
                throw new CoolException("参数：木箱编号 boxNo未查询到对应的工作明细！");
@@ -1069,69 +990,23 @@
    @Override
    @Transactional
    public void singleMountUnstackingComplete(SingleMountUnstackingCompleteParam param) {
        Long userId = 8888L;//桁架上位软件
//        Long userId = 8888L;//桁架上位软件
        //判断param参数
        if (Cools.isEmpty(param.getBarcode())){
            throw new CoolException("参数：托盘码 barcode为空");
        }
//        else if (Cools.isEmpty(param.getPalletizingNo())){
//            throw new CoolException("参数：码垛位编号 palletizingNo为空");
//        }
        WrkMast wrkMastMatrix = wrkMastService.selectByBarcode(param.getBarcode());
        if (Cools.isEmpty(wrkMastMatrix)){
            throw new CoolException("参数：托盘码查询工作档失败："+param.getBarcode());
        }else {
//            if (wrkMastMatrix.getIoType().equals(103)){
//                List<WrkDetl> wrkDetls = wrkDetlService.selectByWrkNoUnstacking(wrkMastMatrix.getWrkNo());
//                if (Cools.isEmpty(param.getMatLists()) || param.getMatLists().size()==0 || param.getMatLists().size()!=wrkDetls.size()){
//                    throw new CoolException("返回物料明细数为"+param.getMatLists().size()+",托盘码："+param.getBarcode()+"应剩余物料数："+wrkDetls.size());
//                }
//
//                ArrayList<String> orgin = new ArrayList<>();
//                //判断matLists参数
//                for (SingleMountUnstackingCompleteParam.MatList matList : param.getMatLists()){
//                    if (Cools.isEmpty(matList.getPosition())){
//                        throw new CoolException("参数：码垛位置 position为空");
//                    }else if (Cools.isEmpty(matList.getBoxNo())){
//                        throw new CoolException("参数：木箱编号 boxNo为空");
//                    }
//                    if (!orgin.contains(matList.getPosition())){
//                        orgin.add(matList.getPosition());
//                    }else {
//                        throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+",木箱位置存在重复");
//                    }
//                    boolean sign=true;
//                    for (WrkDetl wrkDetl:wrkDetls){
//                        if (wrkDetl.getBatch().equals(matList.getBoxNo())){//木箱编码
//                            wrkDetl.setOrigin(matList.getPosition());
//                            wrkDetlService.update(wrkDetl,new EntityWrapper<WrkDetl>().eq("batch",wrkDetl.getBatch()));
//                            sign=false;
//                            break;
//                        }
//                    }
//                    if (sign){
//                        throw new CoolException("参数：木箱编号 boxNo:"+matList.getBoxNo()+"未查询到对应的工作明细！");
//                    }
//                }
//            }
        }
        if (!wrkMastMatrix.getSheetNo().equals("1")){
            throw new CoolException("参数：此任务未上报禁止完成："+param.getBarcode());
        }

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

    /*
     *
     * */
    @Override
    @Transactional
    public void cs1(String barcode) {
        BasDevp basDevp = basDevpService.selectById(216);
        basDevp.setWrkNo(9992);
        basDevp.setBarcode(barcode);
        basDevpService.updateById(basDevp);
    }

    /*
@@ -1212,22 +1087,45 @@
        return crnStn;
    }


        /*
     *
    /*
     * FQC质检
     * */
    @Override
    @Transactional
    public void cs3() {
        //拆盘
        WrkMastSta wrkMastSta1 = new WrkMastSta(new Date(),119);
        wrkMastSta1.setType(2);
        wrkMastSta1.setWrkType(2);
        wrkMastStaService.insert(wrkMastSta1);
        WrkMastSta wrkMastSta2 = new WrkMastSta(new Date(),121);
        wrkMastSta2.setType(2);
        wrkMastSta2.setWrkType(2);
        wrkMastStaService.insert(wrkMastSta2);
    public void qualityInspection(QualityInspectionParam param) {
        //判断param参数
        if (Cools.isEmpty(param.getBoxNo())){
            throw new CoolException("参数：箱号 boxNo为空");
        }

        List<LocDetl> locDetlList = locDetlService.selectList(new EntityWrapper<LocDetl>()
                .eq("batch", param.getBoxNo())
                .eq("model", param.getModel())
        );
        if (locDetlList.isEmpty()){
            throw new CoolException("未查询到对应箱号："+param.getBoxNo()+";与卷号："+param.getModel()+";的物料");
        }
        for (LocDetl locDetl:locDetlList){
            if (locDetl.getDanger()!=0){
                String dangerStr = "";
                if (locDetl.getDanger()==1){
                    dangerStr = "合格";
                }else if (locDetl.getDanger()==2){
                    dangerStr = "不合格";
                }
                throw new CoolException("查询到对应箱号："+param.getBoxNo()+";与卷号："+param.getModel()+";的物料,但是已经标记为"+dangerStr+"，不能重复标记！");
            }
        }
        for (LocDetl locDetl:locDetlList){
            if (locDetl.getDanger()==0){
                locDetl.setDanger(param.getDanger());
                locDetl.setMemo(param.getMemo());
                locDetlService.update(locDetl,new EntityWrapper<LocDetl>()
                        .eq("loc_no", locDetl.getLocNo())
                        .eq("batch", param.getBoxNo()));
            }
        }

    }

    /*...........................上饶江铜..............以上.............徐工汉云...........................*/