From 51786b723d0a91d11476776d9ce50af7994dc4bd Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 23 九月 2026 15:58:53 +0800
Subject: [PATCH] feat(inspect): 完善检验订单状态管理和样品接收流程
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 50 +++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 47 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 0725899..9a93ab5 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDate;
@@ -66,7 +67,7 @@
@ApiModelProperty("鏄惁鐣欐牱")
private Integer isLeave;
- @ApiModelProperty("鐘舵��:-1:鍘熸潗鏂欐挙鍥� 1锛氭楠屽鐞� 0锛氬緟瀹℃牳 2锛氶��鍥� 3锛氭挙閿�")
+ @ApiModelProperty("鐘舵��:-1:鍘熸潗鏂欐挙鍥� 0:寰呭鏍� 1:鏍峰搧鎺ユ敹/妫�楠屽鐞� 2:閫�鍥� 3:鎾ら攢 4:宸叉楠� 5:浣滃簾")
private Integer state;
@ExcelProperty(index = 7, value = "澶囨敞")
@@ -85,7 +86,8 @@
@ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("涓嬪彂鏃堕棿")
@@ -158,6 +160,7 @@
private Integer prepareUserId;
@ExcelProperty(index = 12, value = "濮旀墭浜�")
+ @ApiModelProperty("濮旀墭浜�")
private String prepareUser;
@ApiModelProperty(name = "濮旀墭浜鸿嫳鏂�")
@@ -176,7 +179,7 @@
private Integer typeSource;
@ApiModelProperty("鍘熸潗鏂檌d")
- private Integer ifsInventoryId;
+ private Long ifsInventoryId;
@ApiModelProperty("鎶芥煡鏁伴噺")
private String testQuantity;
@@ -193,8 +196,25 @@
@ApiModelProperty("婀垮害")
private String humidity;
+ @TableField(exist = false)
+ @ApiModelProperty("褰撳墠濉啓鐜鏉′欢鐨勬ā鏉縄D")
+ private Integer templateId;
+
@ApiModelProperty("鏍峰搧鐘舵��")
private String sampleStatus;
+
+ @ApiModelProperty("閫佹牱鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate sampleDate;
+
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate productionDate;
+
+ @ApiModelProperty("鐢熶骇鎵瑰彿")
+ private String productionBatch;
@ApiModelProperty("瀛ｅ害鎶芥牱椤圭洰id")
private Integer quarterItemId;
@@ -211,6 +231,30 @@
@ApiModelProperty("绗竴娆℃彁浜ゆ椂闂�")
private LocalDateTime firstSubmitDate;
+ @ApiModelProperty("棣栨淇濆瓨妫�楠屾ā鏉垮�兼椂闂�")
+ private LocalDateTime firstInspectDate;
+
+ @ApiModelProperty("鍒嗗寘鍐呭 0鏃� 1鏈�")
+ private Integer subcontractType;
+
+ @ApiModelProperty("鍒嗗寘鍗曚綅淇℃伅")
+ private String subcontractCompany;
+
+ @ApiModelProperty("鏍峰搧澶勭疆 1濮旀墭鏂瑰彇鍥� 2妫�娴嬫柟澶勭疆")
+ private Integer sampleDisposal;
+
+ @ApiModelProperty("瀵圭粨鏋滆瘎浠� 0鍚� 1鏄�")
+ private Integer resultEvaluation;
+
+ @ApiModelProperty("鎶ュ憡浜や粯鏂瑰紡 1鑷彇 2蹇�� 3鐢靛瓙浼犻��")
+ private Integer reportDelivery;
+
+ @ApiModelProperty("鎶ュ憡瀵勯�佸湴鍧�")
+ private String reportAddress;
+
+ @ApiModelProperty("鏀朵欢浜哄強鐢佃瘽")
+ private String reportReceiver;
+
@ApiModelProperty("鏍锋満鍛�(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)")
@TableField(exist = false)
private Integer issueUser;
--
Gitblit v1.9.3