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/Device.java | 34 +++++++++++++++++++++++++++++++--- 1 files changed, 31 insertions(+), 3 deletions(-) diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java index a7ee499..e8fb98e 100644 --- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java +++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Device.java @@ -119,12 +119,40 @@ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private LocalDateTime createTime; - @ApiModelProperty("鏂囦欢鍚庣紑") + @ApiModelProperty("鏁伴噰-鏂囦欢鍚庣紑") private String fileType; - @ApiModelProperty("閲囬泦鍦板潃") + @ApiModelProperty("鏁伴噰-閲囬泦鍦板潃") private String collectUrl; - @ApiModelProperty("瀛樺偍鍦板潃") + @ApiModelProperty("鏁伴噰-瀛樺偍鍦板潃") private String storageUrl; + + @ApiModelProperty("鏁伴噰-璁惧IP") + private String ip; + + @ApiModelProperty("鏁伴噰-鏄惁涓烘暟閲囪澶�") + @TableField(exist = false) + private Boolean isItADataAcquisitionDevice; + + @ApiModelProperty("鏁伴噰-濮旀墭瀛楁") + private String entrustCode; + + @ApiModelProperty("鏁伴噰-鏍峰搧瀛楁") + private String sampleCode; + + @ApiModelProperty("鏁伴噰-db锛宮db鏂囦欢鍚嶇О") + private String dbFileName; + + @ApiModelProperty("琚巿鏉冧汉") + private String authorizedPerson; + + @ApiModelProperty("璧勪骇缂栫爜") + private String assetCode; + + @ApiModelProperty("浜у湴") + private String origin; + + @ApiModelProperty("杞欢鐗堟湰") + private String version; } -- Gitblit v1.9.3