src/main/java/com/ruoyi/procurementrecord/utils/StockUtils.java
@@ -10,6 +10,7 @@ import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper; import com.ruoyi.procurementrecord.mapper.ProcurementRecordOutMapper; import com.ruoyi.stock.dto.StockInventoryDto; import com.ruoyi.stock.dto.StockOutRecordDto; import com.ruoyi.stock.dto.StockUninventoryDto; import com.ruoyi.stock.pojo.StockInRecord; import com.ruoyi.stock.pojo.StockOutRecord; @@ -131,12 +132,8 @@ stockInventoryDto.setQualitity(quantity); stockInventoryDto.setProductModelId(productModelId); stockInventoryDto.setBatchNo(batchNo); stockInventoryService.addStockOutRecordOnly(stockInventoryDto); StockOutRecord stockOutRecord = stockOutRecordService.getOne(Wrappers.<StockOutRecord>lambdaQuery() .eq(StockOutRecord::getRecordId, stockInventoryDto.getRecordId()) .eq(StockOutRecord::getRecordType, stockInventoryDto.getRecordType()) ); stockOutRecordService.batchApprove(Collections.singletonList(stockOutRecord.getId()),1); StockOutRecordDto stockOutRecordDto = stockInventoryService.addStockOutRecordOnly(stockInventoryDto); stockOutRecordService.batchApprove(Collections.singletonList(stockOutRecordDto.getId()),1); } /** src/main/java/com/ruoyi/stock/service/StockInventoryService.java
@@ -6,6 +6,7 @@ import com.ruoyi.framework.web.domain.R; import com.ruoyi.stock.dto.StockInRecordDto; import com.ruoyi.stock.dto.StockInventoryDto; import com.ruoyi.stock.dto.StockOutRecordDto; import com.ruoyi.stock.pojo.StockInventory; import jakarta.servlet.http.HttpServletResponse; import org.springframework.web.multipart.MultipartFile; @@ -32,7 +33,7 @@ Boolean addStockInRecordOnly(StockInventoryDto stockInventoryDto); Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto); StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto); R importStockInventory(MultipartFile file);
@@ -20,7 +20,7 @@ public interface StockOutRecordService extends IService<StockOutRecord> { IPage<StockOutRecordDto> listPage(Page page, StockOutRecordDto stockOutRecordDto); int add(StockOutRecordDto stockOutRecordDto); StockOutRecordDto add(StockOutRecordDto stockOutRecordDto); int update(Long id, StockOutRecordDto stockOutRecordDto);
@@ -251,7 +251,7 @@ @Override @Transactional(rollbackFor = Exception.class) public Boolean addStockOutRecordOnly(StockInventoryDto stockInventoryDto) { public StockOutRecordDto addStockOutRecordOnly(StockInventoryDto stockInventoryDto) { LambdaQueryWrapper<StockInventory> eq = new LambdaQueryWrapper<>(); eq.eq(StockInventory::getProductModelId, stockInventoryDto.getProductModelId()); if (StringUtils.isEmpty(stockInventoryDto.getBatchNo())) { @@ -287,8 +287,8 @@ stockOutRecordDto.setProductModelId(stockInventoryDto.getProductModelId()); stockOutRecordDto.setType("0"); stockOutRecordDto.setRemark(stockInventoryDto.getRemark()); stockOutRecordService.add(stockOutRecordDto); return true; StockOutRecordDto add = stockOutRecordService.add(stockOutRecordDto); return add; } @Override src/main/java/com/ruoyi/stock/service/impl/StockOutRecordServiceImpl.java
@@ -57,13 +57,14 @@ } @Override public int add(StockOutRecordDto stockOutRecordDto) { public StockOutRecordDto add(StockOutRecordDto stockOutRecordDto) { String no = OrderUtils.countTodayByCreateTime(stockOutRecordMapper, "CK","outbound_batches"); stockOutRecordDto.setOutboundBatches(no); if (StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode().equals(stockOutRecordDto.getRecordType())){ stockOutRecordDto.setApprovalStatus(3); } return stockOutRecordMapper.insert(stockOutRecordDto); stockOutRecordMapper.insert(stockOutRecordDto); return stockOutRecordDto; } @Override
