From 6a698875b0557c1e06a7e7958d2109aa210412f5 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 27 五月 2025 10:18:58 +0800
Subject: [PATCH] 13
---
src/main/java/com/zy/asrs/entity/WaitPakin.java | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java
index a5bf524..71074e0 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakin.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakin.java
@@ -2,7 +2,11 @@
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.common.utils.Synchro;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -175,21 +179,21 @@
*/
@ApiModelProperty(value= "澶囩敤1")
@TableField("box_type1")
- private String boxType1 = "1";
+ private String boxType1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
@TableField("box_type2")
- private String boxType2 = "1";
+ private String boxType2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
@TableField("box_type3")
- private String boxType3 = "1";
+ private String boxType3 = "";
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
@@ -255,6 +259,24 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime);
}
+ 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;
+ }
+
public void sync(Object source) {
Synchro.Copy(source, this);
}
--
Gitblit v1.9.1