From 34aa40fffdda9155e77a7991ca8c7691102bb0b8 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期日, 26 四月 2026 11:29:05 +0800
Subject: [PATCH] no message

---
 src/main/java/com/zy/asrs/entity/OrderPakout.java |   75 ++++++++++++++++++++++++++++++++-----
 1 files changed, 65 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderPakout.java b/src/main/java/com/zy/asrs/entity/OrderPakout.java
index 2ffa057..f360a18 100644
--- a/src/main/java/com/zy/asrs/entity/OrderPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderPakout.java
@@ -6,6 +6,9 @@
 import com.baomidou.mybatisplus.enums.IdType;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.api.enums.OrderWkType;
+import com.zy.asrs.entity.BasAreas;
+import com.zy.asrs.service.BasAreasService;
 import com.zy.asrs.service.DocTypeService;
 import com.zy.asrs.service.OrderSettleService;
 import com.zy.common.utils.Synchro;
@@ -66,7 +69,7 @@
     @TableField("item_id")
     private Long itemId;
 
-    @ApiModelProperty(value= "")
+    @ApiModelProperty(value= "鍖哄煙ID")
     @TableField("item_name")
     private String itemName;
 
@@ -256,6 +259,10 @@
     @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
     private Date updateTime;
 
+    @TableField("target_location")
+    private String targetLocation;
+
+
     /**
      * 澶囨敞
      */
@@ -268,6 +275,13 @@
     @ApiModelProperty(value= "鐘舵��  2:宸插畬鎴� 1: 杩涜涓� 0: 鍒濆  ")
     @TableField("move_status")
     private Integer moveStatus;
+
+    /**
+     * 鐘舵�� 1: 杩涜涓�  0: 鍒濆  2:宸插畬鎴�
+     */
+    @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨嬶紙0锛氭湭鐭ワ紝1锛氬叆搴擄紝2锛氬嚭搴擄級")
+    @TableField("pakin_pakout_status")
+    private Integer pakinPakoutStatus;
 
     public OrderPakout() {}
 
@@ -345,6 +359,36 @@
 //            null    // 澶囨敞
 //    );
 
+
+    public String getItemName$() {
+        if (Cools.isEmpty(this.itemName)) {
+            return null;
+        }
+        try {
+            BasAreasService service = SpringUtils.getBean(BasAreasService.class);
+            BasAreas area = service.selectById(Long.parseLong(this.itemName));
+            if (!Cools.isEmpty(area)) {
+                return area.getName();
+            }
+        } catch (Exception e) {
+            return this.itemName;
+        }
+        return null;
+    }
+
+    public String getOrderType$() {
+        if (null == this.targetLocation) {
+            return null;
+        }
+        if (this.targetLocation.equals("2")) {
+            return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc;
+        } else if (this.targetLocation.equals("3")){
+            return OrderWkType.ORDER_WK_ORDER_OUT_EO.desc;
+        } else {
+            return null;
+        }
+    }
+
     public String getDocType$(){
         DocTypeService service = SpringUtils.getBean(DocTypeService.class);
         DocType docType = service.selectById(this.docType);
@@ -354,15 +398,14 @@
         return null;
     }
 
-    public String getPayType$(){
-        if (null == this.payType){ return null; }
-        switch (this.payType){
-            case 1:
-                return "鐜伴噾";
-            case 2:
-                return "璁拌处";
-            default:
-                return String.valueOf(this.payType);
+    public String getShipName$(){
+        if (null == this.shipName){ return  OrderWkType.ORDER_WK_ORDER_OUT_SO.desc; }
+        if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_EO.val)){
+            return OrderWkType.ORDER_WK_ORDER_OUT_EO.desc;
+        } else if (this.shipName.equals(OrderWkType.ORDER_WK_ORDER_OUT_SO.val)){
+            return OrderWkType.ORDER_WK_ORDER_OUT_SO.desc;
+        } else {
+            return OrderWkType.ORDER_WK_ORDER_OUT.desc;
         }
     }
 
@@ -401,6 +444,18 @@
         return null;
     }
 
+    public String getPakinPakoutStatus$(){
+        switch (this.pakinPakoutStatus){
+            case 1:
+                return "Y";
+            case 2:
+                return "N";
+            default:
+                return null;
+        }
+    }
+
+
     public String getStatus$(){
         if (null == this.status){ return null; }
         switch (this.status){

--
Gitblit v1.9.1