From 7cf2e143941e1548cc468992ada42106a27805a1 Mon Sep 17 00:00:00 2001
From: skyouc <creaycat@gmail.com>
Date: 星期二, 09 十二月 2025 19:22:40 +0800
Subject: [PATCH] Merge branch 'jsxswms' of http://47.97.1.152:5880/r/zy-asrs into jsxswms
---
src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 41 +++++++++++++++++++++++++++++++++++++++++
1 files changed, 41 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 734ecb8..9b3373e 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;
@@ -15,6 +19,8 @@
public class WaitPakinLog implements Serializable {
private static final long serialVersionUID = 1L;
+
+ private Long id;
@ApiModelProperty(value= "鎵樼洏鏉＄爜")
private String zpallet;
@@ -31,6 +37,10 @@
@ApiModelProperty(value= "鍟嗗搧鍚嶇О")
private String maktx;
+
+ @ApiModelProperty("缁勬墭绫诲瀷")
+ @TableField("type")
+ private String type;
@ApiModelProperty(value= "鎵瑰彿")
private String batch;
@@ -216,6 +226,19 @@
}
}
+ public String getType$(){
+ if (null == this.type){ return null; }
+ switch (this.type){
+ case "1":
+ return "AGV缁勬墭";
+ case "0":
+ return "鍫嗗灈鏈虹粍鎵�";
+ default:
+ return "鍫嗗灈鏈虹粍鎵�";
+ }
+ }
+
+
public String getInspect$(){
if (null == this.inspect){ return null; }
switch (this.inspect){
@@ -254,4 +277,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