From d3c44bb9a25c42bba6e2dfd85ac7d04863112dc8 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 30 四月 2025 10:48:38 +0800
Subject: [PATCH] 收货单改入修改 单位带入修改
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/WaveItem.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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..a83f7e7 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,6 +1,7 @@
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;
@@ -9,10 +10,7 @@
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 +57,7 @@
* 鐗╂枡鍚嶇О
*/
@ApiModelProperty(value= "鐗╂枡鍚嶇О")
- private String matnrName;
+ private String maktx;
/**
* 鍟嗗搧缂栧彿
@@ -173,6 +171,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 +198,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 +224,7 @@
this.memo = memo;
}
+
// WaveItem waveItem = new WaveItem(
// null, // 娉㈡ID
// null, // 娉㈡鍙�
--
Gitblit v1.9.1