From a1f7856f0f450883c7060444a4fc2b721720a051 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 15 四月 2026 11:00:05 +0800
Subject: [PATCH] 1.erp对接新增字段 2.电视机数据
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
index 9834e38..19adfa1 100644
--- a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java
+++ b/src/main/java/com/zy/asrs/entity/WaitPakinLog.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 io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -68,6 +72,10 @@
@ApiModelProperty(value= "浜у湴")
private String origin;
+
+ @ApiModelProperty(value= "璐х墿棰戞锛�1=楂橀锛�2=浣庨")
+ @TableField("freq_type")
+ private Integer freqType;
@ApiModelProperty(value= "鍘傚")
private String manu;
@@ -151,6 +159,45 @@
@ApiModelProperty(value= "澶囨敞")
private String memo;
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ private String standby1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ private String standby2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ private String standby3 = "1";
+
+ /**
+ * 澶囩敤1
+ */
+ @ApiModelProperty(value= "澶囩敤1")
+ @TableField("box_type1")
+ private String boxType1 = "1";
+
+ /**
+ * 澶囩敤2
+ */
+ @ApiModelProperty(value= "澶囩敤2")
+ @TableField("box_type2")
+ private String boxType2 = "1";
+
+ /**
+ * 澶囩敤3
+ */
+ @ApiModelProperty(value= "澶囩敤3")
+ @TableField("box_type3")
+ private String boxType3 = "1";
+
public String getBeBatch$(){
if (null == this.beBatch){ return null; }
switch (this.beBatch){
@@ -215,4 +262,22 @@
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;
+ }
+
}
--
Gitblit v1.9.1