From c8fde8647b48e7c7d9b3beb6e8c39459f07c9eb2 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期四, 08 五月 2025 14:55:46 +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/WaveItem.java |   38 ++++++++++++++++++++++++++++++--------
 1 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
index 36d7e30..7beb80d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.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;
@@ -59,7 +58,7 @@
      * 鐗╂枡鍚嶇О
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
-    private String matnrName;
+    private String maktx;
 
     /**
      * 鍟嗗搧缂栧彿
@@ -143,7 +142,6 @@
      * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
-    @TableLogic
     private Integer deleted;
 
     /**
@@ -151,6 +149,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;
 
     /**
@@ -164,6 +163,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;
 
     /**
@@ -173,6 +173,26 @@
     private Long updateBy;
 
     /**
+     * 鐩爣搴撲綅
+     */
+    @ApiModelProperty("鐩爣搴撲綅")
+    @TableField(exist = false)
+    private String stockLocs;
+
+    /**
+     * 搴撳瓨鏁伴噺
+     */
+    @ApiModelProperty("搴撳瓨鏁伴噺")
+    @TableField(exist = false)
+    private Double stockQty;
+
+
+    /***
+     * 鏄惁鍏ㄦ嫋鍑哄簱
+     */
+    @TableField(exist = false)
+    private Short flagAll;
+    /**
      * 澶囨敞
      */
     @ApiModelProperty(value= "澶囨敞")
@@ -180,13 +200,14 @@
 
     public WaveItem() {}
 
-    public WaveItem(Long waveId,String waveCode,Long matnrId,String matnrName,String matnrCode,String batch,String splrBatch,String orderCode,Long orderItemId,String unit,String trackCode,String fieldsIndex,Double anfme,Double workQty,Long tenantId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
+    public WaveItem(Long waveId,String waveCode,Long matnrId,String matnrName,String matnrCode,String batch,String splrBatch,String orderCode, Long orderId,Long orderItemId,String unit,String trackCode,String fieldsIndex,Double anfme,Double workQty,Long tenantId,Integer status,Integer deleted,Date createTime,Long createBy,Date updateTime,Long updateBy,String memo) {
         this.waveId = waveId;
         this.waveCode = waveCode;
         this.matnrId = matnrId;
-        this.matnrName = matnrName;
+        this.maktx = matnrName;
         this.matnrCode = matnrCode;
         this.batch = batch;
+        this.orderId = orderId;
         this.splrBatch = splrBatch;
         this.orderCode = orderCode;
         this.orderItemId = orderItemId;
@@ -205,6 +226,7 @@
         this.memo = memo;
     }
 
+
 //    WaveItem waveItem = new WaveItem(
 //            null,    // 娉㈡ID
 //            null,    // 娉㈡鍙�

--
Gitblit v1.9.1