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/SalesLedger.java |   25 ++++++++++++++++++-------
 1 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
index 84b3da6..672fe75 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedger.java
@@ -37,15 +37,9 @@
     /**
      * 瀹㈡埛鍚堝悓鍙�
      */
-    @Excel(name = "瀹㈡埛鍚堝悓鍙�")
+    @Excel(name = "瀹㈡埛鍚堝悓鍙�", type = Excel.Type.IMPORT)
     private String customerContractNo;
 
-    /**
-     * 鍙戣揣杞︾墝鍙�
-     */
-    @Excel(name = "鍙戣揣杞︾墝鍙�")
-    @TableField(exist = false)
-    private String shippingCarNumber;
 
     /**
      * 椤圭洰鍚嶇О
@@ -132,5 +126,22 @@
 
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "鐢熶骇鐘舵��")
+    private String productionStatus = "鏈紑濮�";
+
+    //浜よ揣鏃ユ湡
+    @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+    @TableField(value = "delivery_date")
+    private LocalDate deliveryDate;
+
+    @TableField(exist = false)
+    @ApiModelProperty(value = "浜よ揣澶╂暟宸�")
+    private Integer deliveryDaysDiff;
+
+    @TableField(exist = false)
+    //鏄惁鍙戣揣(鍙拌处椤甸潰棰滆壊鎺у埗)
+    private Boolean isFh;
 }
 

--
Gitblit v1.9.3