*30===>10

lsh

7 天以前 8b9bc3962f02f2739b20b1772f92a1f8e3072b06

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

@@ -599,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){
@@ -633,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;
    }