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/dto/ReportPageDto.java | 22 ++++++++++++++-------- 1 files changed, 14 insertions(+), 8 deletions(-) diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java index b39829f..19a1082 100644 --- a/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java +++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java @@ -1,29 +1,35 @@ package com.yuanchu.mom.dto; import com.yuanchu.mom.annotation.ValueTableShow; -import com.yuanchu.mom.common.OrderBy; import com.yuanchu.mom.pojo.InsReport; import io.swagger.annotations.ApiModelProperty; import lombok.Data; -import org.hibernate.validator.constraints.Length; -import javax.validation.constraints.Size; import java.io.Serializable; @Data public class ReportPageDto extends InsReport implements Serializable { - @ValueTableShow(2) @ApiModelProperty(value = "濮旀墭缂栧彿") + @ValueTableShow(value = 2,name = "濮旀墭缂栧彿") private String entrustCode; - @ValueTableShow(value = 3,name = "缂栧埗浜�") - private String updateUserName; + @ApiModelProperty(value = "鏍峰搧缂栧彿") + @ValueTableShow(value = 2,name = "鏍峰搧缂栧彿") + private String sampleCode; - @ValueTableShow(value = 8,name = "鎵瑰噯浜�") + @ValueTableShow(value = 3,name = "鎻愪氦浜�") + private String writeUserName; + + @ValueTableShow(value = 10,name = "鎵瑰噯浜�") private String ratifyUser; - @ValueTableShow(value = 5,name = "瀹℃牳浜�") + @ValueTableShow(value = 6,name = "瀹℃牳浜�") private String examineUser; + //瀹為獙瀹d + private Integer labId; + + private String orderType; + } -- Gitblit v1.9.3