From 633ec5aed640938430dba08b14b70b5fc3170dad Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 一月 2026 14:09:01 +0800
Subject: [PATCH] Merge branch 'dev_tide' into dev_tide_sbjkxt
---
src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java | 36 +++++-------------------------------
1 files changed, 5 insertions(+), 31 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
index 8952455..308b506 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerSchedulingProcessDto.java
@@ -1,7 +1,5 @@
package com.ruoyi.production.dto;
-import com.baomidou.mybatisplus.annotation.FieldFill;
-import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModel;
@@ -20,11 +18,8 @@
@ApiModel
public class SalesLedgerSchedulingProcessDto {
- @ApiModelProperty(value = "閿�鍞骇鍝両D")
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟ID")
private Long salesLedgerProductId;
-
- @ApiModelProperty(value = "閿�鍞彴璐D")
- private Long salesLedgerId;
@ApiModelProperty(value = "寮�濮嬫椂闂�")
private String entryDateStart;
@@ -38,38 +33,17 @@
private Long id;
/**
- * 閿�鍞悎鍚屽彿
+ * 鐢熶骇璁㈠崟鍙�
*/
- @Excel(name = "閿�鍞悎鍚屽彿")
- @ApiModelProperty(value = "閿�鍞悎鍚屽彿")
- private String salesContractNo;
-
- /**
- * 瀹㈡埛鍚堝悓鍙�
- */
- @Excel(name = "瀹㈡埛鍚堝悓鍙�")
- @ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
- private String customerContractNo;
-
- /**
- * 椤圭洰鍚嶇О
- */
- @Excel(name = "椤圭洰鍚嶇О")
- @ApiModelProperty(value = "椤圭洰鍚嶇О")
- private String projectName;
+ @Excel(name = "鐢熶骇璁㈠崟鍙�")
+ @ApiModelProperty(value = "鐢熶骇璁㈠崟鍙�")
+ private String orderNo;
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name = "娲惧伐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
@ApiModelProperty(value = "娲惧伐鏃ユ湡")
private Date schedulingDate;
-
- /**
- * 瀹㈡埛鍚嶇О
- */
- @Excel(name = "瀹㈡埛鍚嶇О")
- @ApiModelProperty(value = "瀹㈡埛鍚嶇О")
- private String customerName;
/**
--
Gitblit v1.9.3