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/WrkMast.java | 40 ++++++++++++++++++++++++++++------------ 1 files changed, 28 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java index 331e8e0..adbc709 100644 --- a/src/main/java/com/zy/asrs/entity/WrkMast.java +++ b/src/main/java/com/zy/asrs/entity/WrkMast.java @@ -9,7 +9,8 @@ import com.core.common.SpringUtils; import com.zy.asrs.mapper.BasWrkIotypeMapper; import com.zy.asrs.mapper.BasWrkStatusMapper; -import com.zy.asrs.service.*; +import com.zy.asrs.service.BasDevpService; +import com.zy.asrs.service.LocMastService; import com.zy.system.entity.User; import com.zy.system.service.UserService; import io.swagger.annotations.ApiModelProperty; @@ -56,10 +57,6 @@ @ApiModelProperty(value= "浼樺厛绾�") @TableField("io_pri") private Double ioPri; - - @ApiModelProperty(value= "") - @TableField("wrk_date") - private Date wrkDate; /** * 鐩爣搴撲綅 @@ -143,6 +140,12 @@ */ @ApiModelProperty(value= "鏉$爜") private String barcode; + /** + * + */ + @ApiModelProperty(value= "") + @TableField(value = "main_wrk_no") + private Integer mainWrkNo; /** * 鍥涘悜绌挎杞﹀彿 @@ -157,6 +160,26 @@ @ApiModelProperty(value= "鎻愬崌鏈哄彿") @TableField(value = "lift_no",strategy = FieldStrategy.IGNORED) private Integer liftNo; + + /** + * WMS浠诲姟鍙� + */ + @ApiModelProperty(value= "WMS浠诲姟鍙�") + @TableField(value = "wms_wrk_no") + private String wmsWrkNo; + /** + * WMS浠诲姟鍙� + */ + @ApiModelProperty(value= "WMS浠诲姟鍙�2") + @TableField(value = "wms_wrk_no2") + private String wmsWrkNo2; + + /** + * 绯荤粺娑堟伅 + */ + @ApiModelProperty(value= "绯荤粺娑堟伅") + @TableField(value = "system_msg") + private String systemMsg; public String getWrkSts$(){ BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class); @@ -174,13 +197,6 @@ return entity.getIoDesc(); } 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$(){ -- Gitblit v1.9.1