src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -15,4 +15,14 @@ private BigDecimal warnNum; private Long productModelId; /** * 缺货数量 */ private BigDecimal outStockQuantity; /** * 缺货情况 */ private String shortageDescription; } src/main/java/com/ruoyi/procurementrecord/dto/ProcurementPageDto.java
@@ -151,4 +151,14 @@ @DateTimeFormat(pattern = "yyyy-MM-dd") private LocalDate endDate; /** * 缺货数量 */ private BigDecimal outStockQuantity; /** * 缺货情况 */ private String shortageDescription; } src/main/java/com/ruoyi/procurementrecord/dto/ProcurementUpdateDto.java
@@ -20,4 +20,15 @@ private List<Integer> ids; /** * 缺货数量 */ private BigDecimal outStockQuantity; /** * 缺货情况 */ private String shortageDescription; } src/main/java/com/ruoyi/procurementrecord/pojo/ProcurementRecordStorage.java
@@ -46,6 +46,16 @@ // private BigDecimal minStock; /** * 缺货数量 */ private BigDecimal outStockQuantity; /** * 缺货情况 */ private String shortageDescription; /** * 入库用户 */ private String createBy; src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -106,6 +106,8 @@ procurementRecordStorageById.setWarnNum(procurementDto.getWarnNum()); procurementRecordStorageById.setUpdateUser(SecurityUtils.getLoginUser().getUserId()); procurementRecordStorageById.setUpdateTime(LocalDateTime.now()); procurementRecordStorageById.setOutStockQuantity(procurementDto.getOutStockQuantity()); procurementRecordStorageById.setShortageDescription(procurementDto.getShortageDescription()); return procurementRecordMapper.updateById(procurementRecordStorageById); } @@ -413,6 +415,8 @@ .inboundBatches(aLong.equals(0L) ? "第1批次" : "第"+ (aLong + 1) + "批次") .inboundNum(detail.getInboundQuantity()) .warnNum(detail.getWarnNum()) .outStockQuantity(detail.getOutStockQuantity()) .shortageDescription(detail.getShortageDescription()) .createTime(LocalDateTime.now()) .createUser(loginUser.getUserId()) .updateTime(LocalDateTime.now()) src/main/java/com/ruoyi/sales/controller/SalesLedgerController.java
@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.ArrayList; import java.util.Collection; import java.util.List; import java.util.Objects; import java.util.concurrent.atomic.AtomicInteger; @@ -284,7 +283,7 @@ public AjaxResult getProductInventory(SalesLedgerProduct salesLedgerProduct){ List<SalesLedgerProduct> list = salesLedgerProductService.selectSalesLedgerProductList(salesLedgerProduct); if(CollectionUtils.isEmpty(list)){ return AjaxResult.error("该产品不存在"); throw new RuntimeException("该产品不存在"); } List<ProcurementPageDto> procurementPageDtoList = new ArrayList<>(); list.forEach(item -> { @@ -295,7 +294,7 @@ procurementPageDtoList.addAll(procurementPageDtoIPage.getRecords()); }); if(!CollectionUtils.isEmpty(procurementPageDtoList)){ return AjaxResult.error("该产品库存不存在"); throw new RuntimeException("该产品库存不存在"); } AtomicInteger num = new AtomicInteger(); list.forEach(item -> { src/main/resources/mapper/procurementrecord/ProcurementRecordMapper.xml
@@ -49,7 +49,9 @@ t1.create_time, t1.update_time, t1.create_by, t2.warn_num t2.warn_num, t1.out_stock_quantity as outStockQuantity, t1.shortage_description as shortageDescription from procurement_record_storage t1 left join sales_ledger_product t2 on t2.id = t1.sales_ledger_product_id left join purchase_ledger t3 on t3.id = t2.sales_ledger_id
