From 3721176292747e250787e3b4b209bb89202990b0 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期日, 04 五月 2025 21:15:37 +0800
Subject: [PATCH] 质检结果回写问题修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
index 6382e57..84560fd 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/LocItem.java
@@ -1,18 +1,17 @@
package com.vincent.rsf.server.manager.entity;
-import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.*;
+
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
import java.text.SimpleDateFormat;
import java.util.Date;
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -106,8 +105,10 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+
@ApiModelProperty("鎵ц鏁伴噺")
private Double workQty;
+
@ApiModelProperty("瀹屾垚鏁伴噺")
private Double qty;
@@ -152,7 +153,6 @@
* 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -172,6 +172,7 @@
*/
@ApiModelProperty(value= "娣诲姞鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date createTime;
/**
@@ -185,8 +186,20 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
+ @TableField(exist = false)
+ private Long waveId;
+
+ @TableField(exist = false)
+ private Long waveItemId;
+
+ @TableField(exist = false)
+ private String waveCode;
+
+
+
/**
* 澶囨敞
*/
--
Gitblit v1.9.1