From f2c7576cbd050824ec78233483e06fc375382bfb Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 02 四月 2026 17:04:03 +0800
Subject: [PATCH] yys 1.客户档案导入-维护人，维护时间默认当前 2.销售报价审核非必填，产品选择方式也要改 3.销售产品增加物料号字段 4.产品维护增加录入时间，修改时间 6.发货审核不需要了 7.BI的生产核算分析不要了，增加生产订单当前工序 3.库存导入模板规格改成图纸编号，产品名称可以为空，加个库位 4.库存管理外购改为标准件 5.bom产品唯一 6.产品根据bom计算子项数量（只统计二级）
---
src/main/java/com/ruoyi/basic/pojo/ProductModel.java | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 55 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
index 69abd9e..1ccd863 100644
--- a/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
+++ b/src/main/java/com/ruoyi/basic/pojo/ProductModel.java
@@ -1,8 +1,14 @@
package com.ruoyi.basic.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.sales.pojo.CommonFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
@Data
@TableName("product_model")
@@ -10,28 +16,76 @@
private static final long serialVersionUID = 1L;
+ @ApiModelProperty(value = "閿欒淇℃伅")
+ @TableField(exist = false)
+ private String errorMsg;
+
+ @TableField(exist = false)
+ private List<CommonFile> SalesLedgerFiles;
+
/**
* 搴忓彿
*/
@TableId(type = IdType.AUTO)
private Long id;
+ @ApiModelProperty(value = "宸ヨ壓璺嚎id")
+ private Long routeId;
+
/**
* 鍏宠仈浜у搧id
*/
+ @Excel(name = "鍏宠仈浜у搧id")
private Long productId;
+
+ @TableField(exist = false)
+ @Excel(name = "浜у搧鍚嶇О")
+ private String productName;
/**
* 瑙勬牸鍨嬪彿
*/
+ @Excel(name = "鍥剧焊缂栧彿")
private String model;
/**
* 鍗曚綅
*/
+ @Excel(name = "鍗曚綅")
private String unit;
+
+ /**
+ * 鐢熶骇鐐掓満
+ */
+ @Excel(name = "鐢熶骇鐐掓満")
+ private String speculativeTradingName;
@ApiModelProperty(value = "绉熸埛ID")
@TableField(fill = FieldFill.INSERT)
- private Integer tenantId;
+ private Long tenantId;
+ @TableField(exist = false)
+ @Excel(name = "鍏ュ簱鏁伴噺")
+ private BigDecimal inboundNum;
+ @TableField(exist = false)
+ @Excel(name = "鍑哄簱鏁伴噺")
+ private BigDecimal outboundNum;
+ @TableField(exist = false)
+ @Excel(name = "鍓╀綑搴撳瓨")
+ private BigDecimal stockQuantity;
+
+ @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
+ @Excel(name = "瑙勬牸鍨嬪彿")
+ private String drawingNumber;
+
+ @ApiModelProperty(value = "浜у搧绫诲瀷(1-鐗╂枡,2-浜у搧)")
+ private Integer productType;
+
+ @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @TableField(fill = FieldFill.INSERT)
+ private LocalDateTime createTime;
+
+ @ApiModelProperty(value = "淇敼鏃堕棿")
+ @TableField(fill = FieldFill.INSERT_UPDATE)
+ private LocalDateTime updateTime;
+
}
--
Gitblit v1.9.3