#贴标机贴标完成接口实装

LSH

2023-07-20 49ed1a98d6a8aae1fdd31fa47f8d5b05a2c3768c

#贴标机贴标完成接口实装

 src/main/java/com/zy/asrs/controller/OpenController.java

@@ -215,7 +215,7 @@
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.labellerComplete(param);
        return R.ok(param);
        return R.ok();
    }

    /**
@@ -228,7 +228,7 @@
                                           HttpServletRequest request) {
        auth(appkey, param, request);
        openService.palletizingComplete(param);
        return R.ok(param);
        return R.ok();
    }



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

@@ -588,12 +588,14 @@
        labellerMatParam.setLabNo(param.getLabNo());
        ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
        String orderNo = "";

        for (WrkDetl wrkDetl:wrkDetls){
            LabellerMatParam.CombMat combMat = new LabellerMatParam.CombMat(wrkDetl);
            orderNo=wrkDetl.getOrderNo();
            combMat.setTemp1("1");
            combMats.add(combMat);
        }

        labellerMatParam.setCombMats(combMats);
        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
@@ -612,7 +614,45 @@
    @Override
    @Transactional
    public void labellerComplete(LabellerCompleteParam param) {
        //
        if (Cools.isEmpty(param.getDevNo())){
            throw new CoolException("参数：站点号 devNo为空");
        }else if (Cools.isEmpty(param.getLabNo())){
            throw new CoolException("参数：贴标机号 labNo为空");
        }else if (Cools.isEmpty(param.getLabResult())){
            throw new CoolException("参数：贴标结果 labResult为空");
        }else if (Cools.isEmpty(param.getWrkNo())){
            throw new CoolException("参数：贴标任务号 wrkNo为空");
        }
        BasDevp basDevp = basDevpService.selectById(param.getDevNo());
        if (Cools.isEmpty(basDevp)){
            throw new CoolException("参数：站点号 devNo不存在");
        }else if (Cools.isEmpty(basDevp.getWrkNo()) || basDevp.getWrkNo()==0 ){
            throw new CoolException("站点:"+param.getDevNo()+" 不存在工作中任务");
        }else if(!basDevp.getWrkNo().toString().equals(param.getWrkNo())){
            throw new CoolException("站点:"+param.getDevNo()+" 进行中任务号="+basDevp.getWrkNo()+" 与贴标结果返回任务号="+param.getWrkNo()+" 不一致");
        }

        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(53L)){
            throw new CoolException("站点:"+param.getDevNo()+" 工作中任务状态已变更，请勿重复申请,任务号："+basDevp.getWrkNo()+",任务状态:"+wrkMast.getWrkSts$());
        }

        if (param.getLabResult().equals("OK")){
            wrkMast.setWrkSts(54L);
            if (!wrkMastService.updateById(wrkMast)){
                throw new CoolException("异常，请重新申请");
            }
        }else if (param.getLabResult().equals("NG")){
            wrkMast.setWrkSts(52L);
            if (!wrkMastService.updateById(wrkMast)){
                throw new CoolException("异常，请重新申请");
            }
        }else {
            throw new CoolException("参数：贴标结果:labResult"+param.getLabResult()+";请按规则发送：成功：OK 、失败:NG");
        }

    }

    /*