From 382b1b105abacd983061a000674ba7da446407d2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 09:26:12 +0800
Subject: [PATCH] fix: 添加@EqualsAndHashCode注解
---
src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java | 2
src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java | 2
src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java | 2
src/main/java/com/ruoyi/account/pojo/AccountIncome.java | 2
src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java | 2
src/main/java/com/ruoyi/production/dto/ProductOrderDto.java | 2
src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java | 2
src/main/java/com/ruoyi/inspectiontask/dto/QrCodeDto.java | 2
src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java | 2
src/main/java/com/ruoyi/dto/WordDateDto.java | 2
src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java | 2
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java | 1
src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java | 2
src/main/java/com/ruoyi/warehouse/dto/DocumentationDto.java | 2
src/main/java/com/ruoyi/basic/pojo/CustomerRegions.java | 1
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java | 2
src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java | 2
src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingDraftVo.java | 2
src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 2
src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java | 2
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 2
src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java | 2
src/main/java/com/ruoyi/warehouse/dto/DocumentationReturnManagementDto.java | 2
src/main/java/com/ruoyi/warehouse/dto/DocumentClassificationDto.java | 2
src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java | 2
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcess.java | 1
src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java | 4
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 2
src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java | 2
src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java | 2
src/main/java/com/ruoyi/measuringinstrumentledger/dto/SparePartsDto.java | 2
src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java | 2
src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java | 2
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java | 2
src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java | 2
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 2
src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java | 2
src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java | 8 --
src/main/java/com/ruoyi/staff/dto/StaffContractDto.java | 2
src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java | 2
src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java | 2
src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java | 2
src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java | 2
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java | 2
src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcessBind.java | 1
src/main/java/com/ruoyi/collaborativeApproval/dto/RulesRegulationsManagementDTO.java | 2
src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java | 2
src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java | 2
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java | 2
src/main/java/com/ruoyi/basic/dto/ProductDto.java | 2
src/main/java/com/ruoyi/account/pojo/AccountExpense.java | 2
src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java | 2
src/main/java/com/ruoyi/collaborativeApproval/dto/StaffContactsPersonalDTO.java | 2
src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java | 2
src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java | 2
src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java | 2
src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java | 2
src/main/java/com/ruoyi/basic/dto/ProductModelDto.java | 2
src/main/java/com/ruoyi/oA/dto/OaProjectDto.java | 2
src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java | 2
src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java | 2
src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java | 2
src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java | 2
src/main/java/com/ruoyi/oA/dto/OaProjectPhaseDto.java | 2
src/main/java/com/ruoyi/inspectiontask/dto/TimingTaskDto.java | 2
src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingApplicationVo.java | 2
src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java | 2
src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java | 2
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 5 -
src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java | 2
src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java | 2
src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java | 2
src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java | 5 +
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 2
src/main/java/com/ruoyi/staff/vo/SearchSchedulingVo.java | 2
src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java | 2
src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java | 2
src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java | 2
src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java | 2
src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java | 2
src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java | 2
src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java | 2
src/main/java/com/ruoyi/production/dto/ProductBomDto.java | 2
src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java | 2
src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java | 2
src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java | 2
src/main/java/com/ruoyi/production/dto/ProductProcessDto.java | 2
src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java | 2
src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java | 2
90 files changed, 168 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java b/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java
index 728d9a7..e3cd5a3 100644
--- a/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java
+++ b/src/main/java/com/ruoyi/account/dto/SalesReceiptReturnDto.java
@@ -2,7 +2,9 @@
import com.ruoyi.account.pojo.SalesReceiptReturn;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SalesReceiptReturnDto extends SalesReceiptReturn {
}
diff --git a/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
index 698e0e1..407a9df 100644
--- a/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
+++ b/src/main/java/com/ruoyi/account/dto/SalesRefundAmountOrderDto.java
@@ -4,8 +4,10 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SalesRefundAmountOrderDto extends SalesRefundAmountOrder {
@ApiModelProperty("閫�璐у崟鍙�")
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
index cbb6eed..1680e5d 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
@@ -20,6 +21,7 @@
*/
@TableName(value = "account_expense")
@Data
+@EqualsAndHashCode(callSuper = true)
public class AccountExpense extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
index fee01ad..3dae2d0 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import javax.validation.constraints.NotBlank;
@@ -20,6 +21,7 @@
*/
@TableName(value = "account_income")
@Data
+@EqualsAndHashCode(callSuper = true)
public class AccountIncome extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
index dd35550..ab7bc80 100644
--- a/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
+++ b/src/main/java/com/ruoyi/aftersalesservice/dto/AfterSalesServiceNewDto.java
@@ -6,10 +6,12 @@
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class AfterSalesServiceNewDto extends AfterSalesService {
@ApiModelProperty("浜у搧鍨嬪彿ID鏁扮粍")
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductDto.java b/src/main/java/com/ruoyi/basic/dto/ProductDto.java
index 7b38d99..370a75c 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.basic.pojo.Product;
import com.ruoyi.basic.pojo.ProductModel;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductDto extends Product {
private List<ProductModel> productModelList;
diff --git a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
index 53b3b5d..5b00d0e 100644
--- a/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/ProductModelDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.production.dto.ProductStructureDto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductModelDto extends ProductModel {
private List<ProductStructureDto> productStructureList;
}
diff --git a/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java b/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java
index 17a7d71..827ca94 100644
--- a/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java
+++ b/src/main/java/com/ruoyi/basic/dto/StorageBlobDTO.java
@@ -2,8 +2,10 @@
import com.ruoyi.basic.pojo.StorageBlob;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StorageBlobDTO extends StorageBlob {
private String url;
diff --git a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
index 30044ad..62ea970 100644
--- a/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
+++ b/src/main/java/com/ruoyi/basic/dto/SupplierManageDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.basic.pojo.SupplierManage;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SupplierManageDto extends SupplierManage {
@ApiModelProperty(value = "缁存姢浜哄憳鍚嶇О")
diff --git a/src/main/java/com/ruoyi/basic/pojo/CustomerRegions.java b/src/main/java/com/ruoyi/basic/pojo/CustomerRegions.java
index a4bcc24..73ae0a9 100644
--- a/src/main/java/com/ruoyi/basic/pojo/CustomerRegions.java
+++ b/src/main/java/com/ruoyi/basic/pojo/CustomerRegions.java
@@ -19,7 +19,6 @@
* @since 2026-03-27
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("customer_regions")
@ApiModel(value = "CustomerRegions瀵硅薄", description = "瀹㈡埛鍦板尯琛�")
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java
index 4f3936f..40ece35 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/DutyPlanDTO.java
@@ -1,5 +1,6 @@
package com.ruoyi.collaborativeApproval.dto;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonFormat;
@@ -10,6 +11,7 @@
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DutyPlanDTO extends DutyPlan {
private List<String> tags;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
index e7db276..5d39815 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/NoticeDTO.java
@@ -2,8 +2,10 @@
import com.ruoyi.collaborativeApproval.pojo.Notice;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class NoticeDTO extends Notice {
private String CreateUserName;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/RulesRegulationsManagementDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/RulesRegulationsManagementDTO.java
index 61de2e9..aea33b4 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/RulesRegulationsManagementDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/RulesRegulationsManagementDTO.java
@@ -2,10 +2,12 @@
import com.ruoyi.collaborativeApproval.pojo.RulesRegulationsManagement;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class RulesRegulationsManagementDTO extends RulesRegulationsManagement {
/**
* 鍙戝竷浜哄鍚�
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
index 8dc8454..0317cb7 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/SealApplicationManagementDTO.java
@@ -2,8 +2,10 @@
import com.ruoyi.collaborativeApproval.pojo.SealApplicationManagement;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SealApplicationManagementDTO extends SealApplicationManagement {
private String createUserName;
//鎵�灞為儴闂�
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/dto/StaffContactsPersonalDTO.java b/src/main/java/com/ruoyi/collaborativeApproval/dto/StaffContactsPersonalDTO.java
index 29c1d50..8ab8601 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/dto/StaffContactsPersonalDTO.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/dto/StaffContactsPersonalDTO.java
@@ -3,8 +3,10 @@
import com.ruoyi.collaborativeApproval.pojo.StaffContactsPersonal;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffContactsPersonalDTO extends StaffContactsPersonal {
private String staffNo;
private String staffName;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingApplicationVo.java b/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingApplicationVo.java
index 04fbf46..927d56d 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingApplicationVo.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingApplicationVo.java
@@ -2,6 +2,7 @@
import com.ruoyi.dto.PageDto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author buhuazhen
@@ -9,6 +10,7 @@
* @email 3038525872@qq.com
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class SearchMeetingApplicationVo extends PageDto {
private String title;
private String applicant;
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingDraftVo.java b/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingDraftVo.java
index 6178e1d..5a96598 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingDraftVo.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/vo/SearchMeetingDraftVo.java
@@ -3,6 +3,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.dto.PageDto;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -14,6 +15,7 @@
* @email 3038525872@qq.com
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class SearchMeetingDraftVo extends PageDto {
private String title;
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
index aa1e0aa..ada9146 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceDefectRecordDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.device.pojo.DeviceDefectRecord;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DeviceDefectRecordDto extends DeviceDefectRecord {
@ApiModelProperty("璁惧鍚嶇О")
private String deviceName;
diff --git a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
index 75d9250..c3ad1b1 100644
--- a/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
+++ b/src/main/java/com/ruoyi/device/dto/DeviceLedgerDto.java
@@ -7,6 +7,7 @@
import com.ruoyi.dto.DateQueryDto;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -18,6 +19,7 @@
*/
@Data
@TableName("device_ledger")
+@EqualsAndHashCode(callSuper = true)
public class DeviceLedgerDto extends DateQueryDto {
/**
diff --git a/src/main/java/com/ruoyi/dto/WordDateDto.java b/src/main/java/com/ruoyi/dto/WordDateDto.java
index 09bd0be..33af829 100644
--- a/src/main/java/com/ruoyi/dto/WordDateDto.java
+++ b/src/main/java/com/ruoyi/dto/WordDateDto.java
@@ -2,12 +2,14 @@
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import lombok.EqualsAndHashCode;
/**
* @author :yys
* @date : 2025/11/5 14:34
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class WordDateDto extends StaffOnJob {
// 鍚堝悓鏃ユ湡鐩稿叧
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
index 87e3e61..6730095 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/InspectionTaskDto.java
@@ -5,10 +5,12 @@
import com.ruoyi.inspectiontask.pojo.InspectionTask;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class InspectionTaskDto extends InspectionTask {
// private List<StorageBlobDTO> storageBlobDTO;
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeDto.java
index 2badd86..8ef5700 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeDto.java
@@ -2,7 +2,9 @@
import com.ruoyi.inspectiontask.pojo.QrCode;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class QrCodeDto extends QrCode {
}
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java
index 4247330..32ff073 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/QrCodeScanRecordDto.java
@@ -5,10 +5,12 @@
import com.ruoyi.inspectiontask.pojo.QrCode;
import com.ruoyi.inspectiontask.pojo.QrCodeScanRecord;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class QrCodeScanRecordDto extends QrCodeScanRecord {
private QrCode qrCode;
diff --git a/src/main/java/com/ruoyi/inspectiontask/dto/TimingTaskDto.java b/src/main/java/com/ruoyi/inspectiontask/dto/TimingTaskDto.java
index ad26f89..4461ab3 100644
--- a/src/main/java/com/ruoyi/inspectiontask/dto/TimingTaskDto.java
+++ b/src/main/java/com/ruoyi/inspectiontask/dto/TimingTaskDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.inspectiontask.pojo.TimingTask;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class TimingTaskDto extends TimingTask {
private List<String> inspector;
diff --git a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
index 3994833..1b05f60 100644
--- a/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
+++ b/src/main/java/com/ruoyi/lavorissue/pojo/LaborIssue.java
@@ -7,8 +7,10 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
+import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
@@ -19,7 +21,8 @@
@Data
@TableName("labor_issue")
@ApiModel
-public class LaborIssue extends StartAndEndDateDto {
+@EqualsAndHashCode(callSuper = true)
+public class LaborIssue extends StartAndEndDateDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/SparePartsDto.java b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/SparePartsDto.java
index cf9ac86..ee74fff 100644
--- a/src/main/java/com/ruoyi/measuringinstrumentledger/dto/SparePartsDto.java
+++ b/src/main/java/com/ruoyi/measuringinstrumentledger/dto/SparePartsDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SparePartsDto extends SpareParts {
/**
* 澶囦欢鍒嗙被鐖跺悕绉�
diff --git a/src/main/java/com/ruoyi/oA/dto/OaProjectDto.java b/src/main/java/com/ruoyi/oA/dto/OaProjectDto.java
index 0f90faf..7bd44d0 100644
--- a/src/main/java/com/ruoyi/oA/dto/OaProjectDto.java
+++ b/src/main/java/com/ruoyi/oA/dto/OaProjectDto.java
@@ -5,10 +5,12 @@
import com.ruoyi.oA.pojo.OaProjectPhase;
import com.ruoyi.oA.pojo.OaProjectPhaseTask;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class OaProjectDto extends OaProject {
/**
* 璐熻矗浜哄悕绉�
diff --git a/src/main/java/com/ruoyi/oA/dto/OaProjectPhaseDto.java b/src/main/java/com/ruoyi/oA/dto/OaProjectPhaseDto.java
index 4ef163e..1d3cff7 100644
--- a/src/main/java/com/ruoyi/oA/dto/OaProjectPhaseDto.java
+++ b/src/main/java/com/ruoyi/oA/dto/OaProjectPhaseDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.oA.pojo.OaProjectPhase;
import com.ruoyi.oA.pojo.OaProjectPhaseTask;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class OaProjectPhaseDto extends OaProjectPhase {
private List<OaProjectPhaseTask> oaProjectPhaseTasks;
}
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
index 74b90c9..7ffa4fc 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnManagementDto.java
@@ -10,6 +10,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -20,6 +21,7 @@
* @date : 2025/9/17 10:28
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class ReturnManagementDto extends ReturnManagement {
diff --git a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
index 51cb040..a5ff3db 100644
--- a/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
+++ b/src/main/java/com/ruoyi/procurementrecord/dto/ReturnSaleProductDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.procurementrecord.pojo.ReturnSaleProduct;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ReturnSaleProductDto extends ReturnSaleProduct {
private String productName;
diff --git a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
index d2b6142..46fc68c 100644
--- a/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
+++ b/src/main/java/com/ruoyi/procurementrecord/service/impl/ReturnManagementServiceImpl.java
@@ -124,14 +124,6 @@
for (ReturnSaleProductDto returnSaleProduct : list) {
bigDecimal = bigDecimal.add(returnSaleProduct.getPrice());
salesRefundAmountOrder.setRefundedAmount(new BigDecimal(0));
- // 鏄惁鏈夎川閲忛棶棰�
- if (returnSaleProduct.getIsQuality() == 1) {
- // 鏈夎川閲忛棶棰橈紝鍏ヤ笉鍚堟牸搴�
- stockUtils.addUnStock(returnSaleProduct.getProductModelId(),returnSaleProduct.getNum(), StockInUnQualifiedRecordTypeEnum.RETURN_UNSTOCK_IN.getCode(),returnSaleProduct.getId());
- }else{
- // 鏃犺川閲忛棶棰橈紝鍏ュ悎鏍煎簱
- stockUtils.addStock(returnSaleProduct.getProductModelId(),returnSaleProduct.getNum(), StockInQualifiedRecordTypeEnum.RETURN_HE_IN.getCode(),returnSaleProduct.getId());
- }
}
salesRefundAmountOrder.setRefundAmount(bigDecimal);
salesRefundAmountOrder.setNotRefundedAmount(salesRefundAmountOrder.getRefundedAmount());
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
index 232a00c..f26837a 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.production.pojo.ProcessRoute;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProcessRouteDto extends ProcessRoute {
private Long productId;
diff --git a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
index 2319afd..d8efab2 100644
--- a/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProcessRouteItemDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.production.pojo.ProcessRouteItem;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProcessRouteItemDto extends ProcessRouteItem {
@ApiModelProperty(value = "宸ヨ壓璺嚎鍚嶇О")
diff --git a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
index ab695ca..037b7cf 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductBomDto.java
@@ -2,11 +2,13 @@
import com.ruoyi.production.pojo.ProductBom;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
//鍒嗛〉鏌ヨ鍥炴樉鏁版嵁
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductBomDto extends ProductBom {
//浜у搧鍚嶇О
diff --git a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
index dc2185a..5080ba9 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductOrderDto.java
@@ -6,6 +6,7 @@
import com.ruoyi.production.pojo.ProductOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -13,6 +14,7 @@
@Data
@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
public class ProductOrderDto extends ProductOrder {
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
index 7383a82..05eda4b 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessDto.java
@@ -4,10 +4,12 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
@ApiModel
+@EqualsAndHashCode(callSuper = true)
public class ProductProcessDto extends ProductProcess {
}
diff --git a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
index d6ec3f1..62bd2ff 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductProcessRouteItemDto.java
@@ -4,10 +4,12 @@
import com.ruoyi.production.pojo.ProductProcessRouteItem;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductProcessRouteItemDto extends ProductProcessRouteItem {
@ApiModelProperty(value = "宸ュ簭鍚嶇О")
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
index 13bb4a3..b6421e8 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductInputDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.production.pojo.ProductionProductInput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductionProductInputDto extends ProductionProductInput {
@ApiModelProperty(value = "鎶ュ伐鍗曞彿")
private String productNo;
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
index 9e5e121..63530c4 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductMainDto.java
@@ -6,6 +6,7 @@
import com.ruoyi.production.pojo.ProductionProductMain;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -14,6 +15,7 @@
@Data
@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
public class ProductionProductMainDto extends ProductionProductMain {
@ApiModelProperty(value = "宸ュ崟缂栧彿")
@Excel(name = "宸ュ崟缂栧彿")
diff --git a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
index f98cc80..035185c 100644
--- a/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
+++ b/src/main/java/com/ruoyi/production/dto/ProductionProductOutputDto.java
@@ -4,8 +4,10 @@
import com.ruoyi.production.pojo.ProductionProductOutput;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductionProductOutputDto extends ProductionProductOutput {
@ApiModelProperty(value = "鎶ュ伐鍗曞彿")
private String productNo;
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 8cb4d91..34ed7b1 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -18,6 +19,7 @@
@Data
@ApiModel
@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
/**
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
index 3e982e7..d118171 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerWorkDto.java
@@ -4,6 +4,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -14,6 +15,7 @@
*/
@Data
@ApiModel
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerWorkDto extends SalesLedgerProductDto{
private Long id;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
index 8a1099c..2224151 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductOrderServiceImpl.java
@@ -149,11 +149,11 @@
//濡傛灉宸茬粡寮�濮嬬敓浜�,涓嶈兘鍒犻櫎
//鏌ヨ鐢熶骇璁㈠崟涓嬬殑宸ュ崟
List<ProductWorkOrder> productWorkOrders = productWorkOrderMapper.selectList(Wrappers.<ProductWorkOrder>lambdaQuery().in(ProductWorkOrder::getProductOrderId, ids));
- if (productWorkOrders.size()>0){
+ if (!productWorkOrders.isEmpty()){
//鍒ゆ柇鏄惁鏈夋姤宸ユ暟鎹�
List<ProductionProductMain> productionProductMains = productionProductMainMapper.selectList(Wrappers.<ProductionProductMain>lambdaQuery()
.in(ProductionProductMain::getWorkOrderId, productWorkOrders.stream().map(ProductWorkOrder::getId).collect(Collectors.toList())));
- if (productionProductMains.size()>0){
+ if (!productionProductMains.isEmpty()){
throw new RuntimeException("鐢熶骇璁㈠崟宸茬粡寮�濮嬬敓浜�,涓嶈兘鍒犻櫎");
}
//鍒犻櫎宸ュ崟
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index fa34114..dca09c5 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -207,9 +207,6 @@
qualityInspectParamMapper.insert(param);
});
}
- }else {
- //鐩存帴鍏ュ簱
- stockUtils.addStock(productProcessRouteItem.getProductModelId(), productQty, StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode(), productionProductMain.getId());
}
/*鏇存柊宸ュ崟鍜岀敓浜ц鍗�*/
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(dto.getWorkOrderId());
@@ -332,8 +329,6 @@
.eq(ProductionProductInput::getProductMainId, productionProductMain.getId()));
//鍒犻櫎鎶ュ簾鐨勫叆搴撹褰�
stockUtils.deleteStockInRecord(productionProductMain.getId(), StockInUnQualifiedRecordTypeEnum.PRODUCTION_SCRAP.getCode());
- //鍒犻櫎涓嶉渶瑕佽川妫�鐨勫悎鏍煎叆搴�
- stockUtils.deleteStockInRecord(productionProductMain.getId(), StockInQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_IN.getCode());
//鍒犻櫎鎶曞叆瀵瑰簲鐨勫嚭搴撹褰�
stockUtils.deleteStockOutRecord(productionProductMain.getId(), StockOutQualifiedRecordTypeEnum.PRODUCTION_REPORT_STOCK_OUT.getCode());
// 鍒犻櫎涓昏〃
diff --git a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
index 0bf2406..b4869c8 100644
--- a/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
+++ b/src/main/java/com/ruoyi/project/system/domain/vo/SysUserDeptVo.java
@@ -5,10 +5,12 @@
import com.ruoyi.project.system.domain.SysUserDept;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.time.LocalDateTime;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SysUserDeptVo extends SysUserDept {
private String deptName;
diff --git a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
index a93b483..42ad9ec 100644
--- a/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
+++ b/src/main/java/com/ruoyi/projectManagement/dto/RoleDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.projectManagement.pojo.Roles;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class RoleDto extends Roles {
// 鏄惁浣跨敤绯荤粺缂栧彿
@ApiModelProperty("鏄惁浣跨敤绯荤粺缂栧彿")
diff --git a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
index 8d56648..9da043b 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PaymentRegistrationDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.purchase.pojo.PaymentRegistration;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
+@EqualsAndHashCode(callSuper = true)
public class PaymentRegistrationDto extends PaymentRegistration {
// 鏌ヨ鍒楄〃鏌ヨ鐢ㄤ緵搴斿晢鍙峰拰鍚堝悓鍙�
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
index 1b3c691..efea97a 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -4,11 +4,13 @@
import com.ruoyi.purchase.pojo.ProductRecord;
import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ProductRecordDto extends ProductRecord {
private Long ticketRegistrationId;
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
index f915051..cc198ab 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerImportDto.java
@@ -4,6 +4,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.Date;
@@ -12,6 +13,7 @@
* @date : 2026/1/26 16:01
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class PurchaseLedgerImportDto extends PurchaseLedgerProductImportDto{
@Excel(name = "閲囪喘鍗曞彿")
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
index c0b98e6..f0436fc 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class PurchaseReturnOrderDto extends PurchaseReturnOrders {
// 鏄惁浣跨敤绯荤粺鍗曞彿
private Boolean isDefaultNo;
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java
index c89c151..af914b7 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderProductsDto.java
@@ -2,8 +2,10 @@
import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class PurchaseReturnOrderProductsDto extends PurchaseReturnOrderProducts {
private String productName;
diff --git a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
index 59f1da3..b5243eb 100644
--- a/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/TicketRegistrationDto.java
@@ -8,6 +8,7 @@
import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDate;
@@ -19,6 +20,7 @@
@Data
@TableName("ticket_registration")
+@EqualsAndHashCode(callSuper = true)
public class TicketRegistrationDto extends TicketRegistration {
/**
diff --git a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java
index fb02943..6e19958 100644
--- a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java
+++ b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java
@@ -3,11 +3,13 @@
import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
@Data
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
public class PurchaseReturnOrderVo extends PurchaseReturnOrders {
//渚涘簲鍟嗗悕绉�
private String supplierName;
diff --git a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
index 9bd4ca9..c58529b 100644
--- a/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
+++ b/src/main/java/com/ruoyi/quality/dto/QualityInspectDto.java
@@ -8,6 +8,7 @@
import com.ruoyi.quality.pojo.QualityInspectParam;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -18,6 +19,7 @@
//璐ㄩ噺妫�楠屾柊澧炵紪杈戝弬鏁�
@Data
+@EqualsAndHashCode(callSuper = true)
public class QualityInspectDto extends QualityInspect implements Serializable {
//妫�楠岄」鐩�
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index bf34478..96454e1 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -19,6 +20,7 @@
*/
@TableName(value = "quality_inspect")
@Data
+@EqualsAndHashCode(callSuper = true)
public class QualityInspect extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 4d80c5a..668cf9f 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
@@ -19,6 +20,7 @@
*/
@TableName(value = "quality_unqualified")
@Data
+@EqualsAndHashCode(callSuper = true)
public class QualityUnqualified extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
index 3d2c2e0..e5fe967 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHazardRecordDto.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -16,6 +17,7 @@
import java.time.LocalDateTime;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SafeHazardRecordDto extends SafeHazardRecord {
@ApiModelProperty("棰嗙敤浜�")
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
index fedb6a0..24faa20 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeHiddenDto.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -15,6 +16,7 @@
import java.time.LocalDateTime;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SafeHiddenDto extends SafeHidden {
@ApiModelProperty("涓婃姤浜�")
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
index 0eb6da5..4deed35 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDetailsDto.java
@@ -6,6 +6,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;
@@ -14,6 +15,7 @@
import java.time.LocalDateTime;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SafeTrainingDetailsDto extends SafeTrainingDetails {
@ApiModelProperty("鍩硅浜哄憳缂栧彿")
diff --git a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
index 0b8d7cd..835ad65 100644
--- a/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
+++ b/src/main/java/com/ruoyi/safe/dto/SafeTrainingDto.java
@@ -5,10 +5,12 @@
import com.ruoyi.safe.pojo.SafeTrainingFile;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SafeTrainingDto extends SafeTraining {
@ApiModelProperty("鎶ュ悕浜烘暟")
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
index c638ebb..bb8f660 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceLedgerDto.java
@@ -5,6 +5,7 @@
import com.ruoyi.sales.pojo.InvoiceLedger;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.time.LocalDate;
@@ -12,6 +13,7 @@
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class InvoiceLedgerDto extends InvoiceLedger {
private List<FileVo> fileList;
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
index 05e8509..6081b01 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationDto.java
@@ -4,11 +4,13 @@
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class InvoiceRegistrationDto extends InvoiceRegistration {
@ApiModelProperty(name = "寮�绁ㄧ櫥璁颁骇鍝侀泦鍚�")
diff --git a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
index 23fe6b4..61c50b0 100644
--- a/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/InvoiceRegistrationProductDto.java
@@ -8,6 +8,7 @@
import com.ruoyi.sales.pojo.InvoiceRegistrationProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -16,6 +17,7 @@
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class InvoiceRegistrationProductDto extends InvoiceRegistrationProduct {
@ApiModelProperty(name = "瀹㈡埛鍚堝悓鍙�")
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index 1afb02c..91b477a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -6,6 +6,7 @@
import com.ruoyi.sales.pojo.ReceiptPayment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
@@ -13,6 +14,7 @@
import java.util.Date;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ReceiptPaymentDto extends ReceiptPayment {
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index 2f2b385..46551c8 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -19,7 +19,7 @@
* @date : 2026/1/19 9:50
*/
@Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerImportDto extends SalesLedgerProductImportDto {
@Excel(name = "閿�鍞崟鍙�")
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java
index 4032ebd..37be557 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProcessRouteDto.java
@@ -17,7 +17,7 @@
* @since 2026/03/27 9:54
*/
@Data
-@EqualsAndHashCode(callSuper = false)
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerProcessRouteDto extends SalesLedgerProcessRoute {
@ApiModelProperty("宸ヨ壓璺嚎ID")
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
index 89c32c3..3831d47 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerProductDto.java
@@ -5,11 +5,13 @@
import com.ruoyi.sales.pojo.SalesLedgerProductProcess;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SalesLedgerProductDto extends SalesLedgerProduct {
/**
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
index 2f40bdd..6a0b428 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesQuotationDto.java
@@ -4,10 +4,12 @@
import com.ruoyi.sales.pojo.SalesQuotationProduct;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class SalesQuotationDto extends SalesQuotation {
@ApiModelProperty(value = "鎶ヤ环鍟嗗搧")
private List<SalesQuotationProduct> products;
diff --git a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
index 2319d85..dea76a2 100644
--- a/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java
@@ -6,6 +6,7 @@
import com.ruoyi.sales.pojo.ShippingInfo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
import java.util.List;
@@ -15,6 +16,7 @@
* @date : 2026/1/23 16:35
*/
@Data
+@EqualsAndHashCode(callSuper = true)
public class ShippingInfoDto extends ShippingInfo {
/**
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
index 9bdd439..2ef0091 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProcessRoute.java
@@ -20,7 +20,6 @@
* @since 2026-03-26
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("sales_ledger_process_route")
@ApiModel(value = "SalesLedgerProcessRoute瀵硅薄", description = "閿�鍞鍗曠粦瀹氱殑宸ヨ壓璺嚎")
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcess.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcess.java
index 5c1ff36..de0bd6f 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcess.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcess.java
@@ -24,7 +24,6 @@
* @since 2026-03-25
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("sales_ledger_product_process")
@ApiModel(value = "SalesLedgerProductProcess瀵硅薄", description = "閿�鍞骇鍝佸姞宸ユ槑缁�")
diff --git a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcessBind.java b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcessBind.java
index 5690b94..36f4381 100644
--- a/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcessBind.java
+++ b/src/main/java/com/ruoyi/sales/pojo/SalesLedgerProductProcessBind.java
@@ -19,7 +19,6 @@
* @since 2026-03-25
*/
@Data
-@EqualsAndHashCode(callSuper = false)
@Accessors(chain = true)
@TableName("sales_ledger_product_process_bind")
@ApiModel(value="SalesLedgerProductProcessBind瀵硅薄", description="閿�鍞骇鍝侀澶栧姞宸ユ暟閲�")
diff --git a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
index ccb9da4..8ab6d6a 100644
--- a/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/PersonalAttendanceRecordsDto.java
@@ -6,6 +6,7 @@
import com.ruoyi.staff.pojo.PersonalAttendanceRecords;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.time.LocalDateTime;
@@ -13,6 +14,7 @@
@Data
@ExcelIgnoreUnannotated
+@EqualsAndHashCode(callSuper = true)
public class PersonalAttendanceRecordsDto extends PersonalAttendanceRecords {
@Excel(name = "濮撳悕", sort = 3)
private String staffName;
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffContractDto.java b/src/main/java/com/ruoyi/staff/dto/StaffContractDto.java
index 3d74c67..44cbc53 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffContractDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffContractDto.java
@@ -2,8 +2,10 @@
import com.ruoyi.staff.pojo.StaffContract;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffContractDto extends StaffContract {
private String staffName;
}
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
index 3685410..d71f206 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffLeaveDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffLeave;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffLeaveDto extends StaffLeave {
@Excel(name = "鐘舵��", readConverterExp = "0=绂昏亴,1=鍦ㄨ亴", sort = 1)
private Integer staffState;
diff --git a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
index 0a2c0ae..418d993 100644
--- a/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
+++ b/src/main/java/com/ruoyi/staff/dto/StaffOnJobDto.java
@@ -4,11 +4,13 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.staff.pojo.StaffOnJob;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.util.Date;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffOnJobDto extends StaffOnJob {
@Excel(name = "閮ㄩ棬",sort = 7)
private String deptName;
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
index cca0284..550b679 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffOnJob.java
@@ -6,6 +6,7 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -20,6 +21,7 @@
*/
@TableName(value = "staff_on_job")
@Data
+@EqualsAndHashCode(callSuper = true)
public class StaffOnJob extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/staff/vo/SearchSchedulingVo.java b/src/main/java/com/ruoyi/staff/vo/SearchSchedulingVo.java
index c546208..e08ba8f 100644
--- a/src/main/java/com/ruoyi/staff/vo/SearchSchedulingVo.java
+++ b/src/main/java/com/ruoyi/staff/vo/SearchSchedulingVo.java
@@ -3,6 +3,7 @@
import com.ruoyi.dto.PageDto;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
@@ -15,6 +16,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
public class SearchSchedulingVo extends PageDto {
private String staffName;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
index 2361d69..6ebc136 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInRecordDto.java
@@ -2,11 +2,13 @@
import com.ruoyi.stock.pojo.StockInRecord;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StockInRecordDto extends StockInRecord {
/**
* 浜у搧鍚嶇О
diff --git a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
index ea36ec9..ac3b27b 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockInventoryDto.java
@@ -3,12 +3,14 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.stock.pojo.StockInventory;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StockInventoryDto extends StockInventory {
private String productName;
diff --git a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
index 73113b1..c8053e1 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockOutRecordDto.java
@@ -3,6 +3,7 @@
import com.ruoyi.stock.pojo.StockOutRecord;
import lombok.AllArgsConstructor;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import java.math.BigDecimal;
@@ -10,6 +11,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
public class StockOutRecordDto extends StockOutRecord {
/**
* 浜у搧鍚嶇О
diff --git a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
index 9b40825..23134d5 100644
--- a/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
+++ b/src/main/java/com/ruoyi/stock/dto/StockUninventoryDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.stock.pojo.StockUninventory;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.math.BigDecimal;
@Data
+@EqualsAndHashCode(callSuper = true)
public class StockUninventoryDto extends StockUninventory {
private String productName;
private String model;
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentClassificationDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentClassificationDto.java
index ed20c8d..f2fc485 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentClassificationDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentClassificationDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.warehouse.pojo.DocumentClassification;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DocumentClassificationDto extends DocumentClassification {
private List<DocumentClassification> documentClassificationList;
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
index 8fb893a..f160a6e 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationBorrowManagementDto.java
@@ -4,8 +4,10 @@
import com.ruoyi.warehouse.pojo.DocumentationBorrowManagement;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DocumentationBorrowManagementDto extends DocumentationBorrowManagement {
/**
* 鏂囨。鍚嶇О
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationDto.java
index ad10fc2..ea9f689 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationDto.java
@@ -3,8 +3,10 @@
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.warehouse.pojo.Documentation;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DocumentationDto extends Documentation {
/**
* 绫诲埆鍚嶇О
diff --git a/src/main/java/com/ruoyi/warehouse/dto/DocumentationReturnManagementDto.java b/src/main/java/com/ruoyi/warehouse/dto/DocumentationReturnManagementDto.java
index a65e1e0..65d36a9 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/DocumentationReturnManagementDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/DocumentationReturnManagementDto.java
@@ -2,8 +2,10 @@
import com.ruoyi.warehouse.pojo.DocumentationReturnManagement;
import lombok.Data;
+import lombok.EqualsAndHashCode;
@Data
+@EqualsAndHashCode(callSuper = true)
public class DocumentationReturnManagementDto extends DocumentationReturnManagement {
/**
* 鏂囨。鍚嶇О
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
index 34ac3f1..d5ca630 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseDto.java
@@ -2,10 +2,12 @@
import com.ruoyi.warehouse.pojo.*;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class WarehouseDto extends Warehouse {
private String goodsShelvesName;
diff --git a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
index 2bff39e..4b103bb 100644
--- a/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
+++ b/src/main/java/com/ruoyi/warehouse/dto/WarehouseGoodsShelvesRowcolDto.java
@@ -3,10 +3,12 @@
import com.ruoyi.warehouse.dto.DocumentationDto;
import com.ruoyi.warehouse.pojo.WarehouseGoodsShelvesRowcol;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import java.util.List;
@Data
+@EqualsAndHashCode(callSuper = true)
public class WarehouseGoodsShelvesRowcolDto extends WarehouseGoodsShelvesRowcol {
private String warehouseName;
private String name;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
index a6c560f..76262fe 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationBorrowManagement.java
@@ -13,6 +13,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
/**
@@ -22,6 +23,7 @@
@TableName(value ="documentation_borrow_management")
@Data
@ApiModel(value = "鏂囨。鍊熼槄琛�")
+@EqualsAndHashCode(callSuper = true)
public class DocumentationBorrowManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
diff --git a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
index 5573923..6870d2a 100644
--- a/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
+++ b/src/main/java/com/ruoyi/warehouse/pojo/DocumentationReturnManagement.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
@@ -20,6 +21,7 @@
@TableName(value ="documentation_return_management")
@Data
@ApiModel(value = "鏂囨。褰掕繕琛�")
+@EqualsAndHashCode(callSuper = true)
public class DocumentationReturnManagement extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
--
Gitblit v1.9.3