From bea49667b0a34a17490c4b47f6a14857a737f647 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期三, 17 七月 2024 08:47:31 +0800
Subject: [PATCH] 新增生产日志历史表,每天00:05把生产日志表中的数据移动到历史表中
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java | 72 ++++++++++++++++++++++++------------
1 files changed, 48 insertions(+), 24 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
index c2c7ab5..38d20ca 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceLast.java
@@ -2,13 +2,11 @@
import com.alibaba.fastjson2.annotation.JSONField;
import com.alibaba.fastjson2.writer.ObjectWriterImplToString;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.dy.common.po.BaseEntity;
import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
import lombok.*;
-
-
import java.util.Date;
@@ -32,8 +30,18 @@
/**
* 璁惧鐮�
*/
- @NotBlank(message="[璁惧鐮乚涓嶈兘涓虹┖")
- public String equipNo;
+ @NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
+ public String deviceNo;
+ /**
+ * 鐢熶骇鐧诲綍id
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long workId;
+ /**
+ * 缁翠慨id
+ */
+ @JSONField(serializeUsing= ObjectWriterImplToString.class)
+ public Long repairId;
/**
* 璁″垝id
*/
@@ -50,12 +58,15 @@
@JSONField(serializeUsing= ObjectWriterImplToString.class)
public Long currNode;
/**
- * 涓嬩竴鑺傜偣
+ * 鑺傜偣浣滀笟鍐呭
*/
- @JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long nextNode;
+ public String nodeContent;
/**
- * 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
+ * 璁板綍璁惧鍛ㄦ湡鍐呭
+ */
+ public String deviceCycleContent;
+ /**
+ * 鐘舵��: 0:寰呯敓浜�,1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾,5:娴嬭瘯涓嶉�氳繃,6:鍝佹涓嶉�氳繃
*/
public Integer status;
/**
@@ -63,25 +74,13 @@
*/
public Integer result;
/**
- * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇爜
+ * 缁翠慨鑺傜偣杩斿洖鐨勯敊璇俊鎭�
*/
- public String errorCode;
- /**
- * 澶囨敞
- */
- public String memo;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
public String assistants;
- /**
- * 鍒涘缓鏃堕棿
- */
- public Date createTime;
- /**
- *
- */
- public Date updatedDate;
/**
* 鎿嶄綔鍛榠d
*/
@@ -90,7 +89,32 @@
/**
* 鍏ョ珯鏃堕棿(涓婁竴鑺傜偣鐨勫嚭绔欐椂闂�)
*/
- public Date inStationTime;
+ public Date inTime;
+ /**
+ * 鍑虹珯鏃堕棿
+ */
+ public Date outTime;
+ /**
+ * 鎶曞叆鏃堕棿
+ */
+ public Date inLineTime;
+ /**
+ * 浜у嚭鏃堕棿
+ */
+ public Date outLineTime;
+ /**
+ * 澶囨敞
+ */
+ public String memo;
+
+ @TableField(exist = false)
+ public String planName;
+ @TableField(exist = false)
+ public String stationName;
+ @TableField(exist = false)
+ public String updateUserName;
+ @TableField(exist = false)
+ public String assistantNames;
}
--
Gitblit v1.8.0