From 4f4559efbe2d2f20f2c37d8582b74f0a558a54c7 Mon Sep 17 00:00:00 2001
From: whycq <you@example.com>
Date: 星期一, 30 一月 2023 22:10:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/bfasrs' into bfasrs
---
src/main/java/com/zy/asrs/entity/CheckRecord.java | 42 ++++++++++++++++++++++++++++++++++--------
1 files changed, 34 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/CheckRecord.java b/src/main/java/com/zy/asrs/entity/CheckRecord.java
index 06a8403..ed0a0ac 100644
--- a/src/main/java/com/zy/asrs/entity/CheckRecord.java
+++ b/src/main/java/com/zy/asrs/entity/CheckRecord.java
@@ -1,24 +1,31 @@
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 com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import com.core.common.Cools;
import com.zy.common.utils.Synchro;
-import org.springframework.format.annotation.DateTimeFormat;
-
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;
@Data
@TableName("asr_check_record")
public class CheckRecord implements Serializable {
private static final long serialVersionUID = 1L;
+
+ /**
+ * ID
+ */
+ @ApiModelProperty(value= "ID")
+ @TableId(value = "id", type = IdType.AUTO)
+ private Long id;
/**
* 搴撲綅鍙�
@@ -83,6 +90,12 @@
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
private Date createTime;
+ /**
+ * 鐘舵�� 1: 宸插鏍� 0: 鏈鏍�
+ */
+ @ApiModelProperty(value= "鐘舵�� 1: 宸插鏍� 0: 鏈鏍� ")
+ private Integer status;
+
public CheckRecord() {}
public CheckRecord(String locNo,String barcode,String matnr,String maktx,String specs,String batch,Double anfme,Double confirmQty,Date createTime) {
@@ -127,4 +140,17 @@
return null;
}
}
+
+ public String getStatus$(){
+ if (null == this.status){ return null; }
+ switch (this.status){
+ case 1:
+ return "宸插鏍�";
+ case 0:
+ return "鏈鏍�";
+ default:
+ return String.valueOf(this.status);
+ }
+ }
+
}
--
Gitblit v1.9.1