From 3841d6424d6cb9cfeb4221435c137628b9f7442d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 02 四月 2026 11:52:13 +0800
Subject: [PATCH] fix:1.采购/销售导入导出模板调整 2.采购/销售导入导出逻辑更改
---
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java | 2
src/main/resources/static/采购台账导入模板.xlsx | 0
src/main/resources/mapper/sales/SalesLedgerProductMapper.xml | 15 ++-
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java | 41 ++++++----
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 122 ++++++++++++++++++------------
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 9 +-
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java | 15 +++
src/main/resources/static/销售台账导入模板.xlsx | 0
8 files changed, 125 insertions(+), 79 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
index 3db4abe..19ccd83 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.purchase.dto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -17,16 +16,6 @@
private String purchaseContractNumber;
/**
- * 棰勮鏁伴噺
- */
- @Excel(name = "搴撳瓨棰勮鏁伴噺")
- private BigDecimal warnNum;
-
- @Excel(name = "閿�鍞崟鍙�")
- private String salesContractNo;
-
-
- /**
* 浜у搧澶х被
*/
@Excel(name = "浜у搧澶х被")
@@ -39,16 +28,22 @@
private String specificationModel;
/**
+ * UID鐮�
+ */
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
+ /**
+ * 鎵规鍙�
+ */
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
private String unit;
-
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺")
- private BigDecimal quantity;
/**
* 绋庣巼
@@ -63,6 +58,12 @@
private BigDecimal taxInclusiveUnitPrice;
/**
+ * 鏁伴噺
+ */
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
+ /**
* 鍚◣鎬讳环
*/
@Excel(name = "鍚◣鎬讳环")
@@ -75,6 +76,12 @@
private String invoiceType;
/**
+ * 棰勮鏁伴噺
+ */
+ @Excel(name = "搴撳瓨棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
+ /**
* 鏄惁璐ㄦ
*/
@Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 1f0d386..7fada6a 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -90,68 +90,68 @@
@Slf4j
public class PurchaseLedgerServiceImpl extends ServiceImpl<PurchaseLedgerMapper, PurchaseLedger> implements IPurchaseLedgerService {
@Autowired
- private AccountExpenseService accountExpenseService;
+ private AccountExpenseService accountExpenseService;
@Autowired
- private PurchaseLedgerMapper purchaseLedgerMapper;
+ private PurchaseLedgerMapper purchaseLedgerMapper;
@Autowired
- private SalesLedgerMapper salesLedgerMapper;
+ private SalesLedgerMapper salesLedgerMapper;
@Autowired
- private SalesLedgerProductMapper salesLedgerProductMapper;
+ private SalesLedgerProductMapper salesLedgerProductMapper;
@Autowired
- private SysUserMapper userMapper;
+ private SysUserMapper userMapper;
@Autowired
- private TempFileMapper tempFileMapper;
+ private TempFileMapper tempFileMapper;
@Autowired
- private CommonFileMapper commonFileMapper;
+ private CommonFileMapper commonFileMapper;
@Autowired
- private SupplierManageMapper supplierManageMapper;
+ private SupplierManageMapper supplierManageMapper;
@Autowired
- private ProductMapper productMapper;
+ private ProductMapper productMapper;
@Autowired
- private ProductModelMapper productModelMapper;
+ private ProductModelMapper productModelMapper;
@Autowired
- private SysUserMapper sysUserMapper;
+ private SysUserMapper sysUserMapper;
@Autowired
- private TicketRegistrationMapper ticketRegistrationMapper;
+ private TicketRegistrationMapper ticketRegistrationMapper;
@Autowired
- private ProductRecordMapper productRecordMapper;
+ private ProductRecordMapper productRecordMapper;
@Autowired
- private PaymentRegistrationMapper paymentRegistrationMapper;
+ private PaymentRegistrationMapper paymentRegistrationMapper;
@Autowired
- private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
+ private InvoiceRegistrationProductMapper invoiceRegistrationProductMapper;
@Autowired
- private StringRedisTemplate redisTemplate;
+ private StringRedisTemplate redisTemplate;
@Autowired
- private QualityInspectMapper qualityInspectMapper;
+ private QualityInspectMapper qualityInspectMapper;
@Autowired
- private CommonFileServiceImpl commonFileService;
+ private CommonFileServiceImpl commonFileService;
@Autowired
- private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
+ private QualityTestStandardBindingMapper qualityTestStandardBindingMapper;
@Autowired
- private QualityTestStandardParamMapper qualityTestStandardParamMapper;
+ private QualityTestStandardParamMapper qualityTestStandardParamMapper;
@Autowired
- private QualityTestStandardMapper qualityTestStandardMapper;
+ private QualityTestStandardMapper qualityTestStandardMapper;
@Autowired
- private QualityInspectParamMapper qualityInspectParamMapper;
+ private QualityInspectParamMapper qualityInspectParamMapper;
@Autowired
- private ApproveProcessServiceImpl approveProcessService;
+ private ApproveProcessServiceImpl approveProcessService;
@Autowired
- private ProcurementRecordMapper procurementRecordStorageMapper;
+ private ProcurementRecordMapper procurementRecordStorageMapper;
@Autowired
- private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
+ private PurchaseLedgerTemplateMapper purchaseLedgerTemplateMapper;
@Autowired
- private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
+ private SalesLedgerProductTemplateMapper salesLedgerProductTemplateMapper;
@Autowired
private StockUtils stockUtils;
@Value("${file.upload-dir}")
@@ -209,7 +209,7 @@
// 4. 澶勭悊瀛愯〃鏁版嵁
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
- handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType(),supplierManage);
+ handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType(), supplierManage);
}
//涓嶅鎵�
if (productList != null) {
@@ -217,10 +217,10 @@
//鏄惁鎺ㄩ�佽川妫�锛屽鏋渢rue灏辨坊鍔�
if (saleProduct.getIsChecked()) {
addQualityInspect(purchaseLedger, saleProduct);
- }else{
+ } else {
//鐩存帴鍏ュ簱
stockUtils.addStock(saleProduct.getProductModelId(), saleProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
- purchaseLedger.getId(),saleProduct.getBatchNo(),saleProduct.getCustomer(),null);
+ purchaseLedger.getId(), saleProduct.getBatchNo(), saleProduct.getCustomer(), null);
}
}
}
@@ -245,12 +245,12 @@
qualityInspect.setUnit(saleProduct.getUnit());
qualityInspect.setQuantity(saleProduct.getQuantity());
qualityInspectMapper.insert(qualityInspect);
- List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0,null);
- if (qualityTestStandard.size()>0){
+ List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0, null);
+ if (!qualityTestStandard.isEmpty()) {
qualityInspect.setTestStandardId(qualityTestStandard.get(0).getId());
qualityInspectMapper.updateById(qualityInspect);
qualityTestStandardParamMapper.selectList(Wrappers.<QualityTestStandardParam>lambdaQuery()
- .eq(QualityTestStandardParam::getTestStandardId,qualityTestStandard.get(0).getId()))
+ .eq(QualityTestStandardParam::getTestStandardId, qualityTestStandard.get(0).getId()))
.forEach(qualityTestStandardParam -> {
QualityInspectParam param = new QualityInspectParam();
com.ruoyi.common.utils.bean.BeanUtils.copyProperties(qualityTestStandardParam, param);
@@ -261,7 +261,7 @@
}
}
- private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type,SupplierManage supplierManage) {
+ private void handleSalesLedgerProducts(Long salesLedgerId, List<SalesLedgerProduct> products, Integer type, SupplierManage supplierManage) {
if (products == null || products.isEmpty()) {
throw new BaseException("浜у搧淇℃伅涓嶅瓨鍦�");
}
@@ -428,12 +428,12 @@
@Transactional(rollbackFor = Exception.class)
public int deletePurchaseLedgerByIds(Long[] ids) {
if (ids == null || ids.length == 0) {
- throw new BaseException("璇烽�変腑鑷冲皯涓�鏉℃暟鎹�");
+ throw new BaseException("璇烽�変腑鑷冲皯涓�鏉℃暟鎹�");
}
for (Long id : ids) {
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
if (purchaseLedger.getApprovalStatus().equals(3)) {
- throw new BaseException(purchaseLedger.getPurchaseContractNumber()+"宸茬粡瀹℃壒閫氳繃锛屼笉鍏佽鍒犻櫎");
+ throw new BaseException(purchaseLedger.getPurchaseContractNumber() + "宸茬粡瀹℃壒閫氳繃锛屼笉鍏佽鍒犻櫎");
}
}
// 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐叆搴撹褰�
@@ -456,11 +456,11 @@
salesLedgerProductMapper.delete(queryWrapper);
// 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐彴璐︾殑鏉ョエ鐧昏
LambdaQueryWrapper<TicketRegistration> ticketRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
- ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getPurchaseLedgerId,ids);
+ ticketRegistrationLambdaQueryWrapper.in(TicketRegistration::getPurchaseLedgerId, ids);
ticketRegistrationMapper.delete(ticketRegistrationLambdaQueryWrapper);
// 鎵归噺鍒犻櫎鍏宠仈鐨勯噰璐彴璐︾殑鏉ョエ鐧昏璁板綍
LambdaQueryWrapper<ProductRecord> productRecordLambdaQueryWrapper = new LambdaQueryWrapper<>();
- productRecordLambdaQueryWrapper.in(ProductRecord::getPurchaseLedgerId,ids);
+ productRecordLambdaQueryWrapper.in(ProductRecord::getPurchaseLedgerId, ids);
productRecordMapper.delete(productRecordLambdaQueryWrapper);
// 鎵归噺鍒犻櫎浠樻鐧昏
LambdaQueryWrapper<PaymentRegistration> paymentRegistrationLambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -472,7 +472,7 @@
List<QualityInspect> qualityInspects = qualityInspectMapper.selectList(materialInspectLambdaQueryWrapper);
qualityInspects.stream().forEach(qualityInspect -> {
- if (ObjectUtils.isNotEmpty(qualityInspect.getInspectState())&&qualityInspect.getInspectState().equals(1)) {
+ if (ObjectUtils.isNotEmpty(qualityInspect.getInspectState()) && qualityInspect.getInspectState().equals(1)) {
throw new BaseException("宸叉彁浜ょ殑妫�楠屽崟涓嶈兘鍒犻櫎");
}
});
@@ -488,7 +488,7 @@
// 鍒犻櫎閲囪喘瀹℃壒璁板綍
for (Long id : ids) {
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(id);
- if(purchaseLedger != null){
+ if (purchaseLedger != null) {
ApproveProcess one = approveProcessService.getOne(new LambdaQueryWrapper<ApproveProcess>()
.eq(ApproveProcess::getApproveType, 5)
.eq(ApproveProcess::getApproveDelete, 0)
@@ -533,7 +533,7 @@
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId())
- .eq(CommonFile::getType,FileNameType.PURCHASE.getValue());
+ .eq(CommonFile::getType, FileNameType.PURCHASE.getValue());
List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper);
// 4. 杞崲 DTO
@@ -684,7 +684,7 @@
// 渚涘簲鍟嗘暟鎹�
List<SupplierManage> customers = supplierManageMapper.selectList(new LambdaQueryWrapper<SupplierManage>().in(SupplierManage::getSupplierName,
salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getSupplierName).collect(Collectors.toList())));
- List<Map<String,Object>> list = productModelMapper.getProductAndModelList();
+ List<Map<String, Object>> list = productModelMapper.getProductAndModelList();
// 褰曞叆浜烘暟鎹�
List<SysUser> sysUsers = sysUserMapper.selectList(new LambdaQueryWrapper<SysUser>().in(SysUser::getNickName,
salesLedgerImportDtoList.stream().map(PurchaseLedgerImportDto::getRecorderName).collect(Collectors.toList())));
@@ -692,7 +692,7 @@
PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectOne(new LambdaQueryWrapper<PurchaseLedger>()
.eq(PurchaseLedger::getPurchaseContractNumber, salesLedgerImportDto.getPurchaseContractNumber())
.last("limit 1"));
- if(purchaseLedger != null){
+ if (purchaseLedger != null) {
continue;
}
PurchaseLedger salesLedger = new PurchaseLedger();
@@ -719,12 +719,12 @@
throw new RuntimeException("閲囪喘鍗曞彿:" + salesLedgerImportDto.getPurchaseContractNumber() + ",鏃犲搴斾骇鍝佹暟鎹紒");
salesLedger.setContractAmount(salesLedgerProductImportDtos.stream()
.map(PurchaseLedgerProductImportDto::getTaxInclusiveTotalPrice)
- .reduce(BigDecimal.ZERO,BigDecimal::add));
+ .reduce(BigDecimal.ZERO, BigDecimal::add));
// 閫氳繃閿�鍞崟鍙风粦瀹氶攢鍞�
SalesLedger salesLedger1 = salesLedgerMapper.selectOne(new LambdaQueryWrapper<SalesLedger>()
.eq(SalesLedger::getSalesContractNo, salesLedger.getSalesContractNo())
.last("LIMIT 1"));
- if(salesLedger1 != null){
+ if (salesLedger1 != null) {
salesLedger.setSalesLedgerId(salesLedger1.getId());
}
// 閲囪喘瀹℃牳
@@ -745,6 +745,24 @@
for (PurchaseLedgerProductImportDto salesLedgerProductImportDto : salesLedgerProductImportDtos) {
SalesLedgerProduct salesLedgerProduct = new SalesLedgerProduct();
+ // 鏌ヨ浜у搧
+ Product product = productMapper.selectOne(new LambdaQueryWrapper<Product>()
+ .eq(Product::getProductName, salesLedgerProductImportDto.getProductCategory()));
+ if (product == null) {
+ throw new RuntimeException("璇风淮鎶や骇鍝侊細" + salesLedgerProductImportDto.getProductCategory());
+ }
+ // 鏌ヨ浜у搧鍨嬪彿
+ ProductModel productModel = productModelMapper.selectOne(new LambdaQueryWrapper<ProductModel>()
+ .eq(ProductModel::getProductId, product.getId())
+ .eq(ProductModel::getModel, salesLedgerProductImportDto.getSpecificationModel())
+ .eq(ProductModel::getUidNo, salesLedgerProductImportDto.getUidNo()));
+ if (productModel == null) {
+ throw new RuntimeException("璇风淮鎶や骇鍝併��" + salesLedgerProductImportDto.getProductCategory() + "銆戠殑鍨嬪彿銆�"
+ + salesLedgerProductImportDto.getSpecificationModel() + "銆戝拰UID鐮併��"
+ + salesLedgerProductImportDto.getUidNo() + "銆�");
+ }
+ salesLedgerProduct.setProductModelId(productModel.getId());
+ salesLedgerProduct.setProductId(product.getId());
BeanUtils.copyProperties(salesLedgerProductImportDto, salesLedgerProduct);
salesLedgerProduct.setSalesLedgerId(salesLedger.getId());
salesLedgerProduct.setType(2);
@@ -764,21 +782,25 @@
salesLedgerProduct.setApproveStatus(0);
salesLedgerProduct.setPendingTicketsTotal(salesLedgerProductImportDto.getTaxInclusiveTotalPrice());
// 鏄惁璐ㄦ鍒ゆ柇
+ if (salesLedgerProductImportDto.getIsChecked() == null) {
+ throw new RuntimeException("璇峰～鍐欐槸鍚﹁川妫�锛�");
+ }
salesLedgerProduct.setIsChecked(salesLedgerProductImportDto.getIsChecked() == 1);
- if(salesLedgerProductImportDto.getIsChecked() == 1){
+ if (salesLedgerProductImportDto.getIsChecked() == 1) {
addQualityInspect(salesLedger, salesLedgerProduct);
+ } else {
+ //鐩存帴鍏ュ簱
+ stockUtils.addStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockInQualifiedRecordTypeEnum.PURCHASE_STOCK_IN.getCode(),
+ salesLedger.getId(), salesLedgerProduct.getBatchNo(), salesLedger.getSupplierName(), LocalDate.now());
}
salesLedgerProductMapper.insert(salesLedgerProduct);
}
- // 閲囪喘瀹℃牳
- addApproveByPurchase(loginUser,salesLedger);
}
return AjaxResult.success("瀵煎叆鎴愬姛");
} catch (Exception e) {
- e.printStackTrace();
+ throw new RuntimeException(e.getMessage());
}
- return AjaxResult.success("瀵煎叆澶辫触");
}
@Override
@@ -807,7 +829,7 @@
return resultDto;
}
- public void addApproveByPurchase(LoginUser loginUser,PurchaseLedger purchaseLedger) throws Exception {
+ public void addApproveByPurchase(LoginUser loginUser, PurchaseLedger purchaseLedger) throws Exception {
ApproveProcessVO approveProcessVO = new ApproveProcessVO();
approveProcessVO.setApproveType(5);
approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
index 2c95909..c9d71d7 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductImportDto.java
@@ -1,12 +1,9 @@
package com.ruoyi.sales.dto;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
import java.math.BigDecimal;
-import java.util.Date;
/**
* @author :yys
@@ -32,6 +29,18 @@
private String specificationModel;
/**
+ * 鎵瑰彿
+ */
+ @Excel(name = "鎵瑰彿")
+ private String batchNo;
+
+ /**
+ * UID鐮�
+ */
+ @Excel(name = "UID鐮�")
+ private String uniNo;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
index b0e8b50..90b74f7 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerProductServiceImpl.java
@@ -285,7 +285,7 @@
List<ProcessRoute> processRoutes = processRouteMapper.selectList(new QueryWrapper<ProcessRoute>().lambda()
.eq(ProcessRoute::getProductModelId, salesLedgerProduct.getProductModelId())
.orderByDesc(ProcessRoute::getCreateTime));
- if (processRoutes.size()>0){
+ if (!processRoutes.isEmpty()){
ProcessRoute processRoute = processRoutes.get(0);
//鏂板鐢熶骇璁㈠崟宸ヨ壓璺嚎涓昏〃
ProductProcessRoute productProcessRoute = new ProductProcessRoute();
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..78c7daa 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
diff --git a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
index d336e60..711c961 100644
--- a/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
+++ b/src/main/resources/mapper/sales/SalesLedgerProductMapper.xml
@@ -5,15 +5,22 @@
<mapper namespace="com.ruoyi.sales.mapper.SalesLedgerProductMapper">
<select id="selectSalesLedgerProductList" resultType="com.ruoyi.sales.pojo.SalesLedgerProduct">
+ WITH stock_summary AS (
+ SELECT
+ product_model_id,
+ SUM(qualitity) AS total_quantity,
+ SUM(locked_quantity) AS total_locked
+ FROM stock_inventory
+ GROUP BY product_model_id
+ )
SELECT
T1.*,
CASE
- WHEN (IFNULL(t2.qualitity, 0) - IFNULL(t2.locked_quantity, 0)) >= IFNULL(T1.quantity, 0) THEN 1
+ WHEN (IFNULL(s.total_quantity, 0) - IFNULL(s.total_locked, 0)) >= IFNULL(T1.quantity, 0) THEN 1
ELSE 0
END as has_sufficient_stock
- FROM
- sales_ledger_product T1
- LEFT JOIN stock_inventory t2 ON T1.product_model_id = t2.product_model_id
+ FROM sales_ledger_product T1
+ LEFT JOIN stock_summary s ON T1.product_model_id = s.product_model_id
<where>
<if test="salesLedgerProduct.salesLedgerId != null">
AND T1.sales_ledger_id = #{salesLedgerProduct.salesLedgerId}
diff --git "a/src/main/resources/static/\351\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\351\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 7c08b61..cfeb0c4 100644
--- "a/src/main/resources/static/\351\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\351\207\207\350\264\255\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
diff --git "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx" "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
index 9558711..ecb0c1a 100644
--- "a/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
+++ "b/src/main/resources/static/\351\224\200\345\224\256\345\217\260\350\264\246\345\257\274\345\205\245\346\250\241\346\235\277.xlsx"
Binary files differ
--
Gitblit v1.9.3