From a1bd5fc40223cee3445fc62b7555afee7bbcdab5 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期二, 12 八月 2025 16:06:49 +0800
Subject: [PATCH] 小车异常
---
src/main/java/com/zy/asrs/entity/BasRgvErrLog.java | 46 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 39 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
index 1d57f34..bceb92b 100644
--- a/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
+++ b/src/main/java/com/zy/asrs/entity/BasRgvErrLog.java
@@ -1,15 +1,20 @@
package com.zy.asrs.entity;
-import com.core.common.Cools;import com.baomidou.mybatisplus.annotations.TableId;
-import com.baomidou.mybatisplus.enums.IdType;
import com.baomidou.mybatisplus.annotations.TableField;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import org.springframework.format.annotation.DateTimeFormat;
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
+import com.core.common.SpringUtils;
+import com.zy.asrs.mapper.BasRgvErrMapper;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import com.baomidou.mybatisplus.annotations.TableName;
+import org.springframework.format.annotation.DateTimeFormat;
+
import java.io.Serializable;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_bas_rgv_err_log")
@@ -126,7 +131,7 @@
private String error;
/**
- * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
+ * 寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶�
*/
@ApiModelProperty(value= "寮傚父鎯呭喌 1: 鏈鐞� 2: 宸蹭慨澶� ")
private Integer status;
@@ -169,6 +174,33 @@
public BasRgvErrLog() {}
+ 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;
--
Gitblit v1.9.1