From ec92a309b68b1e7029196d9d0ea0ac7e2badb5a7 Mon Sep 17 00:00:00 2001
From: pjb <pjb123456>
Date: 星期日, 03 八月 2025 09:32:12 +0800
Subject: [PATCH] 设置入空桶库输送线缓存任务数
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 33 ++++++++++++++++++++++++++++++---
1 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java
index ba30f0f..2c3590c 100644
--- a/src/main/java/com/zy/asrs/entity/LocDetl.java
+++ b/src/main/java/com/zy/asrs/entity/LocDetl.java
@@ -4,8 +4,11 @@
import com.alibaba.excel.annotation.ExcelProperty;
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableName;
+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.LocMastService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.common.utils.Synchro;
@@ -45,11 +48,10 @@
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ @ExcelProperty("鎵瑰彿")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -58,6 +60,7 @@
private String orderNo;
@ApiModelProperty(value= "鍨嬪彿")
+ @ExcelProperty("妗跺瀷")
private String model;
@ApiModelProperty(value= "棰滆壊")
@@ -89,6 +92,7 @@
@ApiModelProperty(value= "鐢熶骇鏃ユ湡")
@TableField("manu_date")
+ @ExcelProperty("鐢熶骇鏃ユ湡")
private String manuDate;
@ApiModelProperty(value= "鍝侀」鏁�")
@@ -100,12 +104,17 @@
private Double safeQty;
@ApiModelProperty(value= "閲嶉噺")
+ @ExcelProperty("鍑�閲�")
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @TableField("man_length")
+ @ExcelProperty("姣涢噸")
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
+ @TableField("volume")
+ @ExcelProperty("缃愯閲�")
private Double volume;
@ApiModelProperty(value= "涓夋柟缂栫爜")
@@ -334,4 +343,22 @@
}
}
+ 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;
+ }
+
}
--
Gitblit v1.9.1