From 1769107c38d40f7d209a48ab7752fe27a81b9709 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 14 四月 2026 17:48:18 +0800
Subject: [PATCH] fix:1.出库台账(删除出库记录查询结果有误)增加批号和供应商 2.出入库不合格管理加批号和供应商 3.发货以及发货记录(部分发货)

---
 src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index fef46ea..e01db26 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -90,7 +90,7 @@
     /**
      * 闄勪欢鏉愭枡璺緞鎴栧悕绉�
      */
-    @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
+//    @Excel(name = "闄勪欢鏉愭枡璺緞鎴栧悕绉�")
     private String attachmentMaterials;
 
     /**
@@ -151,6 +151,7 @@
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
     @ApiModelProperty("瀹℃壒鐘舵��  1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+    @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
     private Integer approvalStatus;
 
     @ApiModelProperty(value = "妯℃澘鍚嶇О")

--
Gitblit v1.9.3