From f4c288c55d08c04cd026508b358beebfcdce5fc2 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 22 五月 2026 09:29:09 +0800
Subject: [PATCH] feat(product): 添加产品型号向下复制功能并优化生产报工重量计算 - 在ProductController中新增downCopy接口实现产品型号批量复制功能 - 将ProductionProductMainDto中的bomInputQty字段重命名为inputWeight - 在ProductionProductMainServiceImpl中添加JSON解析逻辑支持从otherData中提取投入重量 - 新增resolveInputWeight、findParameterValue、findFieldValue等工具方法处理复杂参数解析 - 为ProductModelDto添加targetProductId字段用于指定复制目标 - 修复销售台账按调度员ID和姓名分组的SQL查询问题 - 优化库存服务中剩余数量计算的空值处理逻辑 - 完善生产投料数量为空时的默认值处理机制
---
src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
index 242072e..bcfc20d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/SealApplicationManagementController.java
@@ -4,9 +4,11 @@
import com.ruoyi.approve.pojo.KnowledgeBase;
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import com.ruoyi.collaborativeApproval.service.SealApplicationManagementService;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysNoticeService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
@@ -15,6 +17,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.Arrays;
import java.util.List;
@AllArgsConstructor
@@ -25,6 +28,9 @@
@Autowired
private SealApplicationManagementService sealApplicationManagementService;
+ @Autowired
+ private ISysNoticeService sysNoticeService;
+
@GetMapping("/getList")
@ApiOperation("鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, SealApplicationManagement sealApplicationManagement){
@@ -34,7 +40,14 @@
@PostMapping("/add")
@ApiOperation("鏂板")
public AjaxResult add(@RequestBody SealApplicationManagement sealApplicationManagement){
- return AjaxResult.success(sealApplicationManagementService.save(sealApplicationManagement));
+ sealApplicationManagementService.save(sealApplicationManagement);
+ //娑堟伅閫氱煡
+ sysNoticeService.simpleNoticeByUser("鐢ㄥ嵃瀹℃壒",
+ "鐢宠缂栧彿锛�"+sealApplicationManagement.getApplicationNum()+"\t"
+ +"鐢宠鏍囬锛�"+sealApplicationManagement.getTitle(),
+ Arrays.asList(sealApplicationManagement.getApproveUserId()),
+ "/collaborativeApproval/sealManagement?applicationNum="+sealApplicationManagement.getApplicationNum());
+ return AjaxResult.success();
}
@PostMapping("/update")
--
Gitblit v1.9.3