From 2b31fa203f3435a582be51f45899d99164c9917a Mon Sep 17 00:00:00 2001
From: zhuguifei <312353457@qq.com>
Date: 星期四, 09 四月 2026 13:34:59 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/SC/gfzl
---
RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java | 28 +++++++++++++++++++++++++++-
1 files changed, 27 insertions(+), 1 deletions(-)
diff --git a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
index 2613db3..f20fe76 100644
--- a/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
+++ b/RuoYi-Vue-Plus/ruoyi-modules/ruoyi-qa/src/main/java/org/dromara/qa/analy/domain/vo/StoreSilkInfoVo.java
@@ -1,8 +1,10 @@
package org.dromara.qa.analy.domain.vo;
import java.util.Date;
+import java.util.List;
import org.dromara.qa.analy.domain.StoreSilkInfo;
+import org.dromara.qa.md.domain.bo.MdShiftBo;
import cn.idev.excel.annotation.ExcelIgnoreUnannotated;
import cn.idev.excel.annotation.ExcelProperty;
import io.github.linpeilie.annotations.AutoMapper;
@@ -66,7 +68,7 @@
* 鍑哄彾涓濈巼
*/
@ExcelProperty(value = "鍑哄彾涓濈巼")
- private Long slkrate;
+ private Long silkrate;
/**
* 鍌ㄤ笣鏌滈噸閲�
@@ -92,5 +94,29 @@
@ExcelProperty(value = "鏌滃瓙鍙�(鏈綅)")
private String siloid;
+ // 鍑烘枡寮�濮嬬粨鏉熸椂闂磋法瓒婄彮娆″垪琛�
+ private List<MdShiftBo> distShiftList;
+ private Double rollerOutput;
+ private Double packerOutput;
+
+ /**
+ * 鍗锋帴鏈轰骇閲忔槑缁�
+ */
+ private List<StoreSilkDetailVo> rollerDetailList;
+
+ /**
+ * 鍖呰鏈轰骇閲忔槑缁嗭紙鏈�缁堢粨鏋滐級
+ */
+ private List<StoreSilkDetailVo> packerDetailList;
+
+ /**
+ * 鍗锋帴鏈烘搷浣滆繃绋嬭褰曪紙澧炲噺鏄庣粏锛�
+ */
+ private List<StoreSilkDetailVo> rollerRecordList;
+
+ /**
+ * 鍖呰鏈烘搷浣滆繃绋嬭褰曪紙澧炲噺鏄庣粏锛�
+ */
+ private List<StoreSilkDetailVo> packerRecordList;
}
--
Gitblit v1.9.3