From 52ef10033d82393443d8b73faa88a863834a4c8f Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期一, 24 十一月 2025 14:39:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jshdasrs' into jshdasrs
---
src/main/java/com/zy/asrs/entity/LocDetl.java | 39 ++++++++++++++++++++++++++++++---------
1 files changed, 30 insertions(+), 9 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..77bdfcb 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;
@@ -166,22 +169,22 @@
private Integer owner;
/**
- * 澶囩敤1
+ * 澶囩敤1(PO)
*/
- @ApiModelProperty(value= "澶囩敤1")
- private String standby1 = "";
+ @ApiModelProperty(value= "澶囩敤1")//PO
+ private String standby1 = "1";
/**
- * 澶囩敤2
+ * 澶囩敤2(UPC)
*/
- @ApiModelProperty(value= "澶囩敤2")
- private String standby2 = "";
+ @ApiModelProperty(value= "澶囩敤2")//UPC
+ private String standby2 = "1";
/**
- * 澶囩敤3
+ * 澶囩敤3(SKU)
*/
- @ApiModelProperty(value= "澶囩敤3")
- private String standby3 = "";
+ @ApiModelProperty(value= "澶囩敤3")//SKU
+ private String standby3 = "1";
/**
* 澶囩敤1
@@ -334,4 +337,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