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/basic/pojo/SupplierManage.java |   17 +++++++++++++++--
 1 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
index 3855879..aa33cbf 100644
--- a/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
+++ b/src/main/java/com/ruoyi/basic/pojo/SupplierManage.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -13,39 +14,51 @@
 public class SupplierManage {
 
     @TableId(value = "id", type = IdType.AUTO)
-    private Integer id;
+    private Long id;
 
     @ApiModelProperty(value = "渚涘簲鍟嗗悕绉�")
-
+    @Excel(name = "渚涘簲鍟嗗悕绉�")
     private String supplierName;
 
     @ApiModelProperty(value = "绾崇◣浜鸿瘑鍒彿")
+    @Excel(name = "绾崇◣浜鸿瘑鍒彿")
     private String taxpayerIdentificationNum;
 
     @ApiModelProperty(value = "鍏徃鍦板潃")
+    @Excel(name = "鍏徃鍦板潃")
     private String companyAddress;
 
     @ApiModelProperty(value = "鍏徃鐢佃瘽")
+    @Excel(name = "鍏徃鐢佃瘽")
     private String companyPhone;
 
     @ApiModelProperty(value = "寮�鎴疯")
+    @Excel(name = "寮�鎴疯")
     private String bankAccountName;
 
     @ApiModelProperty(value = "璐﹀彿")
+    @Excel(name = "璐﹀彿")
     private String bankAccountNum;
 
     @ApiModelProperty(value = "鑱旂郴浜�")
+    @Excel(name = "鑱旂郴浜�")
     private String contactUserName;
 
     @ApiModelProperty(value = "鑱旂郴鐢佃瘽")
+    @Excel(name = "鑱旂郴鐢佃瘽")
     private String contactUserPhone;
 
     @ApiModelProperty(value = "缁存姢浜篒D")
+    @Excel(name = "缁存姢浜�")
     private Integer maintainUserId;
 
     @ApiModelProperty(value = "缁存姢鏃堕棿")
     @JsonFormat(pattern = "yyyy-MM-dd")
+//    @Excel(name = "缁存姢鏃堕棿", width = 30, dateFormat = "yyyy-MM-dd")
     private LocalDate maintainTime;
+    @Excel(name = "鏄惁鐧藉悕鍗�")
+    @ApiModelProperty(value = "鏄惁鐧藉悕鍗曪紙0鏄� 1鍚︼級")
+    private Integer isWhite;
 
     @ApiModelProperty(value = "鍒涘缓鏃堕棿")
     @TableField(fill = FieldFill.INSERT)

--
Gitblit v1.9.3