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/OrderDetlPakout.java |  166 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 161 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 95304a4..cafd870 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -4,8 +4,11 @@
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.common.SpringUtils;
+import com.zy.asrs.service.BasProcessProceduresService;
+import com.zy.asrs.service.BasQualityTestingService;
 import com.zy.asrs.service.OrderService;
 import com.zy.common.utils.Synchro;
 import com.zy.system.entity.User;
@@ -308,25 +311,157 @@
      */
     @ApiModelProperty(value= "琛屽彿")
     @TableField("line_number")
-    private Integer lineNumber;
+    private Long lineNumber;
 
     /**
      * 澶囩敤1
      */
     @ApiModelProperty(value= "澶囩敤1")
-    private String standby1;
+    private String standby1 = "1";
 
     /**
      * 澶囩敤2
      */
     @ApiModelProperty(value= "澶囩敤2")
-    private String standby2;
+    private String standby2 = "1";
 
     /**
      * 澶囩敤3
      */
     @ApiModelProperty(value= "澶囩敤3")
-    private String standby3;
+    private String standby3 = "1";
+
+    /**
+     * 澶囩敤1
+     */
+    @ApiModelProperty(value= "澶囩敤1")
+    @TableField("box_type1")
+    private String boxType1 = "1";
+
+    /**
+     * 澶囩敤2
+     */
+    @ApiModelProperty(value= "澶囩敤2")
+    @TableField("box_type2")
+    private String boxType2 = "1";
+
+    /**
+     * 澶囩敤3
+     */
+    @ApiModelProperty(value= "澶囩敤3")
+    @TableField("box_type3")
+    private String boxType3 = "1";
+
+    /**
+     * 瀹藉害
+     */
+    @ApiModelProperty(value= "瀹藉害")
+    @TableField("width")
+    private Double width;
+
+    /**
+     * 楂樺害
+     */
+    @ApiModelProperty(value= "楂樺害")
+    @TableField("height")
+    private Double height;
+
+    /**
+     * erp鏁伴噺
+     */
+    @ApiModelProperty(value= "erp鏁伴噺")
+    @TableField("erp_anfme")
+    private Double erpAnfme;
+
+
+    /**
+     * 鏁伴噺
+     */
+    @ApiModelProperty(value= "涓嬪彂鍒嗘嫞绾挎暟閲�")
+    @TableField("sorting_anfme")
+    private Double sortingAnfme;
+
+    /**
+     * 鍚岃鍗曚腑鎵规鏍囪瘑
+     */
+    @ApiModelProperty(value= "鍚岃鍗曚腑鎵规鏍囪瘑")
+    @TableField("batch_seq")
+    private String batchSeq;
+
+    /**
+     * 鍑哄簱椤哄簭
+     */
+    @ApiModelProperty(value= "鍑哄簱椤哄簭")
+    private Integer seq;
+
+    /**
+     * 鎵樼洏缂栫爜
+     */
+    @ApiModelProperty(value= "鎵樼洏缂栫爜")
+    @TableField("pallet_id")
+    private String palletId;
+
+    /**
+     * 鍑哄簱鍙ｇ紪鐮�
+     */
+    @ApiModelProperty(value= "鍑哄簱鍙ｇ紪鐮�")
+    @TableField("station_id")
+    private String stationId;
+
+    /**
+     * 杩涗粨缂栧彿
+     */
+    @ApiModelProperty(value= "杩涗粨缂栧彿")
+    @TableField("entry_wms_code")
+    private String entryWmsCode;
+
+    /**
+     * 闆嗚绠卞彿
+     */
+    @ApiModelProperty(value= "闆嗚绠卞彿")
+    @TableField("container_no")
+    private String containerNo;
+
+    /**
+     * 澶栧簱闂ㄥ彿
+     */
+    @ApiModelProperty(value= "澶栧簱闂ㄥ彿")
+    @TableField("out_door_no")
+    private String outDoorNo;
+
+    /**
+     * 杞︾墝鍙�
+     */
+    @ApiModelProperty(value= "杞︾墝鍙�")
+    @TableField("plate_no")
+    private String plateNo;
+
+    /**
+     * 杞︽鍙�
+     */
+    @ApiModelProperty(value= "杞︽鍙�")
+    @TableField("train_no")
+    private String trainNo;
+
+    /**
+     * 璐х墿棰戞
+     */
+    @ApiModelProperty(value= "璐х墿棰戞")
+    @TableField("freq_type")
+    private Integer freqType;
+
+    /**
+     * 绔嬫柟鏁�
+     */
+    @ApiModelProperty(value= "绔嬫柟鏁�")
+    @TableField("cube_number")
+    private Double cubeNumber;
+
+    /**
+     * TEU
+     */
+    @ApiModelProperty(value= "TEU")
+    private Integer teu;
 
     public OrderDetlPakout() {}
 
@@ -505,6 +640,24 @@
         return "鏈畬鎴�";
     }
 
+    public String getBoxType1$(){
+        BasProcessProceduresService service = SpringUtils.getBean(BasProcessProceduresService.class);
+        BasProcessProcedures processProcedures = service.selectOne(new EntityWrapper<BasProcessProcedures>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(processProcedures)){
+            return String.valueOf(processProcedures.getBoxSpecs());
+        }
+        return this.boxType1;
+    }
+
+    public String getBoxType2$(){
+        BasQualityTestingService service = SpringUtils.getBean(BasQualityTestingService.class);
+        BasQualityTesting basQualityTesting = service.selectOne(new EntityWrapper<BasQualityTesting>().eq("box_type", this.boxType1));
+        if (!Cools.isEmpty(basQualityTesting)){
+            return String.valueOf(basQualityTesting.getBoxSpecs());
+        }
+        return this.boxType1;
+    }
+
     public boolean beSimilar(OrderDetlPakout orderDetlPakout){
         return (
                 this.orderNo.equals(orderDetlPakout.getOrderNo())
@@ -514,6 +667,9 @@
                 && this.standby1.equals(orderDetlPakout.getStandby1())
                 && this.standby2.equals(orderDetlPakout.getStandby2())
                 && this.standby3.equals(orderDetlPakout.getStandby3())
+                        && this.boxType1.equals(orderDetlPakout.getBoxType1())
+                        && this.boxType2.equals(orderDetlPakout.getBoxType2())
+                        && this.boxType3.equals(orderDetlPakout.getBoxType3())
         );
     }
 
@@ -521,4 +677,4 @@
         Synchro.Copy(source, this);
     }
 
-}
\ No newline at end of file
+}

--
Gitblit v1.9.1