From 4635770544e2d57416ad88a8983ee293919f5fec Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 25 五月 2026 09:25:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java | 28 ++++++----------------------
1 files changed, 6 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
index 95ab518..1dbfb65 100644
--- a/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
+++ b/src/main/java/com/ruoyi/sales/controller/ShippingInfoController.java
@@ -2,10 +2,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.ruoyi.approve.bean.dto.ApprovalInstanceDto;
import com.ruoyi.approve.bean.vo.ApproveProcessVO;
-import com.ruoyi.approve.mapper.ApprovalTemplateMapper;
-import com.ruoyi.approve.service.ApprovalInstanceService;
import com.ruoyi.approve.service.impl.ApproveProcessServiceImpl;
import com.ruoyi.common.utils.OrderUtils;
import com.ruoyi.common.utils.SecurityUtils;
@@ -29,7 +26,6 @@
import java.io.IOException;
import java.time.LocalDate;
-import java.time.LocalDateTime;
import java.util.List;
/**
@@ -42,8 +38,6 @@
@AllArgsConstructor
public class ShippingInfoController extends BaseController {
- private final ApprovalTemplateMapper approvalTemplateMapper;
- private final ApprovalInstanceService approvalInstanceService;
private ShippingInfoService shippingInfoService;
private ApproveProcessServiceImpl approveProcessService;
private ShippingInfoMapper shippingInfoMapper;
@@ -71,25 +65,15 @@
approveProcessVO.setApproveUserIds(req.getApproveUserIds());
approveProcessVO.setApproveUser(loginUser.getUserId());
approveProcessVO.setApproveTime(LocalDate.now().toString());
- approveProcessService.addApprove(approveProcessVO);
-
- ApprovalInstanceDto approvalInstanceDto = new ApprovalInstanceDto();
- approvalInstanceDto.setTemplateId(req.getTemplateId());
- approvalInstanceDto.setBusinessId(req.getId());
- approvalInstanceDto.setBusinessType(7L);
- approvalInstanceDto.setTitle("鍙戣揣缂栧彿锛�" + sh);
- approvalInstanceDto.setApplicantId(SecurityUtils.getUserId());
- approvalInstanceDto.setTemplateId(req.getTemplateId());
- approvalInstanceDto.setTemplateName(approvalTemplateMapper.selectById(req.getTemplateId()).getTemplateName());
- approvalInstanceDto.setApplicantName(SecurityUtils.getLoginUser().getNickName());
- approvalInstanceDto.setApplyTime(LocalDateTime.now());
- approvalInstanceService.add(approvalInstanceDto);
-
- // 娣诲姞鍙戣揣娑堟伅
+ // 鍏堜繚瀛樺彂璐у崟锛屽啀鍙戣捣瀹℃壒锛涙棤瀹℃牳浜鸿嚜鍔ㄩ�氳繃鏃堕渶瑕佹寜鍙戣揣缂栧彿鍥炲啓鍙戣揣鐘舵�併��
req.setShippingNo(sh);
req.setStatus("寰呭鏍�");
boolean save = shippingInfoService.add(req);
- return save ? AjaxResult.success() : AjaxResult.error();
+ if (!save) {
+ return AjaxResult.error();
+ }
+ approveProcessService.addApprove(approveProcessVO);
+ return AjaxResult.success();
}
@Operation(summary = "鍙戣揣鎵ｅ簱瀛�")
--
Gitblit v1.9.3