| | |
|---|
| | | LabellerMatParam labellerMatParam = new LabellerMatParam(); |
|---|
| | | labellerMatParam.setDevNo(param.getDevNo()); |
|---|
| | | labellerMatParam.setLabNo(param.getLabNo()); |
|---|
| | | ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>(); |
|---|
| | | String orderNo = ""; |
|---|
| | | // ArrayList<LabellerMatParam.CombMat> combMats = new ArrayList<>(); |
|---|
| | | ArrayList<LabellerMatParam.BoxNo> boxNos = 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.BoxNo boxNo = new LabellerMatParam.BoxNo(); |
|---|
| | | boxNo.setBoxNo(wrkDetl.getBatch()); |
|---|
| | | boxNos.add(boxNo); |
|---|
| | | } |
|---|
| | | labellerMatParam.setBoxNos(boxNos); |
|---|
| | | // 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.setCombMats(combMats); |
|---|
| | | // labellerMatParam.setLabellingTime(DateUtils.convert(new Date())); |
|---|
| | | labellerMatParam.setWrkNo(basDevp.getWrkNo().toString()); |
|---|
| | | labellerMatParam.setLabTemplate("1"); |
|---|
| | | labellerMatParam.setOrderNo(orderNo); |
|---|
| | | // labellerMatParam.setLabTemplate("1"); |
|---|
| | | // labellerMatParam.setOrderNo(orderNo); |
|---|
| | | wrkMast.setWrkSts(53L); |
|---|
| | | if (!wrkMastService.updateById(wrkMast)){ |
|---|
| | | throw new CoolException("异常，请重新申请"); |
|---|
