From 44522f08bff3abc3c34c77215eacd2cb3a484a0d Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 29 四月 2026 14:07:51 +0800
Subject: [PATCH] 双伸出库优先筛选浅库位的任务进行出库，浅库位任务不足二十个则补上深库位出库的任务

---
 src/main/java/com/zy/asrs/entity/WrkMast.java |   59 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
 1 files changed, 52 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 15b6892..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;
@@ -13,6 +14,7 @@
 import lombok.Data;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.Date;
 
@@ -65,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;
@@ -112,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 +218,10 @@
     @TableField("exp_time")
     private Double expTime;
 
+    @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+    @TableField("cost_time")
+    private Integer costTime;
+
     @ApiModelProperty(value= "")
     @TableField("ref_wrkno")
     private Double refWrkno;
@@ -272,7 +289,7 @@
 
     @ApiModelProperty(value= "")
     @TableField("sc_weight")
-    private Double scWeight;
+    private BigDecimal scWeight;
 
     @ApiModelProperty(value= "")
     @TableField("log_mk")
@@ -292,10 +309,34 @@
     @ApiModelProperty(value= "鏉＄爜")
     private String barcode;
 
-    // Y:閿�鍞鍗曞嚭搴撲换鍔�
+    // ERP鍑哄簱纭鏍囪锛歒 鍏佽涓嬪彂WCS锛孨/绌� 涓嶅厑璁�
     @ApiModelProperty(value= "")
     @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")
@@ -358,6 +399,10 @@
         return null;
     }
 
+    public String getAreaId$(){
+        return LocAliasUtils.areaName(this.areaId);
+    }
+
     public String getWrkDate$(){
         if (Cools.isEmpty(this.wrkDate)){
             return "";
@@ -369,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$(){
@@ -396,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