From c6ac196d7207e64b8591f84932439214561fc446 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:56:52 +0800
Subject: [PATCH] 1
---
src/main/java/com/zy/asrs/entity/WrkMastLog.java | 387 ++++++++++++------------------------------------------
1 files changed, 90 insertions(+), 297 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMastLog.java b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
index de47022..8a3e5c0 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMastLog.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMastLog.java
@@ -6,10 +6,12 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.BasCrnpService;
+import com.zy.asrs.mapper.BasWrkIotypeMapper;
+import com.zy.asrs.mapper.BasWrkStatusMapper;
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;
@@ -28,477 +30,268 @@
/**
* 缂栧彿
*/
- @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= "")
- @TableField("inv_wh")
- private String invWh;
-
- @ApiModelProperty(value= "")
- private Date ymd;
-
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
-
- @ApiModelProperty(value= "")
- @TableField("whs_type")
- private Integer whsType;
/**
* 宸ヤ綔鐘舵��
*/
- @ApiModelProperty(value= "宸ヤ綔鐘舵��")
+ @ApiModelProperty(value = "宸ヤ綔鐘舵��")
@TableField("wrk_sts")
private Long wrkSts;
/**
* 鍏ュ嚭搴撶被鍨�
*/
- @ApiModelProperty(value= "鍏ュ嚭搴撶被鍨�")
+ @ApiModelProperty(value = "鍏ュ嚭搴撶被鍨�")
@TableField("io_type")
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= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
-
- @ApiModelProperty(value= "")
- @TableField("wrk_date")
- private Date wrkDate;
/**
* 鐩爣搴撲綅
*/
- @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= "")
- @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= "宸ヤ綔鏃堕棿")
+ @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;
/**
* 淇敼浜哄憳
*/
- @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= "")
- @TableField("pause_mk")
- private String pauseMk;
-
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_time")
private Date errorTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("error_memo")
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;
+ @ApiModelProperty(value = "")
+ @TableField("memo")
+ private String memo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @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 = "WMS浠诲姟鍙�")
+ @TableField(value = "wms_wrk_no")
+ private String wmsWrkNo;
/**
- * 绌烘搷浣� / 鍙栬揣鏃犵
+ * 绯荤粺娑堟伅
*/
- @ApiModelProperty(value= "绌烘搷浣�")
- @TableField("take_none")
- private String takeNone;
+ @ApiModelProperty(value = "绯荤粺娑堟伅")
+ @TableField(value = "system_msg")
+ private String systemMsg;
- public WrkMastLog() {}
+ @ApiModelProperty(value = "")
+ @TableField(value = "main_wrk_no")
+ private Integer mainWrkNo;
- public String getWrkNo$(){
+ public WrkMastLog() {
+ }
+
+ public String getWrkSts$() {
+ BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
+ BasWrkStatus entity = mapper.selectById(this.wrkSts);
+ if (entity != null) {
+ return entity.getWrkDesc();
+ }
+ return null;
+ }
+
+ public String getIoType$() {
+ BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
+ BasWrkIotype entity = mapper.selectById(this.ioType);
+ if (entity != null) {
+ return entity.getIoDesc();
+ }
+ return null;
+ }
+
+ 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 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;
- }
-
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
- return "";
- }
- return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.wrkDate);
- }
-
- 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 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$(){
+ 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);
}
- 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