From 844381b5feeb874c4a6f51bf0521611b3f097993 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期三, 08 一月 2025 17:00:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 230 ++------------------------------------------------------
1 files changed, 11 insertions(+), 219 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index e896efc..331e8e0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.annotations.TableField;
import com.baomidou.mybatisplus.annotations.TableId;
import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.FieldStrategy;
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
@@ -33,18 +34,7 @@
private Integer wrkNo;
@ApiModelProperty(value= "")
- @TableField("inv_wh")
- private String invWh;
-
- @ApiModelProperty(value= "")
- private Date ymd;
-
- @ApiModelProperty(value= "")
private String mk;
-
- @ApiModelProperty(value= "")
- @TableField("whs_type")
- private Integer whsType;
/**
* 宸ヤ綔鐘舵��
@@ -59,17 +49,6 @@
@ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
private Integer ioType;
-
- /**
- * 鍫嗗灈鏈�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈�")
- @TableField("crn_no")
- private Integer crnNo;
-
- @ApiModelProperty(value= "")
- @TableField("sheet_no")
- private String sheetNo;
/**
* 浼樺厛绾�
@@ -110,112 +89,12 @@
@TableField("source_loc_no")
private String sourceLocNo;
- @ApiModelProperty(value= "")
- @TableField("loc_sts")
- private String locSts;
-
- /**
- * 鎷ｆ枡
- */
- @ApiModelProperty(value= "鎷ｆ枡")
- private String picking;
-
- @ApiModelProperty(value= "")
- @TableField("link_mis")
- private String linkMis;
-
- @ApiModelProperty(value= "")
- @TableField("online_yn")
- private String onlineYn;
-
- @ApiModelProperty(value= "")
- @TableField("upd_mk")
- private String updMk;
-
- /**
- * 閫�鍑�
- */
- @ApiModelProperty(value= "閫�鍑�")
- @TableField("exit_mk")
- private String exitMk;
-
- @ApiModelProperty(value= "")
- @TableField("plt_type")
- private Integer pltType;
-
- /**
- * 绌烘澘
- */
- @ApiModelProperty(value= "绌烘澘")
- @TableField("empty_mk")
- private String emptyMk;
-
/**
* 宸ヤ綔鏃堕棿
*/
@ApiModelProperty(value= "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_type")
- private Integer ctnType;
-
- @ApiModelProperty(value= "")
- private String packed;
-
- @ApiModelProperty(value= "")
- @TableField("ove_mk")
- private String oveMk;
-
- @ApiModelProperty(value= "")
- @TableField("mtn_type")
- private Double mtnType;
-
- @ApiModelProperty(value= "")
- @TableField("user_no")
- private String userNo;
-
- /**
- * 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
- @TableField("crn_str_time")
- private Date crnStrTime;
-
- /**
- * 鍫嗗灈鏈哄仠姝㈡椂闂�
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
- @TableField("crn_end_time")
- private Date crnEndTime;
-
- @ApiModelProperty(value= "")
- @TableField("plc_str_time")
- private Date plcStrTime;
-
- @ApiModelProperty(value= "")
- @TableField("crn_pos_time")
- private Date crnPosTime;
-
- @ApiModelProperty(value= "")
- @TableField("load_time")
- private Double loadTime;
-
- @ApiModelProperty(value= "")
- @TableField("exp_time")
- private Double expTime;
-
- @ApiModelProperty(value= "")
- @TableField("ref_wrkno")
- private Double refWrkno;
-
- /**
- * 鎷ｆ枡鏃堕棿
- */
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
- @TableField("ref_iotime")
- private Date refIotime;
/**
* 淇敼浜哄憳
@@ -246,10 +125,6 @@
private Date appeTime;
@ApiModelProperty(value= "")
- @TableField("pause_mk")
- private String pauseMk;
-
- @ApiModelProperty(value= "")
@TableField("error_time")
private Date errorTime;
@@ -257,35 +132,11 @@
@TableField("error_memo")
private String errorMemo;
- @ApiModelProperty(value= "")
- @TableField("ctn_kind")
- private Integer ctnKind;
-
- @ApiModelProperty(value= "")
- @TableField("manu_type")
- private String manuType;
-
/**
* 澶囨敞
*/
@ApiModelProperty(value= "澶囨敞")
private String memo;
-
- @ApiModelProperty(value= "")
- @TableField("sc_weight")
- private Double scWeight;
-
- @ApiModelProperty(value= "")
- @TableField("log_mk")
- private String logMk;
-
- @ApiModelProperty(value= "")
- @TableField("log_err_time")
- private Date logErrTime;
-
- @ApiModelProperty(value= "")
- @TableField("log_err_memo")
- private String logErrMemo;
/**
* 鏉＄爜
@@ -293,20 +144,19 @@
@ApiModelProperty(value= "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
- @TableField("Pdc_type")
- private String PdcType;
-
- @ApiModelProperty(value= "")
- @TableField("ctn_no")
- private String ctnNo;
+ /**
+ * 鍥涘悜绌挎杞﹀彿
+ */
+ @ApiModelProperty(value= "鍥涘悜绌挎杞﹀彿")
+ @TableField(value = "shuttle_no",strategy = FieldStrategy.IGNORED)
+ private Integer shuttleNo;
/**
- * 婊℃澘
+ * 鎻愬崌鏈哄彿
*/
- @ApiModelProperty(value= "婊℃澘")
- @TableField("full_plt")
- private String fullPlt;
+ @ApiModelProperty(value= "鎻愬崌鏈哄彿")
+ @TableField(value = "lift_no",strategy = FieldStrategy.IGNORED)
+ private Integer liftNo;
public String getWrkSts$(){
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
@@ -322,22 +172,6 @@
BasWrkIotype entity = mapper.selectById(this.ioType);
if (entity != null) {
return entity.getIoDesc();
- }
- return null;
- }
-
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
- return "";
- }
- 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;
}
@@ -392,41 +226,6 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ioTime);
}
- public String getCrnStrTime$(){
- if (Cools.isEmpty(this.crnStrTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnStrTime);
- }
-
- public String getCrnEndTime$(){
- if (Cools.isEmpty(this.crnEndTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnEndTime);
- }
-
- public String getPlcStrTime$(){
- if (Cools.isEmpty(this.plcStrTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.plcStrTime);
- }
-
- public String getCrnPosTime$(){
- if (Cools.isEmpty(this.crnPosTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.crnPosTime);
- }
-
- public String getRefIotime$(){
- if (Cools.isEmpty(this.refIotime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.refIotime);
- }
-
public String getModiUser$(){
UserService service = SpringUtils.getBean(UserService.class);
User user = service.selectById(this.modiUser);
@@ -475,13 +274,6 @@
errorMemo = errorMemo.substring(0, 150);
}
this.errorMemo = errorMemo;
- }
-
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
}
}
--
Gitblit v1.9.1