From 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java | 41 ++++++++++++++++++++++++-----------------
1 files changed, 24 insertions(+), 17 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
index 3db4abe..19ccd83 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerProductImportDto.java
@@ -1,7 +1,6 @@
package com.ruoyi.purchase.dto;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.sales.dto.SalesLedgerProductImportDto;
import lombok.Data;
import java.math.BigDecimal;
@@ -17,16 +16,6 @@
private String purchaseContractNumber;
/**
- * 棰勮鏁伴噺
- */
- @Excel(name = "搴撳瓨棰勮鏁伴噺")
- private BigDecimal warnNum;
-
- @Excel(name = "閿�鍞崟鍙�")
- private String salesContractNo;
-
-
- /**
* 浜у搧澶х被
*/
@Excel(name = "浜у搧澶х被")
@@ -39,16 +28,22 @@
private String specificationModel;
/**
+ * UID鐮�
+ */
+ @Excel(name = "UID鐮�")
+ private String uidNo;
+
+ /**
+ * 鎵规鍙�
+ */
+ @Excel(name = "鎵规鍙�")
+ private String batchNo;
+
+ /**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
private String unit;
-
- /**
- * 鏁伴噺
- */
- @Excel(name = "鏁伴噺")
- private BigDecimal quantity;
/**
* 绋庣巼
@@ -63,6 +58,12 @@
private BigDecimal taxInclusiveUnitPrice;
/**
+ * 鏁伴噺
+ */
+ @Excel(name = "鏁伴噺")
+ private BigDecimal quantity;
+
+ /**
* 鍚◣鎬讳环
*/
@Excel(name = "鍚◣鎬讳环")
@@ -75,6 +76,12 @@
private String invoiceType;
/**
+ * 棰勮鏁伴噺
+ */
+ @Excel(name = "搴撳瓨棰勮鏁伴噺")
+ private BigDecimal warnNum;
+
+ /**
* 鏄惁璐ㄦ
*/
@Excel(name = "鏄惁璐ㄦ", readConverterExp = "0=鍚�,1=鏄�")
--
Gitblit v1.9.3