From 3681ab06756a2da4e95f61f0d3dc9c3f30e6b948 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 16:32:52 +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/StockStatistic.java | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
index 09c91ce..17b88f7 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/StockStatistic.java
@@ -1,10 +1,7 @@
package com.vincent.rsf.server.manager.entity;
-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 com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.vincent.rsf.server.manager.enums.TaskType;
import io.swagger.annotations.ApiModel;
@@ -93,6 +90,22 @@
@ApiModelProperty(value= "鏁伴噺")
private Double anfme;
+ @ApiModelProperty("鍏ュ簱娆℃暟")
+ @TableField(exist = false)
+ private Integer inAnfmeCount;
+
+ @ApiModelProperty("鍑哄簱娆℃暟")
+ @TableField(exist = false)
+ private Integer outAnfmeCount;
+
+ @ApiModelProperty("鍏ュ簱鏁伴噺姹囨��")
+ @TableField(exist = false)
+ private Double inAnfme;
+
+ @ApiModelProperty("鍑哄簱鏁伴噺姹囨��")
+ @TableField(exist = false)
+ private Double outAnfme;
+
/**
* 搴撳瓨鍗曚綅
*/
--
Gitblit v1.9.1