From 1d073089d28720503a5350718f10c97a2a9dc502 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期六, 03 五月 2025 19:32:19 +0800
Subject: [PATCH] 逻辑删除改成物理删除
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 28 +++++++++++++++++++++-------
1 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
index ff094e5..70dfef1 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java
@@ -5,6 +5,7 @@
import java.text.SimpleDateFormat;
import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.experimental.Accessors;
import org.springframework.format.annotation.DateTimeFormat;
@@ -23,7 +24,6 @@
public class AsnOrderItem implements Serializable {
private static final long serialVersionUID = 1L;
-
/**
* ID
*/
@@ -56,6 +56,7 @@
@ApiModelProperty("瀛楁绱㈠紩")
private String fieldsIndex;
+
@ApiModelProperty("鎵ц鏁伴噺")
private Double workQty;
@@ -87,7 +88,7 @@
* 鐗╂枡鏍囪瘑
*/
@ApiModelProperty(value= "鐗╂枡鏍囪瘑")
- private String matnrId;
+ private Long matnrId;
/**
* 鐗╂枡缂栫爜
@@ -100,6 +101,12 @@
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
private String maktx;
+
+ @ApiModelProperty("瑙勬牸")
+ private String spec;
+
+ @ApiModelProperty("鍨嬪彿")
+ private String model;
/**
* 閫佽揣鏁伴噺
@@ -135,6 +142,12 @@
*/
@ApiModelProperty(value= "宸叉敹鏁伴噺")
private Double qty;
+
+ /**
+ * 鐢熶骇鏃ユ湡
+ */
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ private String prodTime;
/**
* 渚涘簲鍟嗙紪鐮�
@@ -176,16 +189,15 @@
private Integer ntyStatus;
/**
- * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
+ * 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父 0: 鍐荤粨 ")
private Integer status;
/**
- * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
+ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚�
*/
@ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ")
- @TableLogic
private Integer deleted;
/**
@@ -205,6 +217,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;
/**
@@ -218,6 +231,7 @@
*/
@ApiModelProperty(value= "淇敼鏃堕棿")
@DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern="yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
private Date updateTime;
/**
@@ -225,10 +239,10 @@
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
+//
public AsnOrderItem() {}
- public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,String matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
+ public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
this.asnId = asnId;
this.asnCode = asnCode;
this.poDetlId = poDetlId;
--
Gitblit v1.9.1