From 02bab558061c36692ef0c7f0b63efb8f75297f6d Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期四, 29 一月 2026 14:52:18 +0800
Subject: [PATCH] yys 开票台账修改，发货台账修改，发货审核修改
---
src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java | 2 +-
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 16 ++++++++++------
src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java | 3 ++-
src/main/java/com/ruoyi/sales/service/ShippingInfoService.java | 2 +-
src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java | 8 ++++++++
src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java | 5 +++++
src/main/resources/mapper/sales/ShippingInfoMapper.xml | 2 +-
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 4 +---
8 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
index a47c49b..fb71d30 100644
--- a/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
+++ b/src/main/java/com/ruoyi/approve/service/impl/ApproveNodeServiceImpl.java
@@ -241,7 +241,7 @@
if(status.equals(2)){
shippingInfo.setStatus("瀹℃牳閫氳繃");
}else if(status.equals(3)){
- shippingInfo.setType("瀹℃牳鎷掔粷");
+ shippingInfo.setStatus("瀹℃牳鎷掔粷");
}else if(status.equals(1)){
shippingInfo.setStatus("瀹℃牳涓�");
}
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index a30adb9..0cf0797 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -64,7 +64,7 @@
@GetMapping("/listPage")
@ApiOperation("鍙戣揣淇℃伅鍒楄〃")
public AjaxResult listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoService.listPage(page,req);
+ IPage<ShippingInfoDto> listPage = shippingInfoService.listPage(page,req);
return AjaxResult.success(listPage);
}
@@ -96,8 +96,6 @@
@Transactional(rollbackFor = Exception.class)
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.UPDATE)
public AjaxResult deductStock(@RequestBody ShippingInfoDto req) throws IOException {
-
-
return shippingInfoService.deductStock( req) ? AjaxResult.success() : AjaxResult.error();
}
diff --git a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
index 88dec8a..9ab16d5 100644
--- a/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
+++ b/src/main/java/com/ruoyi/sales/mapper/ShippingInfoMapper.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.sales.dto.ShippingInfoDto;
import com.ruoyi.sales.pojo.ShippingInfo;
import org.apache.ibatis.annotations.Param;
@@ -13,7 +14,7 @@
* @date : 2025/10/22 9:32
*/
public interface ShippingInfoMapper extends BaseMapper<ShippingInfo> {
- IPage<ShippingInfo> listPage(Page page,@Param("req") ShippingInfo req);
+ IPage<ShippingInfoDto> listPage(Page page, @Param("req") ShippingInfo req);
List<ShippingInfo> listAll();
}
diff --git a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
index 81bcf6e..d9a3a8c 100644
--- a/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
+++ b/src/main/java/com/ruoyi/sales/service/ShippingInfoService.java
@@ -14,7 +14,7 @@
* @date : 2025/10/22 9:33
*/
public interface ShippingInfoService extends IService<ShippingInfo>{
- IPage<ShippingInfo> listPage(Page page, ShippingInfo req);
+ IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req);
boolean deductStock(ShippingInfoDto req) throws IOException;
diff --git a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
index 88b8e22..f3aac49 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/CommonFileServiceImpl.java
@@ -40,6 +40,11 @@
@Value("${file.upload-dir}")
private String uploadDir;
+ public List<CommonFile> getFileListByBusinessId(Long businessId,Integer type) {
+ return commonFileMapper.selectList(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, businessId)
+ .eq(CommonFile::getType, type));
+ }
+
public void deleteByBusinessId(Long businessId,Integer type) {
commonFileMapper.delete(new LambdaQueryWrapper<CommonFile>().eq(CommonFile::getCommonId, businessId)
.eq(CommonFile::getType, type));
diff --git a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
index 614fc20..d89119f 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/InvoiceLedgerServiceImpl.java
@@ -326,6 +326,14 @@
if(ObjectUtils.isEmpty(invoiceRegistrationProductDto)){
throw new RuntimeException("浜у搧寮�绁ㄥ彴璐︽煡鎵惧け璐�");
}
+ List<InvoiceRegistrationProduct> invoiceRegistrationProducts = invoiceRegistrationProductMapper.selectList(new LambdaQueryWrapper<InvoiceRegistrationProduct>()
+ .eq(InvoiceRegistrationProduct::getSalesLedgerProductId, invoiceRegistrationProductDto.getSalesLedgerProductId()));
+ if(CollectionUtils.isNotEmpty(invoiceRegistrationProducts)){
+ invoiceRegistrationProductDto.setNoInvoiceNum(invoiceRegistrationProductDto.getQuantity()
+ .subtract(invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getInvoiceNum).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ invoiceRegistrationProductDto.setNoInvoiceAmount(invoiceRegistrationProductDto.getTaxInclusiveTotalPrice()
+ .subtract(invoiceRegistrationProducts.stream().map(InvoiceRegistrationProduct::getInvoiceAmount).reduce(BigDecimal.ZERO, BigDecimal::add)));
+ }
// 鏌ヨ闄勪欢
QueryWrapper<InvoiceLedgerFile> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("invoice_ledger_id", invoiceRegistrationProductDto.getInvoiceLedgerId());
diff --git a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
index 3a5a0ab..3e2fdd5 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -49,9 +49,11 @@
private ApproveProcessServiceImpl approveProcessService;
@Override
- public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req);
-
+ public IPage<ShippingInfoDto> listPage(Page page, ShippingInfo req) {
+ IPage<ShippingInfoDto> listPage = shippingInfoMapper.listPage(page, req);
+ listPage.getRecords().forEach(item ->{
+ item.setCommonFileList(commonFileService.getFileListByBusinessId(item.getId(), FileNameType.SHIP.getValue()));
+ });
return listPage;
}
@@ -61,14 +63,16 @@
if (byId == null) {
throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
}
+ //鎵ｅ噺搴撳瓨
+ if(!"宸插彂璐�".equals(byId.getStatus())){
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
+ stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
+ }
byId.setExpressNumber(req.getExpressNumber());
byId.setExpressCompany(req.getExpressCompany());
byId.setStatus("宸插彂璐�");
byId.setShippingCarNumber(req.getShippingCarNumber());
boolean update = this.updateById(req);
- //鎵ｅ噺搴撳瓨
- SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
- stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(), req.getId());
// 杩佺Щ鏂囦欢
if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
diff --git a/src/main/resources/mapper/sales/ShippingInfoMapper.xml b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
index 34073ef..6026980 100644
--- a/src/main/resources/mapper/sales/ShippingInfoMapper.xml
+++ b/src/main/resources/mapper/sales/ShippingInfoMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.sales.mapper.ShippingInfoMapper">
- <select id="listPage" resultType="com.ruoyi.sales.pojo.ShippingInfo">
+ <select id="listPage" resultType="com.ruoyi.sales.dto.ShippingInfoDto">
SELECT
s.id,
s.sales_ledger_id,
--
Gitblit v1.9.3