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/WrkMastLog.java | 54 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 49 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 77b7e24..febdf60 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.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;
@@ -70,6 +71,13 @@
@ApiModelProperty(value= "鍫嗗灈鏈哄彿")
@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")
@@ -147,6 +155,10 @@
@TableField("plt_type")
private Integer pltType;
+ @ApiModelProperty(value= "")
+ @TableField("batch_seq")
+ private String batchSeq;
+
/**
* 绌烘澘
*/
@@ -176,7 +188,7 @@
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value= "涓氬姟鍗曞彿")
@TableField("user_no")
private String userNo;
@@ -212,6 +224,10 @@
@ApiModelProperty(value= "")
@TableField("exp_time")
private Double expTime;
+
+ @ApiModelProperty(value= "鑰楁椂(鍒嗛挓)")
+ @TableField("cost_time")
+ private Integer costTime;
@ApiModelProperty(value= "")
@TableField("ref_wrkno")
@@ -299,6 +315,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;
@@ -373,6 +413,10 @@
return null;
}
+ public String getAreaId$(){
+ return LocAliasUtils.areaName(this.areaId);
+ }
+
public String getWrkDate$(){
if (Cools.isEmpty(this.wrkDate)){
return "";
@@ -384,9 +428,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$(){
@@ -411,9 +455,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