From 91ab1a15515c4c213b2ac4f777a7f20c3d0d59ad Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期五, 28 三月 2025 13:49:53 +0800 Subject: [PATCH] 一个订单在每个站点检验都需要扫码入库报检,在中间站点复核继续试验之后默认自动将样品出库,且在列表中也不需要再展示出来,到最后一步复核结束反而是需要手动去出库不能自动出库,且出库之后也不需要在页面展示 --- cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java | 31 +++++++++++++++---------------- 1 files changed, 15 insertions(+), 16 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java index cf9bedd..91a0ddf 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java @@ -32,46 +32,45 @@ @ValueTableShow(5) @ApiModelProperty(value = "璧勮川璇存槑") - private String explain; + private String explanation; @ValueTableShow(6) @ApiModelProperty(value = "棣栨棰佸彂鏃堕棿") - private LocalDateTime firstTime; - + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime firstIssuanceDate; @ValueTableShow(7) @ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�") - private LocalDateTime recentlyTime; + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime latestIssuanceDate; + + @ValueTableShow(8) @ApiModelProperty(value = "鍒版湡棰佸彂鏃堕棿") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime expireTime; + + + @ApiModelProperty(value = "棰佸竷鏃ユ湡") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private LocalDateTime dateOfIssuance; @ApiModelProperty(value = "鍒涘缓浜�") @TableField(fill = FieldFill.INSERT) private Integer createUser; - @ValueTableShow(9) - @ApiModelProperty(value = "鍒涘缓浜�") + + @ApiModelProperty(value = "鏇存柊浜�") private String createUserName; @ApiModelProperty(value = "淇敼浜篿d") @TableField(fill = FieldFill.INSERT_UPDATE) private Integer updateUser; - @ValueTableShow(10) - @ApiModelProperty(value = "鍒涘缓鏃堕棿") - @TableField(fill = FieldFill.INSERT) - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private LocalDateTime createTime; - @ApiModelProperty(value = "鏇存柊鏃堕棿") @TableField(fill = FieldFill.INSERT_UPDATE) @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime updateTime; - - @ValueTableShow(11) - @ApiModelProperty(value = "鐘舵��") - private Integer state; @ApiModelProperty(value = "璧勮川鍥剧墖鍦板潃") private String imageUrl; -- Gitblit v1.9.3