From 285deae97a62db611ee2485d3940e24307594f2a Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期一, 22 九月 2025 20:09:42 +0800 Subject: [PATCH] 数据结构修改 任务工作档修改 组托工作档修改 --- src/main/java/com/zy/asrs/entity/WaitPakin.java | 30 ++++++++++++++++++++++++++++-- 1 files changed, 28 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WaitPakin.java b/src/main/java/com/zy/asrs/entity/WaitPakin.java index a5bf524..51002e4 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; @@ -39,6 +43,10 @@ @ApiModelProperty(value= "鍗曟嵁缂栧彿") @TableField("order_no") private String orderNo; + + @ApiModelProperty("鍗曟嵁ID") + @TableField("order_id") + private Long orderId; @ApiModelProperty(value= "瑙勬牸") private String specs; @@ -255,7 +263,25 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - public void sync(Object source) { - Synchro.Copy(source, this); + 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); +// } } -- Gitblit v1.9.1