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/collaborativeApproval/pojo/SealApplicationManagement.java | 14 ++++++++++++++
1 files changed, 14 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
index 6525fc3..4055f21 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/pojo/SealApplicationManagement.java
@@ -1,8 +1,11 @@
package com.ruoyi.collaborativeApproval.pojo;
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;
+import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -16,17 +19,20 @@
* 鐢宠缂栧彿
*/
@ApiModelProperty("鐢宠缂栧彿")
+ @Excel(name = "鐢宠缂栧彿")
private String applicationNum;
/**
* 鍏憡鏍囬
*/
@ApiModelProperty("鍏憡鏍囬")
+ @Excel(name = "鐢宠鏍囬")
private String title;
/**
* 鐢ㄥ嵃绫诲瀷
*/
@ApiModelProperty("鐢ㄥ嵃绫诲瀷")
+ @Excel(name = "鐢ㄥ嵃绫诲瀷", readConverterExp = "official=鍏珷,contract=鍚堝悓涓撶敤绔�,finance=璐㈠姟涓撶敤绔�,legal=娉曚汉绔�")
private String sealType;
/**
* 鐢宠鐢ㄥ嵃鍘熷洜
@@ -43,7 +49,13 @@
* 鐘舵��
*/
@ApiModelProperty("鐘舵��")
+ @Excel(name = "鐘舵��", readConverterExp = "pending=寰呭鎵�,approved=宸查�氳繃,rejected=宸叉嫆缁�")
private String status;
+
+ /**
+ * 瀹℃壒浜�
+ */
+ private Long approveUserId;
/**
* 鍒涘缓鑰�
*/
@@ -54,6 +66,8 @@
* 鍒涘缓鏃堕棿
*/
@TableField(fill = FieldFill.INSERT)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
/**
* 绉熸埛ID
--
Gitblit v1.9.3