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/warehouse/pojo/WarehouseGoodsShelvesRowcol.java | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
index 60c255d..4372314 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/WarehouseGoodsShelvesRowcol.java
@@ -1,9 +1,7 @@
package com.ruoyi.warehouse.pojo;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -19,6 +17,7 @@
@Data
@ApiModel(value = "浠撳簱璐ф灦灞傦紝鍒楄〃")
public class WarehouseGoodsShelvesRowcol implements Serializable {
+
private static final long serialVersionUID = 1L;
/**
*
@@ -29,12 +28,14 @@
/**
* 灞傛暟
*/
- private Long storey;
+ @TableField("`row`")
+ private Long row;
/**
* 鍒楁暟
*/
- private Long arrange;
+ @TableField("`col`")
+ private Long col;
/**
* 璐ф灦id
@@ -44,26 +45,31 @@
/**
* 鍒涘缓鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT)
private LocalDateTime createTime;
/**
* 鍒涘缓鐢ㄦ埛
*/
- private Long createUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer createUser;
/**
* 淇敼鏃堕棿
*/
+ @TableField(fill = FieldFill.INSERT_UPDATE)
private LocalDateTime updateTime;
/**
* 淇敼鐢ㄦ埛
*/
- private Long updateUser;
+ @TableField(fill = FieldFill.INSERT)
+ private Integer updateUser;
/**
* 绉熸埛ID
*/
+ @TableField(fill = FieldFill.INSERT)
private Long tenantId;
/**
* 澶囨敞
--
Gitblit v1.9.3