From 13d295c4210ee589b3e524bd157f85c63bca5a3e Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期四, 30 四月 2026 13:12:08 +0800
Subject: [PATCH] 1.出库单据转历史档有问题 2.新增单据历史档 3.修复入库完成转明细失败

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 49 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 4677f57..319f60b 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import com.zy.asrs.service.*;
+import com.zy.asrs.utils.LocAliasUtils;
 import com.zy.system.entity.User;
 import com.zy.system.service.UserService;
 import com.core.common.Cools;
@@ -66,6 +67,13 @@
     @TableField("crn_no")
     private Integer crnNo;
 
+    /**
+     * 搴撳尯锛�1=A鍖猴紝2=B鍖猴紝3=C鍖�
+     */
+    @ApiModelProperty(value= "搴撳尯")
+    @TableField("area_id")
+    private Integer areaId;
+
     @ApiModelProperty(value= "")
     @TableField("sheet_no")
     private String sheetNo;
@@ -113,13 +121,17 @@
     @TableField("loc_sts")
     private String locSts;
 
-    @ApiModelProperty(value= "璁㈠崟鍙�")
+    @ApiModelProperty(value= "涓氬姟鍗曞彿")
     @TableField("user_no")
     private String userNo;
 
     @ApiModelProperty(value= "鍑哄簱椤哄簭")
     @TableField("plt_type")
     private Integer pltType;
+
+    @ApiModelProperty(value= "鍑哄簱鎵规搴忓彿")
+    @TableField("batch_seq")
+    private String batchSeq;
 
     /**
      * 鎷ｆ枡
@@ -205,6 +217,10 @@
     @ApiModelProperty(value= "")
     @TableField("exp_time")
     private Double expTime;
+
+    @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+    @TableField("cost_time")
+    private Integer costTime;
 
     @ApiModelProperty(value= "")
     @TableField("ref_wrkno")
@@ -298,6 +314,30 @@
     @TableField("Pdc_type")
     private String PdcType;
 
+    @ApiModelProperty(value= "闆嗚绠卞彿")
+    @TableField("container_no")
+    private String containerNo;
+
+    @ApiModelProperty(value= "TEU")
+    @TableField("teu")
+    private Integer teu;
+
+    @ApiModelProperty(value= "杞︾墝鍙�")
+    @TableField("plate_no")
+    private String plateNo;
+
+    @ApiModelProperty(value= "杞︽鍙�")
+    @TableField("train_no")
+    private String trainNo;
+
+    @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+    @TableField("freq_type")
+    private Integer freqType;
+
+    @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+    @TableField("cube_number")
+    private Double cubeNumber;
+
     @ApiModelProperty(value= "")
     @TableField("ctn_no")
     private String ctnNo;
@@ -359,6 +399,10 @@
         return null;
     }
 
+    public String getAreaId$(){
+        return LocAliasUtils.areaName(this.areaId);
+    }
+
     public String getWrkDate$(){
         if (Cools.isEmpty(this.wrkDate)){
             return "";
@@ -370,9 +414,9 @@
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.locNo);
         if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+            return LocAliasUtils.displayLocNo(locMast);
         }
-        return null;
+        return this.locNo;
     }
 
     public String getStaNo$(){
@@ -397,9 +441,9 @@
         LocMastService service = SpringUtils.getBean(LocMastService.class);
         LocMast locMast = service.selectById(this.sourceLocNo);
         if (!Cools.isEmpty(locMast)){
-            return String.valueOf(locMast.getLocNo());
+            return LocAliasUtils.displayLocNo(locMast);
         }
-        return null;
+        return this.sourceLocNo;
     }
 
     public String getIoTime$(){

--
Gitblit v1.9.1