From d2743de6842f6af91408e0b4ce53ee25627d3e6e Mon Sep 17 00:00:00 2001 From: lsh <lsh@163.com> Date: 星期二, 04 三月 2025 14:04:50 +0800 Subject: [PATCH] * --- src/main/java/com/zy/asrs/entity/WrkMast.java | 89 ++++++++++++++++++++++++++++++-------------- 1 files changed, 61 insertions(+), 28 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java index aaef397..82817b4 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -30,7 +30,7 @@ @ApiModelProperty(value= "宸ヤ綔鍙�") @TableId(value = "wrk_no", type = IdType.INPUT) @TableField("wrk_no") - private Integer wrkNo; + private Long wrkNo; @ApiModelProperty(value= "") @TableField("inv_wh") @@ -364,29 +364,11 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd); } - public String getCrnNo$(){ - BasCrnpService service = SpringUtils.getBean(BasCrnpService.class); - BasCrnp basCrnp = service.selectById(this.crnNo); - if (!Cools.isEmpty(basCrnp)){ - return String.valueOf(basCrnp.getCrnNo()); - } - return null; - } - public String getWrkDate$(){ if (Cools.isEmpty(this.wrkDate)){ return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate); - } - - public String getLocNo$(){ - LocMastService service = SpringUtils.getBean(LocMastService.class); - LocMast locMast = service.selectById(this.locNo); - if (!Cools.isEmpty(locMast)){ - return String.valueOf(locMast.getLocNo()); - } - return null; } public String getStaNo$(){ @@ -403,15 +385,6 @@ BasDevp basDevp = service.selectById(this.sourceStaNo); if (!Cools.isEmpty(basDevp)){ return String.valueOf(basDevp.getDevNo()); - } - return null; - } - - public String getSourceLocNo$(){ - LocMastService service = SpringUtils.getBean(LocMastService.class); - LocMast locMast = service.selectById(this.sourceLocNo); - if (!Cools.isEmpty(locMast)){ - return String.valueOf(locMast.getLocNo()); } return null; } @@ -515,4 +488,64 @@ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime); } + public Integer getIoTypeMes$(){ + if (this.ioType != 101){ + return 3; + } else { + return 1; + } + } + + public Integer getStaNoCs(){ + switch (staNo){ + case 114: + return 102; + case 120: + return 104; + case 124: + return 106; + case 128: + return 108; + case 133: + return 111; + case 102: + return 114; + case 104: + return 120; + case 106: + return 124; + case 108: + return 128; + case 111: + return 133; + } + return 0; + } + + public Integer getSourceNoCs(){ + switch (sourceStaNo){ + case 101: + return 112; + case 103: + return 119; + case 105: + return 123; + case 107: + return 127; + case 109: + return 131; + case 112: + return 101; + case 119: + return 103; + case 123: + return 105; + case 127: + return 107; + case 131: + return 109; + } + return 0; + } + } -- Gitblit v1.9.1