| src/main/java/com/zy/asrs/entity/param/FullStoreParam.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| src/main/java/com/zy/common/model/DetlDto.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/entity/param/FullStoreParam.java
@@ -25,6 +25,12 @@ // 物料编号 private String matnr; private String maktx; private String specs; private Long tagId; // 序列码 private String batch; src/main/java/com/zy/asrs/service/impl/OpenServiceImpl.java
@@ -638,6 +638,9 @@ List<DetlDto> detlDtos = new ArrayList<>(); param.getList().forEach(elem -> { DetlDto detlDto = new DetlDto(elem.getMatnr(), elem.getBatch(), elem.getAnfme()); detlDto.setMaktx(elem.getMaktx()); detlDto.setSpecs(elem.getSpecs()); detlDto.setTagId(elem.getTagId()); if (DetlDto.has(detlDtos, detlDto)) { DetlDto detlDto1 = DetlDto.find(detlDtos, detlDto.getMatnr(), detlDto.getBatch()); assert detlDto1 != null; src/main/java/com/zy/asrs/service/impl/WrkDetlServiceImpl.java
@@ -1,7 +1,6 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.core.common.Cools; import com.core.exception.CoolException; import com.zy.asrs.entity.Mat; import com.zy.asrs.entity.WrkDetl; @@ -28,10 +27,23 @@ if (detlDtos.isEmpty()){ return; } // 9原材料,10半成品 for (DetlDto dto : detlDtos) { Mat mat = matService.selectByMatnr(dto.getMatnr()); if (Cools.isEmpty(mat)){ throw new CoolException(dto.getMatnr() + "商品维护失败"); if (mat == null) { mat = new Mat(); mat.setTagId(dto.getTagId()); mat.setMatnr(dto.getMatnr()); mat.setMaktx(dto.getMaktx()); mat.setSpecs(dto.getSpecs()); mat.setStatus(1); mat.setCreateTime(now); mat.setUpdateTime(now); mat.setCreateBy(29L); mat.setUpdateBy(29L); if (!matService.insert(mat)) { throw new CoolException("物料导入失败!" + dto); } } // 保持工作档明细 WrkDetl wrkDetl = new WrkDetl(); src/main/java/com/zy/common/model/DetlDto.java
@@ -17,10 +17,16 @@ private String matnr; private String maktx; private String specs; private String batch; private Double anfme; private Long tagId; public DetlDto() { }