From 82135a39198718fce5821b770dffdea1d2372c2c Mon Sep 17 00:00:00 2001 From: zc <zc@123> Date: 星期五, 27 六月 2025 08:48:53 +0800 Subject: [PATCH] 123 --- src/main/java/com/zy/asrs/entity/WrkMastLog.java | 107 ++++++++++++++++++++++++++++++----------------------- 1 files changed, 60 insertions(+), 47 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java index 0679314..8a3e5c0 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java +++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java @@ -30,145 +30,158 @@ /** * 缂栧彿 */ - @ApiModelProperty(value= "缂栧彿") + @ApiModelProperty(value = "缂栧彿") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 宸ヤ綔鍙� */ - @ApiModelProperty(value= "宸ヤ綔鍙�") + @ApiModelProperty(value = "宸ヤ綔鍙�") @TableField("wrk_no") private Integer wrkNo; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") private String mk; /** * 宸ヤ綔鐘舵�� */ - @ApiModelProperty(value= "宸ヤ綔鐘舵��") + @ApiModelProperty(value = "宸ヤ綔鐘舵��") @TableField("wrk_sts") private Long wrkSts; /** * 鍏ュ嚭搴撶被鍨� */ - @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�") + @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�") @TableField("io_type") private Integer ioType; /** * 浼樺厛绾� */ - @ApiModelProperty(value= "浼樺厛绾�") + @ApiModelProperty(value = "浼樺厛绾�") @TableField("io_pri") private Double ioPri; /** * 鐩爣搴撲綅 */ - @ApiModelProperty(value= "鐩爣搴撲綅") + @ApiModelProperty(value = "鐩爣搴撲綅") @TableField("loc_no") private String locNo; /** * 鐩爣绔� */ - @ApiModelProperty(value= "鐩爣绔�") + @ApiModelProperty(value = "鐩爣绔�") @TableField("sta_no") private Integer staNo; /** * 婧愮珯 */ - @ApiModelProperty(value= "婧愮珯") + @ApiModelProperty(value = "婧愮珯") @TableField("source_sta_no") private Integer sourceStaNo; /** * 婧愬簱浣� */ - @ApiModelProperty(value= "婧愬簱浣�") + @ApiModelProperty(value = "婧愬簱浣�") @TableField("source_loc_no") private String sourceLocNo; /** * 宸ヤ綔鏃堕棿 */ - @ApiModelProperty(value= "宸ヤ綔鏃堕棿") + @ApiModelProperty(value = "宸ヤ綔鏃堕棿") @TableField("io_time") private Date ioTime; /** * 淇敼浜哄憳 */ - @ApiModelProperty(value= "淇敼浜哄憳") + @ApiModelProperty(value = "淇敼浜哄憳") @TableField("modi_user") private Long modiUser; /** * 淇敼鏃堕棿 */ - @ApiModelProperty(value= "淇敼鏃堕棿") + @ApiModelProperty(value = "淇敼鏃堕棿") @TableField("modi_time") private Date modiTime; /** * 鍒涘缓鑰� */ - @ApiModelProperty(value= "鍒涘缓鑰�") + @ApiModelProperty(value = "鍒涘缓鑰�") @TableField("appe_user") private Long appeUser; /** * 娣诲姞鏃堕棿 */ - @ApiModelProperty(value= "娣诲姞鏃堕棿") + @ApiModelProperty(value = "娣诲姞鏃堕棿") @TableField("appe_time") private Date appeTime; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("error_time") private Date errorTime; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("error_memo") private String errorMemo; - @ApiModelProperty(value= "") + @ApiModelProperty(value = "") @TableField("memo") private String memo; /** * 鏉$爜 */ - @ApiModelProperty(value= "鏉$爜") + @ApiModelProperty(value = "鏉$爜") private String barcode; /** * 鍥涘悜绌挎杞﹀彿 */ - @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿") + @ApiModelProperty(value = "鍥涘悜绌挎杞﹀彿") @TableField(value = "shuttle_no") private Integer shuttleNo; /** * 鎻愬崌鏈哄彿 */ - @ApiModelProperty(value= "鎻愬崌鏈哄彿") + @ApiModelProperty(value = "鎻愬崌鏈哄彿") @TableField(value = "lift_no") private Integer liftNo; /** * WMS浠诲姟鍙� */ - @ApiModelProperty(value= "WMS浠诲姟鍙�") + @ApiModelProperty(value = "WMS浠诲姟鍙�") + @TableField(value = "wms_wrk_no") private String wmsWrkNo; - public WrkMastLog() {} + /** + * 绯荤粺娑堟伅 + */ + @ApiModelProperty(value = "绯荤粺娑堟伅") + @TableField(value = "system_msg") + private String systemMsg; - public String getWrkSts$(){ + @ApiModelProperty(value = "") + @TableField(value = "main_wrk_no") + private Integer mainWrkNo; + + public WrkMastLog() { + } + + public String getWrkSts$() { BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class); BasWrkStatus entity = mapper.selectById(this.wrkSts); if (entity != null) { @@ -177,7 +190,7 @@ return null; } - public String getIoType$(){ + public String getIoType$() { BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class); BasWrkIotype entity = mapper.selectById(this.ioType); if (entity != null) { @@ -186,92 +199,92 @@ return null; } - public String getWrkNo$(){ + public String getWrkNo$() { WrkMastService service = SpringUtils.getBean(WrkMastService.class); WrkMast wrkMast = service.selectById(this.wrkNo); - if (!Cools.isEmpty(wrkMast)){ + if (!Cools.isEmpty(wrkMast)) { return String.valueOf(wrkMast.getWrkNo()); } return null; } - public String getLocNo$(){ + public String getLocNo$() { LocMastService service = SpringUtils.getBean(LocMastService.class); LocMast locMast = service.selectById(this.locNo); - if (!Cools.isEmpty(locMast)){ + if (!Cools.isEmpty(locMast)) { return String.valueOf(locMast.getLocNo()); } return null; } - public String getStaNo$(){ + public String getStaNo$() { BasDevpService service = SpringUtils.getBean(BasDevpService.class); BasDevp basDevp = service.selectById(this.staNo); - if (!Cools.isEmpty(basDevp)){ + if (!Cools.isEmpty(basDevp)) { return String.valueOf(basDevp.getDevNo()); } return null; } - public String getSourceStaNo$(){ + public String getSourceStaNo$() { BasDevpService service = SpringUtils.getBean(BasDevpService.class); BasDevp basDevp = service.selectById(this.sourceStaNo); - if (!Cools.isEmpty(basDevp)){ + if (!Cools.isEmpty(basDevp)) { return String.valueOf(basDevp.getDevNo()); } return null; } - public String getSourceLocNo$(){ + public String getSourceLocNo$() { LocMastService service = SpringUtils.getBean(LocMastService.class); LocMast locMast = service.selectById(this.sourceLocNo); - if (!Cools.isEmpty(locMast)){ + if (!Cools.isEmpty(locMast)) { return String.valueOf(locMast.getLocNo()); } return null; } - public String getIoTime$(){ - if (Cools.isEmpty(this.ioTime)){ + public String getIoTime$() { + if (Cools.isEmpty(this.ioTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime); } - public String getModiUser$(){ + public String getModiUser$() { UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.modiUser); - if (!Cools.isEmpty(user)){ + if (!Cools.isEmpty(user)) { return String.valueOf(user.getUsername()); } return null; } - public String getModiTime$(){ - if (Cools.isEmpty(this.modiTime)){ + public String getModiTime$() { + if (Cools.isEmpty(this.modiTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.modiTime); } - public String getAppeUser$(){ + public String getAppeUser$() { UserService service = SpringUtils.getBean(UserService.class); User user = service.selectById(this.appeUser); - if (!Cools.isEmpty(user)){ + if (!Cools.isEmpty(user)) { return String.valueOf(user.getUsername()); } return null; } - public String getAppeTime$(){ - if (Cools.isEmpty(this.appeTime)){ + public String getAppeTime$() { + if (Cools.isEmpty(this.appeTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.appeTime); } - public String getErrorTime$(){ - if (Cools.isEmpty(this.errorTime)){ + public String getErrorTime$() { + if (Cools.isEmpty(this.errorTime)) { return ""; } return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime); -- Gitblit v1.9.1