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 |   52 ++++++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 50 insertions(+), 2 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 4672de4..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
@@ -5,6 +5,7 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.experimental.Accessors;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -101,6 +102,12 @@
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String maktx;
 
+    @ApiModelProperty("瑙勬牸")
+    private String spec;
+
+    @ApiModelProperty("鍨嬪彿")
+    private String model;
+
     /**
      * 閫佽揣鏁伴噺
      */
@@ -182,13 +189,34 @@
     private Integer ntyStatus;
 
     /**
-     * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  
+     * 璐ㄦ缁撴灉
+     */
+    @ApiModelProperty("璐ㄦ缁撴灉")
+    private Short isptResult;
+
+    /**
+     * 璐ㄦ鐘舵��
+     */
+    @ApiModelProperty("璐ㄦ鐘舵��")
+    private Short isptStatus;
+
+
+    @ApiModelProperty("鍚堟牸鏁伴噺")
+    @TableField(exist = false)
+    private Double safeQty;
+
+    @ApiModelProperty("涓嶅悎鏍兼暟閲�")
+    @TableField(exist = false)
+    private Double disQty;
+
+    /**
+     * 鐘舵�� 1: 姝ｅ父  0: 鍐荤粨
      */
     @ApiModelProperty(value= "鐘舵�� 1: 姝ｅ父  0: 鍐荤粨  ")
     private Integer status;
 
     /**
-     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  
+     * 鏄惁鍒犻櫎 1: 鏄�  0: 鍚�
      */
     @ApiModelProperty(value= "鏄惁鍒犻櫎 1: 鏄�  0: 鍚�  ")
     private Integer deleted;
@@ -210,6 +238,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;
 
     /**
@@ -223,6 +252,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;
 
     /**
@@ -347,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