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/production/controller/ProductParameterController.java | 10 ---------- 1 files changed, 0 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/ruoyi/production/controller/ProductParameterController.java b/src/main/java/com/ruoyi/production/controller/ProductParameterController.java index 1fbf219..ff0ce06 100644 --- a/src/main/java/com/ruoyi/production/controller/ProductParameterController.java +++ b/src/main/java/com/ruoyi/production/controller/ProductParameterController.java @@ -1,26 +1,16 @@ package com.ruoyi.production.controller; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.ruoyi.common.utils.poi.ExcelUtil; import com.ruoyi.framework.aspectj.lang.annotation.Log; import com.ruoyi.framework.aspectj.lang.enums.BusinessType; import com.ruoyi.framework.web.domain.AjaxResult; -import com.ruoyi.framework.web.domain.R; -import com.ruoyi.production.dto.ProductBomDto; import com.ruoyi.production.dto.ProductParameterDto; -import com.ruoyi.production.pojo.*; import com.ruoyi.production.service.ProductParameterService; -import io.swagger.annotations.ApiModelProperty; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; import java.util.List; -import java.util.ListResourceBundle; /** * <p> -- Gitblit v1.9.3