From 473da408619b57c656cc22e191e9ed2e1c3eafaa Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 13 六月 2025 10:41:19 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/entity/BasRgvErrLog.java | 41 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 36 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
index 30a6a82..9cdeab9 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
@@ -5,11 +5,15 @@
import com.baomidou.mybatisplus.annotations.TableField;
import java.text.SimpleDateFormat;
import java.util.Date;
+
+import com.core.common.SpringUtils;
+import com.zy.asrs.mapper.BasRgvErrMapper;
import org.springframework.format.annotation.DateTimeFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import com.baomidou.mybatisplus.annotations.TableName;
import java.io.Serializable;
+import java.util.List;
@Data
@TableName("asr_bas_rgv_err_log")
@@ -18,7 +22,7 @@
private static final long serialVersionUID = 1L;
@ApiModelProperty(value= "")
- @TableId(value = "id", type = IdType.INPUT)
+ @TableId(value = "id", type = IdType.AUTO)
private Long id;
/**
@@ -68,8 +72,8 @@
* 绌挎杞�
*/
@ApiModelProperty(value= "绌挎杞�")
- @TableField("rtv_no")
- private Integer rtvNo;
+ @TableField("rgv_no")
+ private Integer rgvNo;
/**
* plc
@@ -169,14 +173,41 @@
public BasRgvErrLog() {}
- public BasRgvErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer rtvNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+ public BasRgvErrLog(List<Integer> alarmLists , Short taskNo,Integer rgvNo) {
+ BasRgvErrMapper basRgvErrMapper = SpringUtils.getBean(BasRgvErrMapper.class);
+ StringBuilder alarmList = new StringBuilder();
+ for (Integer alarm : alarmLists){
+ BasRgvErr rgvErr = basRgvErrMapper.selectById(alarm);
+ alarmList.append((rgvErr==null || rgvErr.getErrName()==null)? "鏈煡寮傚父:"+alarm:rgvErr.getErrName());
+ if (alarm.equals(alarmLists.get(alarmLists.size() - 1))){
+ this.errCode = alarm;
+ break;
+ }
+ alarmList.append("---");
+ }
+ this.error = alarmList.toString();
+ Date now = new Date();
+ this.uuid = String.valueOf(now.getTime());
+ this.wrkNo = taskNo.intValue();
+ this.startTime = now;
+ this.endTime = now;
+ this.rgvNo = rgvNo;
+ this.status = 1;
+ this.createTime = now;
+ this.createBy = 9999L;
+ this.updateTime = now;
+ this.updateBy = 9999L;
+ this.memo = "寮傚父鑷姩璁板綍";
+ }
+
+ public BasRgvErrLog(String uuid,Integer wrkNo,Date startTime,Date endTime,Long wrkSts,Integer ioType,Integer rgvNo,Integer plcNo,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String barcode,Integer errCode,String error,Integer status,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
this.uuid = uuid;
this.wrkNo = wrkNo;
this.startTime = startTime;
this.endTime = endTime;
this.wrkSts = wrkSts;
this.ioType = ioType;
- this.rtvNo = rtvNo;
+ this.rgvNo = rgvNo;
this.plcNo = plcNo;
this.locNo = locNo;
this.staNo = staNo;
--
Gitblit v1.9.1