From d33a10970ca14424fa8b594027f8434adaffc5b6 Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期三, 25 十二月 2024 13:18:05 +0800 Subject: [PATCH] # --- src/main/java/com/zy/asrs/entity/OrderDetlPakout.java | 21 +++++++++++++++++++++ 1 files changed, 21 insertions(+), 0 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakout.java index fe454d0..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; @@ -526,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()) -- Gitblit v1.9.1