src/main/java/com/ruoyi/production/dto/ProcessRouteAnticlockwiseDto.java
@@ -24,4 +24,6 @@ private String userIds; // 机台id private Long deviceId; private String uuid; } src/main/java/com/ruoyi/production/pojo/ProductBom.java
@@ -69,6 +69,4 @@ @TableField(fill = FieldFill.INSERT) private Long deptId; @ApiModelProperty("uuid") private String uuid; } src/main/java/com/ruoyi/production/pojo/ProductProcessRouteItem.java
@@ -59,4 +59,6 @@ //工艺要求 private String processRouteRequire; private String uuid; } src/main/java/com/ruoyi/production/service/ProcessRouteService.java
@@ -17,5 +17,5 @@ int batchDelete(List<Long> ids); Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderI,String uuidd); Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderI); } src/main/java/com/ruoyi/production/service/impl/ProcessRouteServiceImpl.java
@@ -93,10 +93,10 @@ */ @Transactional(rollbackFor = Exception.class) @Override public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId,String uuid) { public Long processRouteAnticlockwise(List<ProcessRouteAnticlockwiseDto> processRouteAnticlockwiseDtos, Long productModelId, Long productOrderId) { ProductOrder byId = productOrderService.getById(productOrderId); // 1. 新增BOM ProductBom productBom = createProductBom(productModelId,uuid); ProductBom productBom = createProductBom(productModelId); // 2. 新增BOM子表 List<ProductStructure> productStructures = buildProductStructures(processRouteAnticlockwiseDtos, productBom.getId()); @@ -120,11 +120,10 @@ /** * 创建产品BOM */ private ProductBom createProductBom(Long productModelId,String uuid) { private ProductBom createProductBom(Long productModelId) { ProductBom productBom = new ProductBom(); productBom.setProductModelId(productModelId); productBom.setVersion("1.0.0"); productBom.setUuid(uuid); productBomService.save(productBom); productBom.setBomNo("BM." + String.format("%05d", productBom.getId())); @@ -219,6 +218,7 @@ item.setProcessRouteNum(dto.getProcessRouteNum()); item.setProcessRouteAddNum(dto.getProcessRouteAddNum()); item.setProcessRouteRequire(dto.getProcessRouteRequire()); item.setUuid(dto.getUuid()); productProcessRouteItemService.save(item); ProductProcess productProcess = productProcessService.getById(item.getProcessId()); //同步新增生产工单 src/main/java/com/ruoyi/production/service/impl/ProductionPrintOrderServiceImpl.java
@@ -2,7 +2,6 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.dto.SimplePersonDto; @@ -10,10 +9,10 @@ import com.ruoyi.production.dto.ProcessRouteAnticlockwiseDto; import com.ruoyi.production.dto.SaveProductionPrintOrderDto; import com.ruoyi.production.mapper.ProductOrderMapper; import com.ruoyi.production.mapper.ProductionPrintOrderMapper; import com.ruoyi.production.pojo.ProductOrder; import com.ruoyi.production.pojo.ProductionPrintOrder; import com.ruoyi.production.service.ProductionPrintOrderService; import com.ruoyi.production.mapper.ProductionPrintOrderMapper; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional;