From acaf0e69a594f36ef9be6749c2b8d66e4ef6123b Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期五, 29 五月 2026 15:54:33 +0800
Subject: [PATCH] feat: 发货审批根据合同号合并到第一条(未审批)的记录中
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 86 ++++++++++++++++++++++++++++++++++--------
1 files changed, 69 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 2b7dba1..30b8b94 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.approve.mapper.ApproveProcessMapper;
+import com.ruoyi.approve.pojo.ApproveProcess;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.approve.vo.ApproveProcessVO;
import com.ruoyi.common.enums.FileNameType;
@@ -59,6 +60,8 @@
private ApproveProcessServiceImpl approveProcessService;
@Autowired
private StockUtils stockUtils;
+ @Autowired
+ private ISalesLedgerService salesLedgerService;
@GetMapping("/listPage")
@@ -74,24 +77,73 @@
@Log(title = "鍙戣揣淇℃伅绠＄悊", businessType = BusinessType.INSERT)
public AjaxResult add(@RequestBody ShippingInfoDto req) throws Exception {
LoginUser loginUser = SecurityUtils.getLoginUser();
- String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH","shipping_no");
- // 鍙戣揣瀹℃壒
- ApproveProcessVO approveProcessVO = new ApproveProcessVO();
- approveProcessVO.setApproveType(7);
- approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
- // 瀹℃壒鍘熷洜鏍煎紡锛氬彂璐у崟鍙�:{鍙戣揣绫诲瀷}:{鍙戣揣杞︾墝鍙穧
- String approveReason = "鍙戣揣鍗曞彿:" + sh + "\n" + req.getType();
- if ("璐ц溅".equals(req.getType()) && req.getShippingCarNumber() != null) {
- approveReason += ":" + req.getShippingCarNumber();
- } else if ("蹇��".equals(req.getType()) && req.getExpressCompany() != null) {
- approveReason += ":" + req.getExpressCompany();
+
+ // 鏌ヨ閿�鍞崟鍙�
+ String salesContractNo = "";
+ if (req.getSalesLedgerId() != null) {
+ SalesLedger salesLedger = salesLedgerService.getById(req.getSalesLedgerId());
+ if (salesLedger != null) {
+ salesContractNo = salesLedger.getSalesContractNo();
+ }
}
- approveProcessVO.setApproveReason(approveReason);
- approveProcessVO.setApproveUserIds(req.getApproveUserIds());
- approveProcessVO.setApproveUser(loginUser.getUserId());
- approveProcessVO.setApproveTime(LocalDate.now().toString());
- approveProcessService.addApprove(approveProcessVO);
- // 娣诲姞鍙戣揣娑堟伅
+
+ String sh = OrderUtils.countTodayByCreateTime(shippingInfoMapper, "SH", "shipping_no");
+
+ // 鏌ヨ璇ラ攢鍞悎鍚屼笅鏄惁鏈�"寰呭鏍�"鐨勫彂璐ц褰曪紝鐢ㄤ簬鍚堝苟瀹℃壒锛堥渶瀹℃壒浜虹浉鍚岋級
+ boolean shouldMergeApproval = false;
+ ApproveProcess existingApprove = null;
+ List<ShippingInfo> pendingShippings = shippingInfoMapper.selectList(
+ new LambdaQueryWrapper<ShippingInfo>()
+ .eq(ShippingInfo::getSalesLedgerId, req.getSalesLedgerId())
+ .eq(ShippingInfo::getStatus, "寰呭鏍�")
+ );
+ if (!CollectionUtils.isEmpty(pendingShippings) && salesContractNo != null && !salesContractNo.isEmpty()) {
+ // 鎵惧埌瀵瑰簲鐨勫鎵规祦绋嬶紙閫氳繃閿�鍞崟鍙峰尮閰嶏紝涓斿鎵逛汉鐩稿悓锛�
+ existingApprove = approveProcessService.getOne(
+ new LambdaQueryWrapper<ApproveProcess>()
+ .like(ApproveProcess::getApproveReason, "閿�鍞崟鍙�:" + salesContractNo)
+ .eq(ApproveProcess::getApproveType, 7) // 鍙戣揣瀹℃壒绫诲瀷
+ .eq(ApproveProcess::getApproveStatus, 0) // 寰呭鏍哥姸鎬�
+ .eq(ApproveProcess::getApproveUser, loginUser.getUserId()) // 瀹℃壒浜虹浉鍚�
+ .orderByDesc(ApproveProcess::getCreateTime)
+ .last("limit 1")
+ );
+ if (existingApprove != null) {
+ shouldMergeApproval = true;
+ }
+ }
+
+ // 鐢熸垚褰撳墠鍙戣揣淇℃伅鐨勬弿杩�
+ StringBuilder currentShippingDesc = new StringBuilder();
+ currentShippingDesc.append("鍙戣揣鍗曞彿:").append(sh);
+ if (salesContractNo != null && !salesContractNo.isEmpty()) {
+ currentShippingDesc.append("\n閿�鍞崟鍙�:").append(salesContractNo);
+ }
+ currentShippingDesc.append("\n").append(req.getType());
+ if ("璐ц溅".equals(req.getType()) && req.getShippingCarNumber() != null && !req.getShippingCarNumber().isEmpty()) {
+ currentShippingDesc.append(":").append(req.getShippingCarNumber());
+ } else if ("蹇��".equals(req.getType()) && req.getExpressCompany() != null && !req.getExpressCompany().isEmpty()) {
+ currentShippingDesc.append(":").append(req.getExpressCompany());
+ }
+
+ if (shouldMergeApproval && existingApprove != null) {
+ // 鍚堝苟瀹℃壒锛氬皢琚悎骞剁殑鍙戣揣鍗曞彿娣诲姞鍒板鎵瑰師鍥犱腑
+ String updatedReason = existingApprove.getApproveReason() + "\n\n" + currentShippingDesc.toString();
+ existingApprove.setApproveReason(updatedReason);
+ approveProcessService.updateById(existingApprove);
+ } else {
+ // 鍒涘缓鏂扮殑瀹℃壒娴佺▼
+ ApproveProcessVO approveProcessVO = new ApproveProcessVO();
+ approveProcessVO.setApproveType(7);
+ approveProcessVO.setApproveDeptId(loginUser.getCurrentDeptId());
+ approveProcessVO.setApproveReason(currentShippingDesc.toString());
+ approveProcessVO.setApproveUserIds(req.getApproveUserIds());
+ approveProcessVO.setApproveUser(loginUser.getUserId());
+ approveProcessVO.setApproveTime(LocalDate.now().toString());
+ approveProcessService.addApprove(approveProcessVO);
+ }
+
+ // 娣诲姞鍙戣揣璁板綍
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
boolean save = shippingInfoService.save(req);
--
Gitblit v1.9.3