From 730ff798f9926fe68600397e5abddbd3cbfd792c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 15 五月 2026 14:27:34 +0800
Subject: [PATCH] fix(mapper): 发货审批不通过时，待发货数量应保持不变，只有发货审批通过时，待发货数量会对应减少,审核不通过库存预留的出库记录也要删掉
---
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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..43409bc 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -1,12 +1,14 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
+import com.ruoyi.basic.dto.StorageBlobDTO;
+import com.ruoyi.basic.dto.StorageBlobVO;
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.ShippingInfo;
-import io.swagger.annotations.ApiModelProperty;
+import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -29,4 +31,21 @@
@TableField(exist = false)
private List<CommonFile> commonFileList;
+ private String specificationModel;
+
+ private String productName;
+
+ private List<StorageBlobDTO> storageBlobDTOs;
+ private List<StorageBlobVO> storageBlobVOs;
+
+ private List<Long> batchNo;
+ private List<ShippingProductDetail> batchNoDetailList;
+
+ //鍏宠仈鐨勫嚭搴撳崟鍙�
+ private String outboundBatches;
+
+ //鍙戣揣鏁伴噺
+ private BigDecimal totalQuantity;
+
+
}
--
Gitblit v1.9.3