From 46766994f2c9a542ad42d5d9a637a7a66f2c265e Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期六, 08 七月 2023 16:07:01 +0800
Subject: [PATCH] 弹窗调整
---
igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java | 60 +++++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 41 insertions(+), 19 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
index 5e461b1..e41f0c0 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/dto/InoutCheckData.java
@@ -1,9 +1,11 @@
package com.ld.igds.inout.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ld.igds.check.dto.CheckItemData;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
+import java.util.List;
/**
* 鍑哄叆搴撴墻鏍锋暟鎹皝瑁�
@@ -15,51 +17,71 @@
public class InoutCheckData implements Serializable {
private static final long serialVersionUID = 1L;
-
+
+ /*-----鍩虹淇℃伅-----*/
+
//娴佹按鍙�
private String id;
-
//缁勭粐缂栫爜
private String companyId;
-
//搴撳尯缂栫爜
private String deptId;
-
//鍑哄叆搴撶被鍨�,IN=鍏ュ簱锛孫UT=鍑哄簱
private String type;
-
//娴佺▼杩涘害
private String progress;
-
//鏁版嵁鐘舵��
private String recordStatus;
-
//鏅烘収鍗″彿
private String intelCard;
-
//鐧昏鏃堕棿
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date registerTime;
-
//鐧昏浜�
private String registerUser;
-
//杞﹁埞鍙�
private String plateNum;
+ //瑁呭嵏浠撳簱
+ private String depotId;
+ //绮鍝佺
+ private String foodVariety;
+ //璐ㄦ鍗曞彿
+ private String checkId;
+ //鍗曚环
+ private Double price;
+
+ /*-----鎵︽牱淇℃伅-----*/
//鎵︽牱浜�
private String sampleUser;
-
//鎵︽牱鏃堕棿
- @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm", timezone = "GMT+8")
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
private Date sampleTime;
-
//鎵︽牱鏂瑰紡锛�0-浜哄伐锛�1=鑷姩锛�2=鏅鸿兘闅忔満
private String sampleType;
-
- //璐ㄦ鍗曞彿
- private String checkId;
-
- //鎵︽牱鐘舵��
+ //鎵︽牱鐘舵��()锛孨ONE-鏈墻鏍凤紝SAMPLE-宸叉墻鏍�
private String sampleStatus;
+
+ /*-----鍖栭獙淇℃伅-----*/
+
+ //妫�楠屼汉
+ private String checkUser;
+ //璐ㄦ鏃堕棿
+ @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ private Date checkTime;
+ //妫�楠岀粨鏋滐紝NONE-鏈楠岋紝PASS-宸叉楠岋紝UNPASS-涓嶅悎鏍�
+ private String checkStatus;
+ //绮瀹氱瓑
+ private String foodLevel;
+ //璐ㄦ鎵ｉ噸
+ private double deCheck = 0.0;
+ //璐ㄦ澧為噸
+ private double addCheck = 0.0;
+
+ private String remarks;
+
+ private Date updateTime;
+
+ //鍖栭獙椤规暟鎹俊鎭�
+ private List<CheckItemData> checkItems;
}
--
Gitblit v1.9.3