#

LSH

2023-09-17 7c9a9094492f40d99ff18009a7a2604980e6189a

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

@@ -592,6 +592,7 @@
        LabellerMatParam labellerMatParam = new LabellerMatParam();
        labellerMatParam.setDevNo(param.getDevNo());
        labellerMatParam.setLabNo(param.getLabNo());
        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
//        ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>();
        ArrayList<LabellerMatParam.BoxNo> boxNos = new ArrayList<>();
//        String orderNo = "";
@@ -611,7 +612,6 @@

//        labellerMatParam.setCombMats(combMats);
//        labellerMatParam.setLabellingTime(DateUtils.convert(new Date()));
        labellerMatParam.setWrkNo(basDevp.getWrkNo().toString());
//        labellerMatParam.setLabTemplate("1");
//        labellerMatParam.setOrderNo(orderNo);
        wrkMast.setWrkSts(53L);
@@ -654,11 +654,12 @@

        if (param.getLabResult().equals("OK")){
            wrkMast.setWrkSts(54L);
            wrkMast.setStaNo(144);
            if (!wrkMastService.updateById(wrkMast)){
                throw new CoolException("异常，请重新申请");
            }
        }else if (param.getLabResult().equals("NG")){
            wrkMast.setWrkSts(52L);
            wrkMast.setWrkSts(52L);//重新贴标
            if (!wrkMastService.updateById(wrkMast)){
                throw new CoolException("异常，请重新申请");
            }
@@ -819,7 +820,7 @@
        wrkMast.setIoTime(now);
        wrkMast.setWrkSts(51L); // 工作状态：生成入库ID
        wrkMast.setIoType(202); // 入出库状态：202.拆垛后出库
        wrkMast.setIoPri(13D); // 优先级
        wrkMast.setIoPri(99D); // 优先级
        wrkMast.setSourceStaNo(param.getDevNo$());
        wrkMast.setStaNo(140); //贴标站点
        // 操作人员数据