From bd643b964b84a0be22437c04f0eee375a9623de8 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期二, 29 九月 2026 14:21:50 +0800
Subject: [PATCH] 天津-智科电子 1.协同办公-协同审批：采购及销售审批进入销售流程后也可预览在台账上传的附件
---
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 59 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 7ada625..43d47c8 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -2,10 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
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 com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -33,5 +36,61 @@
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;
+
+ private Long templateId;
+
+ private String templateName;
+
+ /**
+ * 琛屾潵婧愶細shipping=鍙戣揣鍗曪紝oilOut=閿�鍞被娌瑰搧鍑哄簱銆�
+ * 鍓嶇蹇呴』鎸夋瀛楁鍒ゅ埆锛宱ilOut 琛岀殑 id 涓� shipping_info.id 鍚屽煙浼氭挒鍙凤紝涓嶅彲鐢ㄤ簬鍙戣揣/鍒犻櫎/閫�璐ф帴鍙�
+ */
+ private String source;
+
+ /**
+ * 娌瑰搧鍑哄簱璁板綍id锛堜粎 source=oilOut 鏈夊�硷級
+ */
+ private Long stockOutRecordId;
+
+ /**
+ * 鍑哄簱渚у睍绀哄瓧娈碉紙浠� source=oilOut 鏈夊�硷級
+ */
+ private String outCategory;
+ private String tankNo;
+ private String oilProduct;
+ private String oilDepotName;
+ private String driverName;
+ private String contactPerson;
+ private String contactPhone;
+
+ /**
+ * 娌瑰搧鍑哄簱鐨勬壒鍙凤紙浠� source=oilOut 鏈夊�硷紝鍙栬嚜 stock_out_record.batch_no锛夈��
+ * 娉ㄦ剰涓� outboundBatches 鍖哄垎锛氬悗鑰呮槸 CK 鍑哄簱鍗曞彿锛屾瀛楁鏄壒娆″彿
+ */
+ private String outBatchNo;
+
+ /**
+ * 鎵瑰彿鏄庣粏锛堜粎 source=oilOut 鏈夊�硷級锛氫竴鏉℃补鍝佸嚭搴撳搴斾竴涓壒鍙凤紝
+ * 渚涘彂璐у彴璐﹁鎯呭脊妗嗙殑銆屾壒鍙枫�嶆槑缁嗚〃灞曠ず
+ */
+ @TableField(exist = false)
+ private List<ShippingProductDetailDto> batchNoList;
+
+ /**
+ * 鍒拌揣璁板綍瀛愯锛堜粎 source=oilOut 鏈夊�硷級锛氫竴娆″彂璐у彲浠ュ垎澶氳稛鍒拌揣锛�
+ * 鐖惰鏄补鍝佸嚭搴撳崟锛屽瓙琛屽氨鏄畠涓嬮潰鐨勫埌璐ц褰�
+ */
+ @TableField(exist = false)
+ private List<SalesLedgerArrivalDto> children;
}
--
Gitblit v1.9.3