From fab10f7057c54b5309108ad4e640e30f506fcc74 Mon Sep 17 00:00:00 2001
From: 刘小明 <liuxm_a@163.com>
Date: 星期二, 16 七月 2024 09:34:49 +0800
Subject: [PATCH] 测试节点通过后,状态取上一节点状态,而不是默认完成
---
pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
index 4bfedf4..c29613d 100644
--- a/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
+++ b/pms-parent/pms-global/src/main/java/com/dy/pmsGlobal/pojoSta/StaDeviceProductionLog.java
@@ -2,6 +2,7 @@
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;
@@ -30,12 +31,12 @@
* 璁惧鐮�
*/
@NotBlank(message="璁惧鐮佷笉鑳戒负绌�")
- public String equipNo;
+ public String deviceNo;
/**
* 鐢熶骇鐧诲綍id
*/
@JSONField(serializeUsing= ObjectWriterImplToString.class)
- public Long claimId;
+ public Long workId;
/**
* 缁翠慨id
*/
@@ -63,7 +64,7 @@
/**
* 璁板綍璁惧鍛ㄦ湡鍐呭
*/
- public String equipCycleContent;
+ public String deviceCycleContent;
/**
* 鐘舵��: 1:缁勮涓�,2:瀹屾垚,3:缁翠慨,4:鎶ュ簾
*/
@@ -75,7 +76,7 @@
/**
*
*/
- public String errorCode;
+ public String errorMsg;
/**
* 杈呭姪浜哄憳:杈呭姪鍛樺伐id,浠ラ�楀彿闅斿紑
*/
@@ -98,5 +99,12 @@
*/
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