From 5325dfb2fda7bd21bcbcf3c8c10be1ac95793d86 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 05 八月 2024 20:40:48 +0800
Subject: [PATCH] 检验下单的委托人如果制单人的委托单位与选择的委托单位不一致,则委托人必须要进行填写,如果一致那么委托人就默认是制单人+.检验设备第一次进来直接所有样品的这个项目全部使用该设备，第二次修改就只针对当前样品
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java | 29 +++++++++++++++++------------
1 files changed, 17 insertions(+), 12 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
index 254d103..6b7c6a2 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/DataConfig.java
@@ -1,6 +1,7 @@
package com.yuanchu.mom.pojo;
import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
@@ -32,15 +33,6 @@
@TableId(value = "id", type = IdType.AUTO)
private Integer id;
- @ApiModelProperty("鏂囦欢鍚庣紑")
- private String fileType;
-
- @ApiModelProperty("閲囬泦鍦板潃")
- private String collectUrl;
-
- @ApiModelProperty("瀛樺偍鍦板潃")
- private String storageUrl;
-
@ApiModelProperty("鍏紡")
private String formula;
@@ -51,14 +43,27 @@
private String refery;
@ApiModelProperty("x")
- private Integer x;
+ private String x;
@ApiModelProperty("y")
- private Integer y;
+ private String y;
@ApiModelProperty("璁惧id")
private Integer deviceId;
- @ApiModelProperty("妫�楠岄」鐩悕绉�")
+ @ApiModelProperty("妫�楠岄」鐩�")
+ private String inspectionItem;
+
+ @ApiModelProperty("妫�楠岄」瀛愰」")
+ private String inspectionItemSubclass;
+
+ @TableField(exist = false)
+ @ApiModelProperty("妫�楠岄」瀛愰」")
private String insProductItem;
+
+ @ApiModelProperty("妫�楠岄」id")
+ private Integer structureItemParameterId;
+
+ @ApiModelProperty("搴忓彿")
+ private String serialNumber;
}
--
Gitblit v1.9.3