From f25bd904560faada2a00e93fbd8abab6be238f9c Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 15 四月 2025 15:44:31 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 53 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 49 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
index 95304a4..3af2a93 100644
--- a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
+++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java
@@ -4,8 +4,11 @@
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
import com.baomidou.mybatisplus.enums.IdType;
+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.OrderService;
import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
@@ -308,25 +311,46 @@
*/
@ApiModelProperty(value= "琛屽彿")
@TableField("line_number")
- private Integer lineNumber;
+ private Long lineNumber;
/**
* 澶囩敤1
*/
@ApiModelProperty(value= "澶囩敤1")
- private String standby1;
+ private String standby1 = "";
/**
* 澶囩敤2
*/
@ApiModelProperty(value= "澶囩敤2")
- private String standby2;
+ private String standby2 = "";
/**
* 澶囩敤3
*/
@ApiModelProperty(value= "澶囩敤3")
- private String standby3;
+ private String standby3 = "";
+
+ /**
+ * 澶囩敤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 OrderDetlPakout() {}
@@ -505,6 +529,24 @@
return "鏈畬鎴�";
}
+ 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 boolean beSimilar(OrderDetlPakout orderDetlPakout){
return (
this.orderNo.equals(orderDetlPakout.getOrderNo())
@@ -514,6 +556,9 @@
&& this.standby1.equals(orderDetlPakout.getStandby1())
&& this.standby2.equals(orderDetlPakout.getStandby2())
&& this.standby3.equals(orderDetlPakout.getStandby3())
+ && this.boxType1.equals(orderDetlPakout.getBoxType1())
+ && this.boxType2.equals(orderDetlPakout.getBoxType2())
+ && this.boxType3.equals(orderDetlPakout.getBoxType3())
);
}
--
Gitblit v1.9.1