src/main/java/com/ruoyi/procurementrecord/controller/ProcurementRecordController.java
@@ -77,7 +77,7 @@ return procurementRecordService.updateCustom(customStorage); } @Delete("/delteCustom") @PostMapping("/delteCustom") @Log(title = "自定义入库-入库管理-删除入库", businessType = BusinessType.DELETE) @Transactional public AjaxResult deleteCustom(@RequestBody List<Long> ids) { src/main/java/com/ruoyi/procurementrecord/dto/Details.java
@@ -14,6 +14,6 @@ private BigDecimal inboundQuantity; // 入库数量 private BigDecimal warnNum; // 预警数量（采购入库才有） //单价 private BigDecimal unitPrice; private BigDecimal taxInclusiveUnitPrice; private BigDecimal totalPrice; } src/main/java/com/ruoyi/procurementrecord/service/impl/ProcurementRecordServiceImpl.java
@@ -696,8 +696,8 @@ .inboundNum(detail.getInboundQuantity()) .type(procurementDto.getType()) .warnNum(detail.getWarnNum()) .unitPrice(detail.getUnitPrice()) .totalPrice(detail.getInboundQuantity().multiply(detail.getUnitPrice())) .unitPrice(detail.getTaxInclusiveUnitPrice()) .totalPrice(detail.getInboundQuantity().multiply(detail.getTaxInclusiveUnitPrice())) .createTime(LocalDateTime.now()) .createUser(loginUser.getUserId()) .updateTime(LocalDateTime.now()) src/main/java/com/ruoyi/production/service/impl/SalesLedgerWorkServiceImpl.java
@@ -129,7 +129,7 @@ Details details1 = new Details(); details1.setInboundQuantity(productionReportDto.getFinishedNum()); details1.setId(Integer.parseInt(salesLedgerWork.getSalesLedgerProductId().toString())); details1.setUnitPrice(productionReportDto.getUnitPrice()); details1.setTaxInclusiveUnitPrice(productionReportDto.getUnitPrice()); details1.setTotalPrice(productionReportDto.getTotalPrice()); details.add(details1); procurementRecordOutAdd.setDetails(details); src/main/resources/mapper/procurementrecord/CustomStorageMapper.xml
@@ -33,9 +33,8 @@ sum(t1.tax_inclusive_total_price) as taxInclusiveTotalPrice, (t1.inbound_num - COALESCE(SUM(t2.inbound_num), 0)) AS availableStock from custom_storage t1 left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id and t2.type = 3 left join procurement_record_out t2 on t1.id = t2.procurement_record_storage_id <where> t2.type = 3 <if test="req.productCategory != null and req.productCategory != ''"> and t1.product_category like concat('%',#{req.productCategory},'%') </if>
