From a76e1d17d67641993dea6335cb8e1465a94df58d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 21 五月 2026 15:39:05 +0800
Subject: [PATCH] feat(stock): 优化库存管理和成品树结构功能 1- 为ApproveProcessMapper.xml和ProductBomMapper.xml添加排序功能 2- 在ProductionProductMainDto中新增bomInputQty字段用于产品结构投入数量 3- 修改ProductionProductMainServiceImpl中投入数量计算逻辑，使用前端传入的bomInputQty值 4- 在ProductWorkOrderDto中添加bomInputQty字段并在服务实现中计算标准投入数量 5- 更新SalesLedgerMapper.xml查询逻辑，从product_summary获取电压信息 6- 为SalesLedgerProduct添加stockId字段并修改库存扣减逻辑使用具体库存ID 7- 重构StockInventoryController中的成品库存树查询接口和导入导出功能 8- 新增成品和非成品库存导入导出的数据模型和Excel工具类 9- 优化StockInventoryServiceImpl中的库存扣减逻辑，支持按特定库存ID操作 10- 更新库存导入导出功能，区分成品和非成品类型并提供相应模板
---
src/main/java/com/ruoyi/project/system/domain/SysNotice.java | 100 ++++++++++++++++++++------------------------------
1 files changed, 40 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java b/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
index 635e691..b88a57c 100644
--- a/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
+++ b/src/main/java/com/ruoyi/project/system/domain/SysNotice.java
@@ -2,21 +2,30 @@
import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
import com.ruoyi.common.xss.Xss;
import com.ruoyi.framework.web.domain.BaseEntity;
+import java.time.LocalDateTime;
+
/**
* 閫氱煡鍏憡琛� sys_notice
- *
+ *
* @author ruoyi
*/
-public class SysNotice extends BaseEntity
+@Data
+@TableName("sys_notice")
+public class SysNotice
{
private static final long serialVersionUID = 1L;
/** 鍏憡ID */
+ @TableId(value = "notice_id", type = IdType.AUTO)
private Long noticeId;
/** 鍏憡鏍囬 */
@@ -31,72 +40,43 @@
/** 鍏憡鐘舵�侊紙0姝ｅ父 1鍏抽棴锛� */
private String status;
- public Long getNoticeId()
- {
- return noticeId;
- }
+ /** 鍙戦�佷汉id */
+ private Long senderId;
- public void setNoticeId(Long noticeId)
- {
- this.noticeId = noticeId;
- }
+ /** 鏀朵欢浜篿d */
+ private Long consigneeId;
- public void setNoticeTitle(String noticeTitle)
- {
- this.noticeTitle = noticeTitle;
- }
+ /** 璺宠浆璺緞 */
+ private String jumpPath;
- @Xss(message = "鍏憡鏍囬涓嶈兘鍖呭惈鑴氭湰瀛楃")
- @NotBlank(message = "鍏憡鏍囬涓嶈兘涓虹┖")
- @Size(min = 0, max = 50, message = "鍏憡鏍囬涓嶈兘瓒呰繃50涓瓧绗�")
- public String getNoticeTitle()
- {
- return noticeTitle;
- }
+ /** APP璺宠浆璺緞 */
+ private String appJumpPath;
- public void setNoticeType(String noticeType)
- {
- this.noticeType = noticeType;
- }
+ /** 鍒涘缓鑰� */
+ @TableField(fill = FieldFill.INSERT)
+ private String createBy;
- public String getNoticeType()
- {
- return noticeType;
- }
+ /** 鍒涘缓鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
- public void setNoticeContent(String noticeContent)
- {
- this.noticeContent = noticeContent;
- }
+ /** 鏇存柊鑰� */
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private String updateBy;
- public String getNoticeContent()
- {
- return noticeContent;
- }
+ /** 鏇存柊鏃堕棿 */
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
- public void setStatus(String status)
- {
- this.status = status;
- }
+ /** 澶囨敞 */
+ private String remark;
- public String getStatus()
- {
- return status;
- }
+ /**
+ * 绉熸埛id
+ */
+ private Long tenantId;
- @Override
- public String toString() {
- return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
- .append("noticeId", getNoticeId())
- .append("noticeTitle", getNoticeTitle())
- .append("noticeType", getNoticeType())
- .append("noticeContent", getNoticeContent())
- .append("status", getStatus())
- .append("createBy", getCreateBy())
- .append("createTime", getCreateTime())
- .append("updateBy", getUpdateBy())
- .append("updateTime", getUpdateTime())
- .append("remark", getRemark())
- .toString();
- }
+
}
--
Gitblit v1.9.3