src/main/java/com/ruoyi/production/pojo/ProductionProductInput.java
@@ -23,6 +23,9 @@ @ApiModelProperty(value = "数量") private BigDecimal quantity; @ApiModelProperty(value = "batchNo") private String batchNo; @ApiModelProperty(value = "创建时间") @TableField(fill = FieldFill.INSERT) private LocalDateTime createTime; src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -18,6 +18,7 @@ import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.bean.BeanUtils; import com.ruoyi.procurementrecord.utils.StockUtils; import com.ruoyi.production.dto.ProductStructureDto; import com.ruoyi.production.dto.ProductionProductMainDto; import com.ruoyi.production.mapper.*; import com.ruoyi.production.pojo.*; @@ -175,23 +176,22 @@ productionProductMain.setStatus(0); productionProductMainMapper.insert(productionProductMain); /*新增报工投入表*/ // List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId()); // if (productStructureDtos.isEmpty()) { // //如果该工序没有产品结构的投入品,那这个投入品和产出品是同一个 // ProductStructureDto productStructureDto = new ProductStructureDto(); // productStructureDto.setProductModelId(productProcessRouteItem.getProductModelId()); // productStructureDto.setUnitQuantity(BigDecimal.ONE); // productStructureDtos.add(productStructureDto); // } // for (ProductStructureDto productStructureDto : productStructureDtos) { // System.out.println(productStructureDto.getProductModelId()); // ProductionProductInput productionProductInput = new ProductionProductInput(); // productionProductInput.setProductModelId(productStructureDto.getProductModelId()); // productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity())); // productionProductInput.setProductMainId(productionProductMain.getId()); // productionProductInputMapper.insert(productionProductInput); // stockUtils.substractStock(productStructureDto.getProductModelId(), productionProductInput.getQuantity(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId(),dto.getBatchNo()); // } List<ProductStructureDto> productStructureDtos = productStructureMapper.listBybomAndProcess(productProcessRoute.getBomId(), productProcess.getId()); if (productStructureDtos.isEmpty()) { //如果该工序没有产品结构的投入品,那这个投入品和产出品是同一个 ProductStructureDto productStructureDto = new ProductStructureDto(); productStructureDto.setProductModelId(productProcessRouteItem.getProductModelId()); productStructureDto.setUnitQuantity(BigDecimal.ONE); productStructureDtos.add(productStructureDto); } for (ProductStructureDto productStructureDto : productStructureDtos) { ProductionProductInput productionProductInput = new ProductionProductInput(); productionProductInput.setProductModelId(productStructureDto.getProductModelId()); productionProductInput.setQuantity(productStructureDto.getUnitQuantity().multiply(dto.getQuantity())); productionProductInput.setProductMainId(productionProductMain.getId()); productionProductInputMapper.insert(productionProductInput); stockUtils.substractStock(productStructureDto.getProductModelId(), productionProductInput.getQuantity(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode(), productionProductMain.getId(), null); } /*新增报工产出表*/ ProductionProductOutput productionProductOutput = new ProductionProductOutput(); productionProductOutput.setProductMainId(productionProductMain.getId()); @@ -448,4 +448,4 @@ return productionProductMainDtos; } } } src/main/java/com/ruoyi/stock/service/impl/StockInRecordServiceImpl.java
@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.common.enums.StockInQualifiedRecordTypeEnum; import com.ruoyi.common.enums.StockInUnQualifiedRecordTypeEnum; import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum; import com.ruoyi.common.exception.base.BaseException; import com.ruoyi.common.utils.EnumUtil; import com.ruoyi.common.utils.OrderUtils; @@ -61,7 +60,7 @@ int insertRows = stockInRecordMapper.insert(stockInRecord); Long insertId = stockInRecord.getId(); // 替换为你的实际主键字段：getRecordId()/getInboundId() 等 Long insertId = stockInRecord.getId(); return insertRows > 0 ? insertId : null; } src/main/java/com/ruoyi/stock/service/impl/StockInventoryServiceImpl.java
@@ -37,6 +37,7 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; @@ -251,6 +252,38 @@ stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId()); stockOutRecordDto.setType("0"); stockOutRecordService.add(stockOutRecordDto); if (ObjectUtils.isEmpty(stockInventoryDto.getBatchNo())) { List<StockInventory> stockInventories = stockInventoryMapper.selectList(new QueryWrapper<StockInventory>().lambda() .eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()) .orderByAsc(StockInventory::getId)); if (ObjectUtils.isEmpty(stockInventories)) { throw new RuntimeException("产品库存不存在"); } BigDecimal remainingQty = stockInventoryDto.getQualitity(); for (StockInventory stockInventory : stockInventories) { BigDecimal lockedQty = stockInventory.getLockedQuantity() == null ? BigDecimal.ZERO : stockInventory.getLockedQuantity(); BigDecimal availableQty = stockInventory.getQualitity().subtract(lockedQty); if (availableQty.compareTo(BigDecimal.ZERO) <= 0) { continue; } BigDecimal deductQty = remainingQty.min(availableQty); stockInventory.setQualitity(stockInventory.getQualitity().subtract(deductQty)); stockInventory.setVersion(stockInventory.getVersion() == null ? 1 : stockInventory.getVersion() + 1); stockInventory.setUpdateTime(LocalDateTime.now()); stockInventoryMapper.updateById(stockInventory); remainingQty = remainingQty.subtract(deductQty); if (remainingQty.compareTo(BigDecimal.ZERO) <= 0) { return true; } } ProductModel productModel = productModelMapper.selectById(stockInventoryDto.getProductModelId()); Product product = productMapper.selectById(productModel.getProductId()); throw new RuntimeException(product.getProductName() + "/" + productModel.getModel() + "库存不足无法出库"); } StockInventory oldStockInventory = stockInventoryMapper.selectOne(new QueryWrapper<StockInventory>().lambda().eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()) .eq(StockInventory::getBatchNo, stockInventoryDto.getBatchNo())); if (ObjectUtils.isEmpty(oldStockInventory)) { src/main/resources/mapper/production/ProductionProductInputMapper.xml
@@ -7,6 +7,7 @@ <result property="productMainId" column="product_main_id"/> <result property="productModelId" column="product_model_id"/> <result property="quantity" column="quantity"/> <result property="batchNo" column="batch_no"/> <result property="tenantId" column="tenant_id"/> <result property="createTime" column="create_time"/> </resultMap>
