From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 三月 2025 13:49:53 +0800
Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 46 insertions(+), 5 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
index 19b208a..598a81b 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsOrderState.java
@@ -5,20 +5,22 @@
import java.io.Serializable;
import java.time.LocalDateTime;
import java.util.Date;
+import java.util.List;
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.Getter;
/**
- *
+ *
* @TableName ins_order_state
*/
@TableName(value ="ins_order_state")
@Data
public class InsOrderState implements Serializable {
/**
- *
+ *
*/
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
@@ -30,13 +32,13 @@
private Integer insOrderId;
/**
- * 瀹為獙瀹�
+ * 璇曢獙瀹on
*/
@TableField(value = "laboratory")
private String laboratory;
/**
- * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍告湭閫氳繃 5锛氬鏍搁�氳繃)
+ * 妫�楠岀姸鎬�(0锛氬緟妫�楠�1:妫�楠屼腑 2:宸叉楠�3锛氬緟澶嶆牳4锛氬鏍稿啀娆¤瘯楠� 5锛氬鏍哥粨鏉熻瘯楠� 6:澶嶆牳缁х画璇曢獙)
*/
@TableField(value = "ins_state")
private Integer insState;
@@ -66,4 +68,43 @@
@ApiModelProperty("澶嶆牳鐞嗙敱")
private String verifyTell;
-}
\ No newline at end of file
+
+ @ApiModelProperty("鎻掗槦鎿嶄綔鐨勬帓搴�")
+ private Integer sort;
+
+ @ApiModelProperty("鎻掗槦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime sortTime;
+
+ //褰撳墠椤�
+ @TableField(exist = false,select = false)
+ private Integer current;
+
+ //椤垫暟
+ @TableField(exist = false,select = false)
+ private Integer size;
+
+ /**
+ * 閽堝鐢佃矾璇曢獙閫夋嫨鐨勭増鏈�
+ */
+ private Integer version;
+
+ /**
+ * 娆℃暟(妫�娴嬫鏁�)
+ */
+ private Integer num;
+
+ //妫�楠屼汉
+ @TableField(exist = false,select = false)
+ private String userName;
+
+ @TableField(select = false,exist = false)
+ private List<InsOrderUser> insOrderUserList;
+
+ @ApiModelProperty("鍏宠仈 鏍峰搧澶栭敭id")
+ private Integer insSampleId;
+
+ @ApiModelProperty("鏄惁鍑哄簱")
+ private Integer isOut;
+
+}
--
Gitblit v1.9.3