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 | 140 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 138 insertions(+), 2 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 f2b9555..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,17 +4,27 @@
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.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.ShippingInfoService;
import lombok.extern.slf4j.Slf4j;
@@ -24,8 +34,11 @@
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,6 +63,21 @@
@Autowired
private ApproveProcessServiceImpl approveProcessService;
+
+ @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) {
@@ -124,16 +152,28 @@
/**
* 涓�閿彂璐� - 鑷姩瀹℃壒閫氳繃骞跺嚭搴�
- * 涓嶅垱寤哄鎵规祦绋嬶紝鐩存帴鎵ｅ噺搴撳瓨
+ * 鍒涘缓瀹℃壒璁板綍锛屾壒鍑嗕汉涓�"鏈堝厜"
*/
@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");
@@ -152,6 +192,44 @@
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(),
@@ -171,10 +249,24 @@
/**
* 鎵归噺涓�閿彂璐� - 灏嗛攢鍞彴璐︿笅鎵�鏈夋湭鍙戣揣鐨勪骇鍝佸叏閮ㄥ彂璐�
+ * 鍒涘缓瀹℃壒璁板綍锛屾壒鍑嗕汉涓�"鏈堝厜"
*/
@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>()
@@ -204,7 +296,8 @@
throw new RuntimeException("璇ラ攢鍞彴璐︿笅鎵�鏈変骇鍝佸凡鍙戣揣");
}
- // 涓烘瘡涓湭鍙戣揣鐨勪骇鍝佸垱寤哄彂璐ц褰�
+ // 鏀堕泦鎵�鏈夊彂璐у崟鍙风敤浜庡悎骞跺鎵�
+ StringBuilder allShippingNos = new StringBuilder();
for (SalesLedgerProduct product : unshippedProducts) {
// 鐢熸垚鍙戣揣鍗曞彿
String shippingNo = com.ruoyi.common.utils.OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
@@ -223,6 +316,12 @@
boolean save = this.save(shippingInfo);
if (save) {
+ // 鏀堕泦鍙戣揣鍗曞彿
+ if (allShippingNos.length() > 0) {
+ allShippingNos.append("\n");
+ }
+ allShippingNos.append("鍙戣揣鍗曞彿:").append(shippingNo);
+
// 鎵ｅ噺搴撳瓨
stockUtils.substractStock(
product.getProductModelId(),
@@ -233,6 +332,43 @@
}
}
+ // 鍒涘缓鍚堝苟鐨勫鎵规祦绋嬭褰�
+ 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