From 2d5ffc17e5d76a468493b21c45df1ca547b10da3 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期三, 30 四月 2025 13:40:17 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java | 11 +++++++---- 1 files changed, 7 insertions(+), 4 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 b2f899c..4af2a41 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; @@ -55,6 +56,7 @@ @ApiModelProperty("瀛楁绱㈠紩") private String fieldsIndex; + @ApiModelProperty("鎵ц鏁伴噺") private Double workQty; @@ -86,7 +88,7 @@ * 鐗╂枡鏍囪瘑 */ @ApiModelProperty(value= "鐗╂枡鏍囪瘑") - private String matnrId; + private Long matnrId; /** * 鐗╂枡缂栫爜 @@ -190,7 +192,6 @@ * 鏄惁鍒犻櫎 1: 鏄� 0: 鍚� */ @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄� 0: 鍚� ") - @TableLogic private Integer deleted; /** @@ -210,6 +211,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; /** @@ -223,6 +225,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; /** @@ -230,10 +233,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