From 6fd5d255ffb664241ac081b6b09fc1cda32abd7f Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期三, 07 五月 2025 15:46: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/AsnOrderItem.java | 27 +++++++++++++++++++++++++++
1 files changed, 27 insertions(+), 0 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 18b0a4a..f896cf4 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
@@ -200,6 +200,15 @@
@ApiModelProperty("璐ㄦ鐘舵��")
private Short isptStatus;
+
+ @ApiModelProperty("鍚堟牸鏁伴噺")
+ @TableField(exist = false)
+ private Double safeQty;
+
+ @ApiModelProperty("涓嶅悎鏍兼暟閲�")
+ @TableField(exist = false)
+ private Double disQty;
+
/**
* 鐘舵�� 1: 姝ｅ父 0: 鍐荤粨
*/
@@ -368,4 +377,22 @@
}
}
+ public String getIsptResult$(){
+ if (null == this.isptResult){ return null; }
+ switch (this.isptResult){
+ case 0:
+ return "鏈";
+ case 1:
+ return "鍚堟牸";
+ case 2:
+ return "涓嶅悎鏍�";
+ case 3:
+ return "寰呭畾";
+ case 4:
+ return "閮ㄥ垎鍚堟牸";
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.1