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/dto/ShippingInfoDto.java |   24 ++++++++++++++++++++++++
 1 files changed, 24 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 3561c18..470c58e 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -7,6 +7,7 @@
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -15,6 +16,10 @@
  */
 @Data
 public class ShippingInfoDto extends ShippingInfo {
+
+    @ApiModelProperty(value = "搴撲綅")
+    @TableField(exist = false)
+    private String stockLocation;
 
     /**
      * 瀹℃壒浜篿d鍒楄〃
@@ -29,4 +34,23 @@
     @TableField(exist = false)
     private List<CommonFile> commonFileList;
 
+    /**
+     * 宸插彂璐ф暟閲�
+     */
+    private BigDecimal shippingSuccessTotal = BigDecimal.ZERO;
+
+    /**
+     * 寰呭彂璐ф暟閲�
+     */
+    private BigDecimal waitShippingTotal = BigDecimal.ZERO;
+
+    /**
+     * 閫�璐ф暟閲�
+     */
+    private BigDecimal returnTotal = BigDecimal.ZERO;
+
+    private String productCategory;
+
+    private String specificationModel;
+
 }

--
Gitblit v1.9.3