From 00bc2f8702167b926a9fd639c3d2a49f0ddab5b3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 22 四月 2026 09:42:12 +0800
Subject: [PATCH] refactor(production): 将javax.servlet.http替换为jakarta.servlet.http
---
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 60 +++++++++++++++++-------------------------------------------
1 files changed, 17 insertions(+), 43 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..3817082 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -1,65 +1,39 @@
package com.ruoyi.production.dto;
-import com.alibaba.excel.annotation.ExcelIgnoreUnannotated;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.framework.aspectj.lang.annotation.Excel;
-import com.ruoyi.production.pojo.ProductionProductMain;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
@Data
-@ExcelIgnoreUnannotated
-public class ProductionProductMainDto extends ProductionProductMain {
- @ApiModelProperty(value = "宸ュ崟缂栧彿")
- @Excel(name = "宸ュ崟缂栧彿")
+public class ProductionProductMainDto {
+ private Long id;
+ private String productNo;
+ private Long userId;
+ private String userName;
+ private Long productProcessRouteItemId;
+ private Long workOrderId;
+ private Long productionOperationTaskId;
+ private Integer status;
+ private LocalDateTime createTime;
+ private LocalDateTime updateTime;
+ private Long tenantId;
+ private Integer createUser;
+ private Integer updateUser;
+ private Long deptId;
+
private String workOrderNo;
-
- @ApiModelProperty(value = "宸ュ崟鐘舵��")
private String workOrderStatus;
-
- @ApiModelProperty(value = "鎶ュ伐浜哄憳鏄电О")
- @Excel(name = "鎶ュ伐浜�")
private String nickName;
-
- @ApiModelProperty(value = "鎶ュ伐鏁伴噺")
- @Excel(name = "鎶ュ伐鏁伴噺")
private BigDecimal quantity;
-
- @ApiModelProperty(value = "鎶ュ簾鏁伴噺")
- @Excel(name = "鎶ュ簾鏁伴噺")
- private BigDecimal scrapQty = BigDecimal.ZERO;
-
- //浜у搧鍚嶇О
- @Excel(name = "浜у搧鍚嶇О")
+ private BigDecimal scrapQty;
private String productName;
-
- //浜у搧瑙勬牸鍨嬪彿
- @Excel(name = "浜у搧瑙勬牸鍨嬪彿")
private String productModelName;
-
- //鍗曚綅
- @Excel(name = "鍗曚綅")
private String unit;
-
- //閿�鍞悎鍚屽彿
- @Excel(name = "閿�鍞悎鍚屽彿")
private String salesContractNo;
-
- @JsonFormat(pattern = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate schedulingDate;
private String schedulingUserName;
private String customerName;
- //宸ュ簭
- @Excel(name = "宸ュ簭")
private String process;
- private BigDecimal workHours;
- private BigDecimal wages;
-
-
}
--
Gitblit v1.9.3