From ac6db1c4fddcb89c9668e34a35f023817a59f838 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 四月 2026 17:54:44 +0800
Subject: [PATCH] yys 1.产品导入新增excel错误提示 2.bom导入新增excel错误提示 3.仓储物流增加库位字段 4.修改发货出库-新增库位 5.修改采购入库审核-新增库位 6.生产入库-新增库位,审核

---
 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