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/sales/pojo/SalesLedgerProduct.java |   30 +++++++++++++++++++++++++++---
 1 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
index 3966071..7515c2a 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProduct.java
@@ -23,7 +23,12 @@
 @TableName("sales_ledger_product")
 @Data
 public class SalesLedgerProduct implements Serializable {
+
     private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "搴撲綅")
+    @TableField(exist = false)
+    private String stockLocation;
 
     /**
      * 浜у搧淇℃伅涓婚敭
@@ -49,9 +54,9 @@
     private String productCategory;
 
     /**
-     * 瑙勬牸鍨嬪彿
+     * 鍥剧焊缂栧彿
      */
-    @Excel(name = "瑙勬牸鍨嬪彿")
+    @Excel(name = "鍥剧焊缂栧彿")
     private String specificationModel;
 
     /**
@@ -192,6 +197,14 @@
     @TableField(exist = false)
     private String shippingCarNumber;
 
+    @ApiModelProperty("蹇�掑叕鍙�")
+    @TableField(exist = false)
+    private String expressCompany;
+
+    @ApiModelProperty("蹇�掑崟鍙�")
+    @TableField(exist = false)
+    private String expressNumber;
+
     /**
      * 鍙戣揣鏃ユ湡
      */
@@ -202,7 +215,7 @@
 
     @TableField(exist = false)
     @ApiModelProperty(value = "鍙戣揣鐘舵��")
-    private String shippingStatus;
+    private String shippingStatus = "寰呭彂璐�";
     /**
      * 浜у搧鐘舵��
      */
@@ -227,4 +240,15 @@
 
     @TableField(exist = false)
     private Integer hasSufficientStock;
+
+    @ApiModelProperty(value = "鍙戣揣鏁伴噺")
+    @TableField(exist = false)
+    private BigDecimal shippingNum;
+
+    @ApiModelProperty(value = "閫�璐ф暟閲�")
+    @TableField(exist = false)
+    private BigDecimal returnNum;
+
+    @ApiModelProperty(value = "鐗╂枡鍙�")
+    private String material;
 }

--
Gitblit v1.9.3