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/LocDetl.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index 060c30f..77d7521 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -11,6 +11,7 @@
import com.zy.asrs.service.BasQualityTestingService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.LocOwnerService;
+import com.zy.asrs.utils.LocAliasUtils;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
@@ -164,6 +165,57 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ @ApiModelProperty(value= "鍏ュ簱鎶撴媿鐓х墖")
+ private String pic;
+
+ /**
+ * 闆嗚绠卞彿
+ */
+ @ApiModelProperty(value= "闆嗚绠卞彿")
+ @ExcelProperty("闆嗚绠卞彿")
+ @TableField("container_no")
+ private String containerNo;
+
+ /**
+ * TEU
+ */
+ @ApiModelProperty(value= "TEU")
+ @ExcelProperty("TEU")
+ @TableField("teu")
+ private Integer teu;
+
+ /**
+ * 杞︾墝鍙�
+ */
+ @ApiModelProperty(value= "杞︾墝鍙�")
+ @ExcelProperty("杞︾墝鍙�")
+ @TableField("plate_no")
+ private String plateNo;
+
+ /**
+ * 杞︽鍙�
+ */
+ @ApiModelProperty(value= "杞︽鍙�")
+ @ExcelProperty("杞︽鍙�")
+ @TableField("train_no")
+ private String trainNo;
+
+ /**
+ * 璐х墿棰戞
+ */
+ @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+ @ExcelProperty("璐х墿棰戞")
+ @TableField("freq_type")
+ private Integer freqType;
+
+ /**
+ * 绔嬫柟鏁�
+ */
+ @ApiModelProperty(value= "绔嬫柟鏁帮紝鍗曚綅锛氱珛鏂圭背")
+ @ExcelProperty("绔嬫柟鏁�")
+ @TableField("cube_number")
+ private Double cubeNumber;
+
/**
* 鎷ユ湁鑰�
*/
@@ -221,12 +273,16 @@
private Integer frozen;
public String getLocNo$(){
+ return getLocAlias();
+ }
+
+ public String getLocAlias(){
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 getOwner$(){
LocOwnerService service = SpringUtils.getBean(LocOwnerService.class);
--
Gitblit v1.9.1