From c34747e73010e893dfd04344fcbc8848c13eb717 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期日, 12 一月 2025 16:12:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 262 +++-------------------------------------------------
1 files changed, 16 insertions(+), 246 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index 0cff0cc..18bfcc7 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -9,6 +9,7 @@
import com.zy.asrs.service.BasDevpService;
import com.zy.asrs.service.LocMastService;
import com.zy.asrs.service.WrkMastService;
+import com.zy.common.utils.Synchro;
import com.zy.system.entity.User;
import com.zy.system.service.UserService;
import io.swagger.annotations.ApiModelProperty;
@@ -39,18 +40,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;
/**
* 宸ヤ綔鐘舵��
@@ -67,40 +57,11 @@
private Integer ioType;
/**
- * 鍫嗗灈鏈哄彿
- */
- @ApiModelProperty(value= "鍫嗗灈鏈哄彿")
- @TableField("crn_no")
- private Integer crnNo;
-
- /**
- * 绌挎杞�
- */
- @ApiModelProperty(value= "绌挎杞�")
- @TableField("ste_no")
- private Integer steNo;
-
- /**
- * 杈圭紭搴撲綅
- */
- @ApiModelProperty(value= "杈圭紭搴撲綅")
- @TableField("out_most")
- private Integer outMost;
-
- @ApiModelProperty(value= "")
- @TableField("sheet_no")
- private String sheetNo;
-
- /**
* 浼樺厛绾�
*/
@ApiModelProperty(value= "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_date")
- private Date wrkDate;
/**
* 鐩爣搴撲綅
@@ -130,112 +91,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;
/**
* 淇敼浜哄憳
@@ -266,10 +127,6 @@
private Date appeTime;
@ApiModelProperty(value= "")
- @TableField("pause_mk")
- private String pauseMk;
-
- @ApiModelProperty(value= "")
@TableField("error_time")
private Date errorTime;
@@ -278,32 +135,8 @@
private String errorMemo;
@ApiModelProperty(value= "")
- @TableField("ctn_kind")
- private Integer ctnKind;
-
- @ApiModelProperty(value= "")
- @TableField("manu_type")
- private String manuType;
-
- @ApiModelProperty(value= "")
@TableField("memo_m")
private String memoM;
-
- @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;
/**
* 鏉＄爜
@@ -311,34 +144,25 @@
@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")
+ private Integer shuttleNo;
/**
- * 婊℃澘
+ * 鎻愬崌鏈哄彿
*/
- @ApiModelProperty(value= "婊℃澘")
- @TableField("full_plt")
- private String fullPlt;
+ @ApiModelProperty(value= "鎻愬崌鏈哄彿")
+ @TableField(value = "lift_no")
+ private Integer liftNo;
/**
- * 鍏堝叆鍝� / 鍙岄噸鍏ュ簱
+ * WMS浠诲姟鍙�
*/
- @ApiModelProperty(value= "鍏堝叆鍝�")
- @TableField("pre_have")
- private String preHave;
-
- /**
- * 绌烘搷浣� / 鍙栬揣鏃犵
- */
- @ApiModelProperty(value= "绌烘搷浣�")
- @TableField("take_none")
- private String takeNone;
+ @ApiModelProperty(value= "WMS浠诲姟鍙�")
+ private String wmsWrkNo;
public WrkMastLog() {}
@@ -349,20 +173,6 @@
return String.valueOf(wrkMast.getWrkNo());
}
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 getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
}
public String getLocNo$(){
@@ -408,42 +218,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);
@@ -483,12 +257,8 @@
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.errorTime);
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
+ public void sync(Object source) {
+ Synchro.Copy(source, this);
}
-
}
--
Gitblit v1.9.1