From a5f66f55b2c176e8504b8a077e00acfe2dfb4b00 Mon Sep 17 00:00:00 2001
From: liu <2021943741@qq.com>
Date: 星期五, 18 九月 2026 18:09:56 +0800
Subject: [PATCH] feat(生产报工): 报工完成按四类区分计数零件并分流质检入库
---
src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
index 249299a..99c4811 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityUnqualified.java
@@ -47,7 +47,7 @@
/**
* 妫�娴嬫棩鏈�
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "妫�娴嬫棩鏈�", width = 30, dateFormat = "yyyy-MM-dd")
private Date checkTime;
@@ -99,6 +99,24 @@
private String dealResult;
/**
+ * 涓嶅悎鏍煎浘鐗�
+ */
+ @Excel(name = "涓嶅悎鏍煎浘鐗�")
+ private String photoUrls;
+
+ @Schema(description = "涓嶅悎鏍煎鐞嗙被鍨嬶細0杞诲井杩斿伐锛�1涓ラ噸杩斿伐锛�2鎶ュ簾")
+ @Excel(name = "涓嶅悎鏍煎鐞嗙被鍨�", readConverterExp = "0=杞诲井杩斿伐,1=涓ラ噸杩斿伐,2=鎶ュ簾")
+ private Integer dealType;
+
+ @Schema(description = "淇悊宸ユ椂")
+ @Excel(name = "淇悊宸ユ椂")
+ private BigDecimal repairWorkHour;
+
+ @Schema(description = "鏄惁閲嶆柊鐢熸垚鏂板崟锛�0鍚︼紝1鏄�")
+ @Excel(name = "鏄惁閲嶆柊鐢熸垚鏂板崟", readConverterExp = "0=鍚�,1=鏄�")
+ private Integer regenerateNewOrder;
+
+ /**
* 澶勭悊浜�
*/
@Excel(name = "澶勭悊浜�")
@@ -107,7 +125,7 @@
/**
* 澶勭悊鏃ユ湡
*/
- @JsonFormat(pattern = "yyyy-MM-dd")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@Excel(name = "澶勭悊鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date dealTime;
@@ -136,6 +154,14 @@
@Schema(description = "鍏宠仈妫�娴媔d")
private Long inspectId;
+ @Schema(description = "鍏宠仈鐢熶骇鎶ュ伐涓昏〃id锛堟姤宸ュ垎绫讳骇鐢熺殑杩斿伐/鎶ュ簾寰呭鐞嗗崟锛�")
+ @TableField("product_main_id")
+ private Long productMainId;
+
+ @Schema(description = "鏉ユ簮鎶ュ伐鍗曞彿锛堟煡璇㈠洖鏄剧敤锛�")
+ @TableField(exist = false)
+ private String reportNo;
+
@Schema(description = "鏄惁涓嶅悎鏍煎鐞嗚嚜宸辨柊澧�")
@TableField(exist = false)
--
Gitblit v1.9.3