From b67bf724fc788cb3b86641c7eb7a35cdbc4c7a93 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 06 五月 2025 20:17:25 +0800
Subject: [PATCH] PO单导入功能优化

---
 rsf-server/src/main/java/com/vincent/rsf/server/manager/entity/AsnOrderItem.java |   55 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
 1 files changed, 52 insertions(+), 3 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 572b4d2..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;
 
@@ -55,6 +56,7 @@
     @ApiModelProperty("瀛楁绱㈠紩")
     private String fieldsIndex;
 
+
     @ApiModelProperty("鎵ц鏁伴噺")
     private Double workQty;
 
@@ -99,6 +101,12 @@
      */
     @ApiModelProperty(value= "鐗╂枡鍚嶇О")
     private String maktx;
+
+    @ApiModelProperty("瑙勬牸")
+    private String spec;
+
+    @ApiModelProperty("鍨嬪彿")
+    private String model;
 
     /**
      * 閫佽揣鏁伴噺
@@ -181,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;
@@ -209,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;
 
     /**
@@ -222,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;
 
     /**
@@ -229,7 +260,7 @@
      */
     @ApiModelProperty(value= "澶囨敞")
     private String memo;
-
+//
     public AsnOrderItem() {}
 
     public AsnOrderItem(Long asnId,String asnCode,Long poDetlId, String matnrCode, String poCode,Long matnrId,String matnk,Double anfme,String stockUnit,Double purQty,String purUnit,Double qty,String splrCode,String splrName,String qrcode,String barcode,String packName,Integer status, Integer ntyStatus,Integer deleted,Integer tenantId,Long createBy,Date createTime,Long updateBy,Date updateTime,String memo) {
@@ -346,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