From f7b8a02843673c19e21b275d1c54e2a778bfedd4 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 08 四月 2026 11:05:41 +0800
Subject: [PATCH] 相同产品型号的生产订单批号需要唯一
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 12d8302..4830ced 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -429,6 +429,10 @@
for (SalesLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+ List<StockInventory> stockInventories = stockInventoryMapper.selectList(new LambdaQueryWrapper<StockInventory>().in(StockInventory::getBatchNo, salesLedgerProductImportDto.getBatchNo()));
+ if (CollectionUtils.isEmpty(stockInventories)) {
+ throw new RuntimeException("浜у搧鎵瑰彿:" + salesLedgerProductImportDto.getBatchNo() + ",搴撳瓨鏃犲搴斾骇鍝佹暟鎹紒");
+ }
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(1);
@@ -458,16 +462,13 @@
salesLedgerProduct.setApproveStatus(0);
salesLedgerProduct.setPendingInvoiceTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
salesLedgerProductMapper.insert(salesLedgerProduct);
- // 娣诲姞鐢熶骇鏁版嵁
- salesLedgerProductServiceImpl.addProductionData(salesLedgerProduct);
}
}
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
- return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
@@ -949,7 +950,7 @@
data.put("amount", amount);
data.put("amountBig", NumberChineseFormatter.format(amount, true, false));
SalesLedger salesLedger = salesLedgerMapper.selectById(id);
- data.put("customerName ", salesLedger.getCustomerName());
+ data.put("customerName", salesLedger.getCustomerName());
data.put("executionDate", salesLedger.getExecutionDate());
data.put("salesContractNo", salesLedger.getSalesContractNo());
Customer customer = customerMapper.selectById(salesLedger.getCustomerId());
--
Gitblit v1.9.3