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/ShippingInfoDetail.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/pojo/ShippingInfoDetail.java b/src/main/java/com/ruoyi/sales/pojo/ShippingInfoDetail.java
index e5ee5cb..9482e48 100644
--- a/src/main/java/com/ruoyi/sales/pojo/ShippingInfoDetail.java
+++ b/src/main/java/com/ruoyi/sales/pojo/ShippingInfoDetail.java
@@ -31,7 +31,16 @@
 @ApiModel(value = "ShippingInfoDetail瀵硅薄", description = "鍙戣揣鏄庣粏琛�")
 public class ShippingInfoDetail implements Serializable {
 
+    @ApiModelProperty(value = "搴撲綅")
+    private String stockLocation;
+
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 閫�璐ф暟閲�
+     */
+    @TableField(exist = false)
+    private BigDecimal returnTotal = BigDecimal.ZERO;
 
     @TableField(exist = false)
     private List<String> tempFileIds;
@@ -90,7 +99,7 @@
     @ApiModelProperty("鍙戣揣绫诲瀷")
     private String type;
 
-    @ApiModelProperty("鐘舵��")
+    @ApiModelProperty("鐘舵�� 宸查��璐�")
     private String status;
 
     @ApiModelProperty("鍙戣揣鏁伴噺")

--
Gitblit v1.9.3