From 5488a72f7e4b21cb3fa953136fa8217a0648b61a Mon Sep 17 00:00:00 2001
From: zhaoxiaolin <khd@123>
Date: Wed, 17 Jan 2024 09:17:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E6=97=B6=E6=94=B9=E5=B0=8F=E6=97=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/api/domain/mes/MesReportWorkDTO.java | 17 +++++++++--------
 .../op/system/api/domain/wms/wmsReportWork.java | 12 +++++++-----
 .../com/op/device/domain/MesReportWork.java     | 12 +++++++-----
 3 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java
index 58bbdbb7..b58d9966 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/mes/MesReportWorkDTO.java
@@ -92,7 +92,7 @@ public class MesReportWorkDTO extends BaseEntity {
 
 	/** 工时 */
 	@Excel(name = "工时")
-	private Long workTime;
+	private BigDecimal workTime;
 
 	/** 线体编码 */
 	@Excel(name = "线体编码")
@@ -163,6 +163,14 @@ public class MesReportWorkDTO extends BaseEntity {
 	private String feedbackTimeEnd;
 	private String endReport;
 
+	public BigDecimal getWorkTime() {
+		return workTime;
+	}
+
+	public void setWorkTime(BigDecimal workTime) {
+		this.workTime = workTime;
+	}
+
 	public String getEndReport() {
 		return endReport;
 	}
@@ -490,13 +498,6 @@ public class MesReportWorkDTO extends BaseEntity {
 	public String getStatus() {
 		return status;
 	}
-	public void setWorkTime(Long workTime) {
-		this.workTime = workTime;
-	}
-
-	public Long getWorkTime() {
-		return workTime;
-	}
 	public void setMachineCode(String machineCode) {
 		this.machineCode = machineCode;
 	}
diff --git a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
index 1e4ef003..6db08321 100644
--- a/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
+++ b/op-api/op-api-system/src/main/java/com/op/system/api/domain/wms/wmsReportWork.java
@@ -110,7 +110,7 @@ public class wmsReportWork extends BaseEntity {
 
     /** 工时 */
     @Excel(name = "工时")
-    private Long workTime;
+    private BigDecimal workTime;
 
     @Excel(name = "用人")
     private Long useMan;
@@ -537,13 +537,15 @@ public class wmsReportWork extends BaseEntity {
     public String getStatus() {
         return status;
     }
-    public void setWorkTime(Long workTime) {
-        this.workTime = workTime;
-    }
 
-    public Long getWorkTime() {
+    public BigDecimal getWorkTime() {
         return workTime;
     }
+
+    public void setWorkTime(BigDecimal workTime) {
+        this.workTime = workTime;
+    }
+
     public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }
diff --git a/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java b/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java
index b8433691..4f4c1f15 100644
--- a/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java
+++ b/op-modules/op-device/src/main/java/com/op/device/domain/MesReportWork.java
@@ -110,7 +110,7 @@ public class MesReportWork extends BaseEntity {
 
     /** 工时 */
     @Excel(name = "工时")
-    private Long workTime;
+    private BigDecimal workTime;
 
     @Excel(name = "用人")
     private Long useMan;
@@ -537,13 +537,15 @@ public class MesReportWork extends BaseEntity {
     public String getStatus() {
         return status;
     }
-    public void setWorkTime(Long workTime) {
-        this.workTime = workTime;
-    }
 
-    public Long getWorkTime() {
+    public BigDecimal getWorkTime() {
         return workTime;
     }
+
+    public void setWorkTime(BigDecimal workTime) {
+        this.workTime = workTime;
+    }
+
     public void setMachineCode(String machineCode) {
         this.machineCode = machineCode;
     }