From 1ea84a23004ebcfaf86cb436d84164602ca9091d Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 08 八月 2025 17:03:36 +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/CheckDiffItem.java | 35 +++++++++--------------------------
1 files changed, 9 insertions(+), 26 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
index 505177f..5c16c7d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/CheckDiffItem.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;
@@ -13,10 +14,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;
@@ -192,28 +190,6 @@
this.memo = memo;
}
-// CheckDiffItem checkDiffItem = new CheckDiffItem(
-// null, // 鐩樼偣ID
-// null, // 鐩樼偣鍗�
-// null, // 鐗╂枡鍚嶇О
-// null, // 鐗╂枡缂栫爜
-// null, // 瑙勬牸
-// null, // 鍨嬪彿
-// null, // 鎵樼洏鐮�
-// null, // 鎵规
-// null, // 甯愰潰搴撳瓨
-// null, // 鐩樼偣搴撳瓨
-// null, // 鎵ц鐘舵��
-// null, // 宸紓鍘熷洜
-// null, // 鐘舵�乕闈炵┖]
-// null, // 鏄惁鍒犻櫎[闈炵┖]
-// null, // 绉熸埛
-// null, // 娣诲姞浜哄憳
-// null, // 娣诲姞鏃堕棿[闈炵┖]
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿[闈炵┖]
-// null // 澶囨敞
-// );
public String getStatus$(){
if (null == this.status){ return null; }
@@ -241,6 +217,13 @@
return dictData.getLabel();
}
+ public Double getDiffQty() {
+ if (checkQty.compareTo(0.0) <= 0) {
+ return 0.0;
+ }
+ Double diffQty = Math.round((this.checkQty - this.anfme) * 1000) / 1000.0;
+ return diffQty;
+ }
public String getCreateBy$(){
UserService service = SpringUtils.getBean(UserService.class);
--
Gitblit v1.9.1