From 99c61e2e4c5aabe594ff8a463a45f3a6b5cb9add Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 17:55:58 +0800
Subject: [PATCH] feat: 调整
---
src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java | 296 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 283 insertions(+), 13 deletions(-)
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 9d98126..ae8be33 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/ShippingInfoServiceImpl.java
@@ -4,27 +4,41 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.approve.mapper.ApproveProcessMapper;
import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.enums.FileNameType;
-import com.ruoyi.common.enums.StockQualifiedRecordTypeEnum;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.common.enums.StockOutQualifiedRecordTypeEnum;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.service.impl.TempFileServiceImpl;
import com.ruoyi.procurementrecord.utils.StockUtils;
+import com.ruoyi.project.system.domain.SysDept;
+import com.ruoyi.project.system.mapper.SysDeptMapper;
+import com.ruoyi.project.system.mapper.SysUserMapper;
+import com.ruoyi.sales.dto.SalesLedgerProductDto;
import com.ruoyi.sales.dto.ShippingInfoDto;
+import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.mapper.ShipmentApprovalMapper;
import com.ruoyi.sales.mapper.ShippingInfoMapper;
+import com.ruoyi.sales.pojo.SalesLedger;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
+import com.ruoyi.sales.pojo.ShipmentApproval;
import com.ruoyi.sales.pojo.ShippingInfo;
-import com.ruoyi.sales.service.ICommonFileService;
import com.ruoyi.sales.service.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
import java.util.Collections;
+import java.util.Date;
import java.util.List;
/**
@@ -50,10 +64,27 @@
@Autowired
private ApproveProcessServiceImpl approveProcessService;
- @Override
- public IPage<ShippingInfo> listPage(Page page, ShippingInfo req) {
- IPage<ShippingInfo> listPage = shippingInfoMapper.listPage(page, req);
+ @Autowired
+ private ApproveProcessMapper approveProcessMapper;
+ @Autowired
+ private ShipmentApprovalMapper shipmentApprovalMapper;
+
+ @Autowired
+ private SalesLedgerMapper salesLedgerMapper;
+
+ @Autowired
+ private SysUserMapper sysUserMapper;
+
+ @Autowired
+ private SysDeptMapper sysDeptMapper;
+
+ @Override
+ 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;
}
@@ -63,14 +94,17 @@
if (byId == null) {
throw new RuntimeException("鍙戣揣淇℃伅涓嶅瓨鍦�");
}
+ //鎵ｅ噺搴撳瓨
+ if(!"宸插彂璐�".equals(byId.getStatus())){
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(byId.getSalesLedgerProductId());
+ stockUtils.substractStock(salesLedgerProduct.getProductModelId(), salesLedgerProduct.getQuantity(), StockOutQualifiedRecordTypeEnum.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());
+ byId.setShippingDate(req.getShippingDate());
+ boolean update = this.updateById(byId);
// 杩佺Щ鏂囦欢
if(CollectionUtils.isNotEmpty(req.getTempFileIds())){
tempFileService.migrateTempFilesToFormal(req.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
@@ -82,11 +116,14 @@
public boolean delete(List<Long> ids) {
List<ShippingInfo> shippingInfos = shippingInfoMapper.selectList(new LambdaQueryWrapper<ShippingInfo>()
.in(ShippingInfo::getId, ids));
+ if(CollectionUtils.isEmpty(shippingInfos)) return false;
// 鍒犻櫎闄勪欢
commonFileService.deleteByBusinessIds(ids, FileNameType.SHIP.getValue());
- // 鎵ｅ簱瀛�
- for (Long id : ids) {
- stockUtils.deleteStockRecord(id, StockQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ // 鎵ｅ凡鍙戣揣搴撳瓨
+ for (ShippingInfo shippingInfo : shippingInfos) {
+ if("宸插彂璐�".equals(shippingInfo.getStatus())) {
+ stockUtils.deleteStockOutRecord(shippingInfo.getId(), StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode());
+ }
}
// 鍒犻櫎鍙戣揣瀹℃壒
if(CollectionUtils.isNotEmpty(shippingInfos)){
@@ -101,4 +138,237 @@
return this.removeBatchByIds(ids);
}
+
+ @Override
+ public List<SalesLedgerProductDto> getReturnManagementDtoById(Long shippingId) {
+ return shippingInfoMapper.getReturnManagementDtoById(shippingId );
+
+ }
+
+ @Override
+ public List<ShippingInfo> getShippingInfoByCustomerName(String customerName) {
+ return shippingInfoMapper.getShippingInfoByCustomerName(customerName);
+ }
+
+ /**
+ * 涓�閿彂璐� - 鑷姩瀹℃壒閫氳繃骞跺嚭搴�
+ * 鍒涘缓瀹℃壒璁板綍锛屾壒鍑嗕汉涓�"鏈堝厜"
+ */
+ @Override
+ @Transactional
+ public boolean oneClickShipping(ShippingInfoDto req) throws IOException {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+
+ // 鑾峰彇閿�鍞彴璐︿骇鍝佷俊鎭�
+ SalesLedgerProduct salesLedgerProduct = salesLedgerProductMapper.selectById(req.getSalesLedgerProductId());
+ if (salesLedgerProduct == null) {
+ throw new RuntimeException("閿�鍞骇鍝佷笉瀛樺湪");
+ }
+
+ // 鑾峰彇閿�鍞彴璐︿俊鎭�
+ SalesLedger salesLedger = salesLedgerMapper.selectById(req.getSalesLedgerId());
+
+ // 鏌ヨ"鏈堝厜"鐢ㄦ埛
+ com.ruoyi.project.system.domain.SysUser moonlightUser = sysUserMapper.selectOne(
+ new LambdaQueryWrapper<com.ruoyi.project.system.domain.SysUser>()
+ .eq(com.ruoyi.project.system.domain.SysUser::getNickName, "鏈堝厜")
+ .last("limit 1")
+ );
+
+ // 鐢熸垚鍙戣揣鍗曞彿
+ String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
+
+ // 鍒涘缓鍙戣揣璁板綍锛岀姸鎬佺洿鎺ヤ负"宸插彂璐�"
+ ShippingInfo shippingInfo = new ShippingInfo();
+ shippingInfo.setShippingNo(shippingNo);
+ shippingInfo.setSalesLedgerId(req.getSalesLedgerId());
+ shippingInfo.setSalesLedgerProductId(req.getSalesLedgerProductId());
+ shippingInfo.setType(req.getType());
+ shippingInfo.setShippingDate(req.getShippingDate());
+ shippingInfo.setShippingCarNumber(req.getShippingCarNumber());
+ shippingInfo.setExpressCompany(req.getExpressCompany());
+ shippingInfo.setExpressNumber(req.getExpressNumber());
+ shippingInfo.setStatus("宸插彂璐�");
+ boolean save = this.save(shippingInfo);
+
+ if (save) {
+ // 鍒涘缓瀹℃壒娴佺▼璁板綍锛岀姸鎬佷负瀹℃牳瀹屾垚(2)锛屾壒鍑嗕汉涓�"鏈堝厜"
+ String salesContractNo = salesLedger != null ? salesLedger.getSalesContractNo() : "";
+ StringBuilder approveReason = new StringBuilder();
+ approveReason.append("鍙戣揣鍗曞彿:").append(shippingNo);
+ if (salesContractNo != null && !salesContractNo.isEmpty()) {
+ approveReason.append("\n閿�鍞崟鍙�:").append(salesContractNo);
+ }
+ approveReason.append("\n").append(req.getType());
+ if ("璐ц溅".equals(req.getType()) && req.getShippingCarNumber() != null && !req.getShippingCarNumber().isEmpty()) {
+ approveReason.append(":").append(req.getShippingCarNumber());
+ } else if ("蹇��".equals(req.getType()) && req.getExpressCompany() != null && !req.getExpressCompany().isEmpty()) {
+ approveReason.append(":").append(req.getExpressCompany());
+ }
+
+ ApproveProcess approveProcess = new ApproveProcess();
+ String approveId = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(approveProcessMapper, "", "approve_id");
+ approveProcess.setApproveId(approveId);
+ approveProcess.setApproveUser(loginUser.getUserId());
+ approveProcess.setApproveUserName(loginUser.getNickName());
+ approveProcess.setApproveDeptId(loginUser.getCurrentDeptId());
+
+ SysDept sysDept = sysDeptMapper.selectDeptById(loginUser.getCurrentDeptId());
+
+ approveProcess.setApproveDeptName(sysDept.getDeptName());
+ approveProcess.setApproveReason(approveReason.toString());
+ approveProcess.setApproveUserIds(moonlightUser != null ? String.valueOf(moonlightUser.getUserId()) : "");
+ approveProcess.setApproveUserNames(moonlightUser != null ? moonlightUser.getNickName() : "鏈堝厜");
+ approveProcess.setApproveUserCurrentId(moonlightUser != null ? moonlightUser.getUserId() : null);
+ approveProcess.setApproveUserCurrentName(moonlightUser != null ? moonlightUser.getNickName() : "鏈堝厜");
+ approveProcess.setApproveStatus(2); // 瀹℃牳瀹屾垚
+ approveProcess.setApproveType(7); // 鍙戣揣瀹℃壒
+ approveProcess.setApproveDelete(0);
+ approveProcess.setApproveTime(new Date()); // 鐢宠鏃堕棿
+ approveProcess.setTenantId(loginUser.getCurrentDeptId());
+ approveProcess.setCreateTime(LocalDateTime.now());
+ approveProcess.setEndDate(new Date());
+ approveProcessService.save(approveProcess);
+
+ // 鐩存帴鎵ｅ噺搴撳瓨
+ stockUtils.substractStock(
+ salesLedgerProduct.getProductModelId(),
+ salesLedgerProduct.getQuantity(),
+ StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
+ shippingInfo.getId()
+ );
+
+ // 杩佺Щ闄勪欢
+ if (CollectionUtils.isNotEmpty(req.getTempFileIds())) {
+ tempFileService.migrateTempFilesToFormal(shippingInfo.getId(), req.getTempFileIds(), FileNameType.SHIP.getValue());
+ }
+ }
+
+ return save;
+ }
+
+ /**
+ * 鎵归噺涓�閿彂璐� - 灏嗛攢鍞彴璐︿笅鎵�鏈夋湭鍙戣揣鐨勪骇鍝佸叏閮ㄥ彂璐�
+ * 鍒涘缓瀹℃壒璁板綍锛屾壒鍑嗕汉涓�"鏈堝厜"
+ */
+ @Override
+ @Transactional
+ public boolean batchOneClickShipping(Long salesLedgerId, ShippingInfoDto req) throws IOException {
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+
+ // 鏌ヨ"鏈堝厜"鐢ㄦ埛
+ com.ruoyi.project.system.domain.SysUser moonlightUser = sysUserMapper.selectOne(
+ new LambdaQueryWrapper<com.ruoyi.project.system.domain.SysUser>()
+ .eq(com.ruoyi.project.system.domain.SysUser::getNickName, "鏈堝厜")
+ .last("limit 1")
+ );
+
+ // 鑾峰彇閿�鍞彴璐︿俊鎭�
+ SalesLedger salesLedger = salesLedgerMapper.selectById(salesLedgerId);
+ String salesContractNo = salesLedger != null ? salesLedger.getSalesContractNo() : "";
+
+ // 鏌ヨ璇ラ攢鍞彴璐︿笅鎵�鏈変骇鍝�
+ List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(
+ new LambdaQueryWrapper<SalesLedgerProduct>()
+ .eq(SalesLedgerProduct::getSalesLedgerId, salesLedgerId)
+ .eq(SalesLedgerProduct::getType, 1) // 閿�鍞被鍨�
+ );
+
+ if (CollectionUtils.isEmpty(products)) {
+ throw new RuntimeException("璇ラ攢鍞彴璐︿笅娌℃湁浜у搧");
+ }
+
+ // 杩囨护鍑烘湭鍙戣揣鐨勪骇鍝侊紙娌℃湁鍙戣揣璁板綍鎴栧彂璐х姸鎬佷笉鏄�"宸插彂璐�"锛�
+ List<SalesLedgerProduct> unshippedProducts = new ArrayList<>();
+ for (SalesLedgerProduct product : products) {
+ ShippingInfo existingShipping = shippingInfoMapper.selectOne(
+ new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerProductId, product.getId())
+ .eq(ShippingInfo::getStatus, "宸插彂璐�")
+ .last("limit 1")
+ );
+ if (existingShipping == null) {
+ unshippedProducts.add(product);
+ }
+ }
+
+ if (CollectionUtils.isEmpty(unshippedProducts)) {
+ throw new RuntimeException("璇ラ攢鍞彴璐︿笅鎵�鏈変骇鍝佸凡鍙戣揣");
+ }
+
+ // 鏀堕泦鎵�鏈夊彂璐у崟鍙风敤浜庡悎骞跺鎵�
+ StringBuilder allShippingNos = new StringBuilder();
+ for (SalesLedgerProduct product : unshippedProducts) {
+ // 鐢熸垚鍙戣揣鍗曞彿
+ String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
+
+ // 鍒涘缓鍙戣揣璁板綍
+ ShippingInfo shippingInfo = new ShippingInfo();
+ shippingInfo.setShippingNo(shippingNo);
+ shippingInfo.setSalesLedgerId(salesLedgerId);
+ shippingInfo.setSalesLedgerProductId(product.getId());
+ shippingInfo.setType(req.getType());
+ shippingInfo.setShippingDate(req.getShippingDate());
+ shippingInfo.setShippingCarNumber(req.getShippingCarNumber());
+ shippingInfo.setExpressCompany(req.getExpressCompany());
+ shippingInfo.setExpressNumber(req.getExpressNumber());
+ shippingInfo.setStatus("宸插彂璐�");
+
+ boolean save = this.save(shippingInfo);
+ if (save) {
+ // 鏀堕泦鍙戣揣鍗曞彿
+ if (allShippingNos.length() > 0) {
+ allShippingNos.append("\n");
+ }
+ allShippingNos.append("鍙戣揣鍗曞彿:").append(shippingNo);
+
+ // 鎵ｅ噺搴撳瓨
+ stockUtils.substractStock(
+ product.getProductModelId(),
+ product.getQuantity(),
+ StockOutQualifiedRecordTypeEnum.SALE_SHIP_STOCK_OUT.getCode(),
+ shippingInfo.getId()
+ );
+ }
+ }
+
+ // 鍒涘缓鍚堝苟鐨勫鎵规祦绋嬭褰�
+ if (allShippingNos.length() > 0) {
+ StringBuilder approveReason = new StringBuilder();
+ approveReason.append(allShippingNos.toString());
+ if (salesContractNo != null && !salesContractNo.isEmpty()) {
+ approveReason.append("\n閿�鍞崟鍙�:").append(salesContractNo);
+ }
+ approveReason.append("\n").append(req.getType());
+ if ("璐ц溅".equals(req.getType()) && req.getShippingCarNumber() != null && !req.getShippingCarNumber().isEmpty()) {
+ approveReason.append(":").append(req.getShippingCarNumber());
+ } else if ("蹇��".equals(req.getType()) && req.getExpressCompany() != null && !req.getExpressCompany().isEmpty()) {
+ approveReason.append(":").append(req.getExpressCompany());
+ }
+
+ ApproveProcess approveProcess = new ApproveProcess();
+ String approveId = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(approveProcessMapper, "", "approve_id");
+ approveProcess.setApproveId(approveId);
+ approveProcess.setApproveUser(loginUser.getUserId());
+ approveProcess.setApproveUserName(loginUser.getNickName());
+ approveProcess.setApproveDeptId(loginUser.getCurrentDeptId());
+ SysDept sysDept = sysDeptMapper.selectDeptById(loginUser.getCurrentDeptId());
+ approveProcess.setApproveDeptName(sysDept.getDeptName());
+ approveProcess.setApproveReason(approveReason.toString());
+ approveProcess.setApproveUserIds(moonlightUser != null ? String.valueOf(moonlightUser.getUserId()) : "");
+ approveProcess.setApproveUserNames(moonlightUser != null ? moonlightUser.getNickName() : "鏈堝厜");
+ approveProcess.setApproveUserCurrentId(moonlightUser != null ? moonlightUser.getUserId() : null);
+ approveProcess.setApproveUserCurrentName(moonlightUser != null ? moonlightUser.getNickName() : "鏈堝厜");
+ approveProcess.setApproveStatus(2); // 瀹℃牳瀹屾垚
+ approveProcess.setApproveType(7); // 鍙戣揣瀹℃壒
+ approveProcess.setApproveDelete(0);
+ approveProcess.setApproveTime(new Date()); // 鐢宠鏃堕棿
+ approveProcess.setTenantId(loginUser.getCurrentDeptId());
+ approveProcess.setCreateTime(LocalDateTime.now());
+ approveProcess.setEndDate(new Date());
+ approveProcessService.save(approveProcess);
+ }
+
+ return true;
+ }
}
--
Gitblit v1.9.3