From 43c075fd360101f6e9e48a1d7e4943949a55c490 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 03 六月 2026 14:24:08 +0800
Subject: [PATCH] 生产报工，报工人员筛选班组
---
src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
index 8cb4d91..025ae73 100644
--- a/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
+++ b/src/main/java/com/ruoyi/production/dto/SalesLedgerProductionAccountingDto.java
@@ -7,9 +7,10 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-
+import org.apache.commons.lang3.tuple.Pair;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.List;
/**
* @author :yys
@@ -18,7 +19,7 @@
@Data
@ApiModel
@ExcelIgnoreUnannotated
-public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto{
+public class SalesLedgerProductionAccountingDto extends SalesLedgerProductDto {
/**
* 鐢熶骇浜篿d
@@ -82,11 +83,17 @@
private String outputRate;
+ private Long totalWorkMinutes;
+
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private LocalDate entryDate;
private String dateType;
+ private String deviceWorkInfo;
+
+ private List<Pair<String,Integer>> deviceWorkInfoPairList;
+
}
--
Gitblit v1.9.3