From 7b2233d1dab53574facc66b3bebffcd8ca5919de Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 21 三月 2026 14:27:19 +0800
Subject: [PATCH] yys 1.已退货完毕的出库单号不要展示在关联出库单中 2.退货管理唯一处理 3.生产订单-库存数量回显 4.发货管理回显退货数量 5.发货增加详情接口 6.生产核算清理脏数据 7.生产报工-删除生产报工记录报错 8.筛选客户名称数据展示有误
---
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index 838976d..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;
/**
@@ -150,12 +150,13 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
- @ApiModelProperty("瀹℃壒鐘舵��")
+ @ApiModelProperty("瀹℃壒鐘舵�� 1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触,5琛ㄧず鏄ā鏉�")
+ @Excel(name = "瀹℃壒鐘舵��", readConverterExp = "1=寰呭鏍�,2=瀹℃壒涓�,3=瀹℃壒閫氳繃,4=瀹℃壒澶辫触")
private Integer approvalStatus;
@ApiModelProperty(value = "妯℃澘鍚嶇О")
private String templateName;
@ApiModelProperty(value = "瀹℃壒浜篿d")
- private Integer approverId;
+ private String approveUserIds;
}
--
Gitblit v1.9.3