From da8d45df31aebdf0eda2c57155d1a915e2e1e89f Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期三, 26 十一月 2025 18:02:25 +0800
Subject: [PATCH] yys 1.生产管理逻辑修改
---
src/main/java/com/ruoyi/production/dto/DaiDto.java | 83 +++++++++++++----------------------------
1 files changed, 26 insertions(+), 57 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/DaiDto.java b/src/main/java/com/ruoyi/production/dto/DaiDto.java
index 86853cb..0760cdf 100644
--- a/src/main/java/com/ruoyi/production/dto/DaiDto.java
+++ b/src/main/java/com/ruoyi/production/dto/DaiDto.java
@@ -1,5 +1,6 @@
package com.ruoyi.production.dto;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
@@ -7,6 +8,7 @@
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
+import java.time.LocalDate;
import java.util.Date;
/**
@@ -19,92 +21,59 @@
@Excel(name = "寰呮帓鏁伴噺")
private BigDecimal daiNum;
- @ApiModelProperty(value = "閿�鍞骇鍝両D")
- private Long salesLedgerProductId;
-
- @ApiModelProperty(value = "閿�鍞彴璐D")
- private Long salesLedgerId;
-
/**
- * 閿�鍞悎鍚屽彿
+ * 鐢熶骇璁㈠崟鍙�
*/
- @Excel(name = "閿�鍞悎鍚屽彿")
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- /**
- * 瀹㈡埛鍚堝悓鍙�
- */
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
- private String customerContractNo;
-
- /**
- * 椤圭洰鍚嶇О
- */
- @Excel(name = "椤圭洰鍚嶇О")
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
- private String projectName;
-
- /**
- * 褰曞叆鏃ユ湡
- */
- @JsonFormat(pattern = "yyyy-MM-dd")
- @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
- @DateTimeFormat(pattern = "yyyy-MM-dd")
- @ApiModelProperty(value = "褰曞叆鏃ユ湡")
- private Date entryDate;
-
- @ApiModelProperty(value = "褰曞叆鏃ユ湡寮�濮�")
- private String entryDateStart;
-
- @ApiModelProperty(value = "褰曞叆鏃ユ湡缁撴潫")
- private String entryDateEnd;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Excel(name = "瀹㈡埛鍚嶇О")
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
- private String customerName;
-
+ @Excel(name = "鐢熶骇璁㈠崟鍙�")
+ private String orderNo;
/**
* 浜у搧澶х被
*/
@Excel(name = "浜у搧澶х被")
- @ApiModelProperty(value = "浜у搧澶х被")
private String productCategory;
/**
* 瑙勬牸鍨嬪彿
*/
@Excel(name = "瑙勬牸鍨嬪彿")
- @ApiModelProperty(value = "瑙勬牸鍨嬪彿")
private String specificationModel;
/**
* 鍗曚綅
*/
@Excel(name = "鍗曚綅")
- @ApiModelProperty(value = "鍗曚綅")
private String unit;
+
/**
* 鏁伴噺
*/
@Excel(name = "鏁伴噺")
- @ApiModelProperty(value = "鏁伴噺")
private BigDecimal quantity;
/**
- * 鎺掍骇鏁伴噺
+ * 璁㈠崟鐘舵��
*/
- @Excel(name = "鎺掍骇鏁伴噺")
- @ApiModelProperty(value = "鎺掍骇鏁伴噺")
- private BigDecimal schedulingNum;
+ @Excel(name = "璁㈠崟鐘舵��")
+ @TableField(exist = false)
+ private String status;
- @ApiModelProperty(value = "绉熸埛ID")
- private Long tenantId;
+ @ApiModelProperty(value = "瀹屽伐鏁伴噺")
+ @TableField(exist = false)
+ private BigDecimal successNum;
+
+ /**
+ * 褰曞叆鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
+ @Excel(name = "褰曞叆鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
+ private LocalDate registerDate;
+
+ /**
+ * 褰曞叆浜�
+ */
+ @Excel(name = "褰曞叆浜�")
+ private String createBy;
}
--
Gitblit v1.9.3