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 +++++++ src/main/java/com/zy/asrs/entity/WaitPakinLog.java | 22 +++++++ src/main/java/com/zy/asrs/entity/OrderDetl.java | 21 ++++++ src/main/java/com/zy/asrs/entity/WaitPakin.java | 22 +++++++ src/main/java/com/zy/asrs/entity/LocDetl.java | 21 +++++++ src/main/java/com/zy/asrs/entity/OrderDetlPakin.java | 21 +++++++ 6 files changed, 127 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/LocDetl.java b/src/main/java/com/zy/asrs/entity/LocDetl.java index ba30f0f..129453c 100644 --- a/src/main/java/com/zy/asrs/entity/LocDetl.java +++ b/src/main/java/com/zy/asrs/entity/LocDetl.java @@ -4,8 +4,11 @@ import com.alibaba.excel.annotation.ExcelProperty; 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.asrs.service.LocMastService; import com.zy.asrs.service.LocOwnerService; import com.zy.common.utils.Synchro; @@ -334,4 +337,22 @@ } } + 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; + } + } diff --git a/src/main/java/com/zy/asrs/entity/OrderDetl.java b/src/main/java/com/zy/asrs/entity/OrderDetl.java index 7235dd1..aa96844 100644 --- a/src/main/java/com/zy/asrs/entity/OrderDetl.java +++ b/src/main/java/com/zy/asrs/entity/OrderDetl.java @@ -4,10 +4,12 @@ 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.model.DetlDto; import com.zy.common.utils.Synchro; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -607,6 +609,23 @@ } } + 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); diff --git a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java index 028ef39..19ed434 100644 --- a/src/main/java/com/zy/asrs/entity/OrderDetlPakin.java +++ b/src/main/java/com/zy/asrs/entity/OrderDetlPakin.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; @@ -525,6 +528,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(OrderDetlPakin orderDetlPakin){ return ( this.orderNo.equals(orderDetlPakin.getOrderNo()) 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()) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index a5bf524..e1bfb4c 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; @@ -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); } diff --git a/src/main/java/com/zy/asrs/entity/WaitPakinLog.java b/src/main/java/com/zy/asrs/entity/WaitPakinLog.java index 734ecb8..d8c7306 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; @@ -254,4 +258,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