From d71313cac99fc8722f5e32055cedb531f4ab495a Mon Sep 17 00:00:00 2001
From: dubin <bindu_bean@163.com>
Date: 星期三, 10 十二月 2025 16:32:14 +0800
Subject: [PATCH] 库存明细统计报表导出
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 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..43a9228 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,11 @@
private String maktx;
@ApiModelProperty(value= "瑙勬牸")
- @ExcelProperty("瑙勬牸")
+ //@ExcelProperty("瑙勬牸")
private String specs;
@ApiModelProperty(value= "璐у搧鐗瑰緛")
- @ExcelProperty("璐у搧鐗瑰緛")
+ //@ExcelProperty("璐у搧鐗瑰緛")
private String batch;
@ApiModelProperty(value= "鍗曟嵁缂栧彿")
@@ -103,7 +106,8 @@
private Double weight;
@ApiModelProperty(value= "闀垮害")
- private Double man_length;
+ @TableField("man_length")
+ private Double manLength;
@ApiModelProperty(value= "浣撶Н")
private Double volume;
@@ -166,28 +170,32 @@
private Integer owner;
/**
- * 澶囩敤1
+ * 澶囩敤1(PO)
*/
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ @ApiModelProperty(value= "澶囩敤1")//PO
+ @ExcelProperty("瀹㈡埛PO")
+ private String standby1 = "1";
/**
- * 澶囩敤2
+ * 澶囩敤2(UPC)
*/
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ @ApiModelProperty(value= "澶囩敤2")//UPC
+ @ExcelProperty("鏉＄爜UPC")
+ private String standby2 = "1";
/**
- * 澶囩敤3
+ * 澶囩敤3(SKU)
*/
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ @ApiModelProperty(value= "澶囩敤3")//SKU
+ @ExcelProperty("瀹㈡埛SKU")
+ private String standby3 = "1";
/**
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
+ @ExcelProperty("璐т富")
private String boxType1 = "1";
/**
@@ -202,6 +210,7 @@
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
+ @ExcelProperty("閲囪喘鍗曞彿")
private String boxType3 = "1";
/**
@@ -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