From 2228c73293e419ed249a27c426c0d08ce95d517e Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 14 三月 2025 15:55:13 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 224 +++++++++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 99 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 5800466..ba93a27 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -8,15 +8,19 @@
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.BasCrnpService;
+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;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.text.SimpleDateFormat;
import java.util.Date;
+import java.util.List;
@Data
@TableName("asr_wrk_mast")
@@ -27,295 +31,307 @@
/**
* 宸ヤ綔鍙�
*/
- @ApiModelProperty(value= "宸ヤ綔鍙�")
+ @ApiModelProperty(value = "宸ヤ綔鍙�")
@TableId(value = "wrk_no", type = IdType.INPUT)
@TableField("wrk_no")
private Integer wrkNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("inv_wh")
private String invWh;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private Date ymd;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String mk;
- @ApiModelProperty(value= "")
+ @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= "鍫嗗灈鏈�")
+ @ApiModelProperty(value = "鍫嗗灈鏈�")
@TableField("crn_no")
private Integer crnNo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sheet_no")
private String sheetNo;
/**
* 浼樺厛绾�
*/
- @ApiModelProperty(value= "浼樺厛绾�")
+ @ApiModelProperty(value = "浼樺厛绾�")
@TableField("io_pri")
private Double ioPri;
- @ApiModelProperty(value= "")
+ @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= "")
+ @ApiModelProperty(value = "")
@TableField("loc_sts")
private String locSts;
/**
* 鎷ｆ枡
*/
- @ApiModelProperty(value= "鎷ｆ枡")
+ @ApiModelProperty(value = "鎷ｆ枡")
private String picking;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("link_mis")
private String linkMis;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("online_yn")
private String onlineYn;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("upd_mk")
private String updMk;
/**
* 閫�鍑�
*/
- @ApiModelProperty(value= "閫�鍑�")
+ @ApiModelProperty(value = "閫�鍑�")
@TableField("exit_mk")
private String exitMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plt_type")
private Integer pltType;
/**
* 绌烘澘
*/
- @ApiModelProperty(value= "绌烘澘")
+ @ApiModelProperty(value = "绌烘澘")
@TableField("empty_mk")
private String emptyMk;
/**
* 宸ヤ綔鏃堕棿
*/
- @ApiModelProperty(value= "宸ヤ綔鏃堕棿")
+ @ApiModelProperty(value = "宸ヤ綔鏃堕棿")
@TableField("io_time")
private Date ioTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_type")
private Integer ctnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
private String packed;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ove_mk")
private String oveMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("mtn_type")
private Double mtnType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("user_no")
private String userNo;
/**
* 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄惎鍔ㄦ椂闂�")
@TableField("crn_str_time")
private Date crnStrTime;
/**
* 鍫嗗灈鏈哄仠姝㈡椂闂�
*/
- @ApiModelProperty(value= "鍫嗗灈鏈哄仠姝㈡椂闂�")
+ @ApiModelProperty(value = "鍫嗗灈鏈哄仠姝㈡椂闂�")
@TableField("crn_end_time")
private Date crnEndTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("plc_str_time")
private Date plcStrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("crn_pos_time")
private Date crnPosTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("load_time")
private Double loadTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("exp_time")
private Double expTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ref_wrkno")
private Double refWrkno;
/**
* 鎷ｆ枡鏃堕棿
*/
- @ApiModelProperty(value= "鎷ｆ枡鏃堕棿")
+ @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= "")
+ @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= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_kind")
private Integer ctnKind;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("manu_type")
private String manuType;
/**
* 澶囨敞
*/
- @ApiModelProperty(value= "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
private String memo;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("sc_weight")
private Double scWeight;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_mk")
private String logMk;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_time")
private Date logErrTime;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("log_err_memo")
private String logErrMemo;
/**
* 鏉＄爜
*/
- @ApiModelProperty(value= "鏉＄爜")
+ @ApiModelProperty(value = "鏉＄爜")
private String barcode;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("Pdc_type")
private String PdcType;
- @ApiModelProperty(value= "")
+ @ApiModelProperty(value = "")
@TableField("ctn_no")
private String ctnNo;
/**
* 婊℃澘
*/
- @ApiModelProperty(value= "婊℃澘")
+ @ApiModelProperty(value = "婊℃澘")
@TableField("full_plt")
private String fullPlt;
/**
- * 婊℃澘
+ * wms浠诲姟鍙�
*/
- @ApiModelProperty(value= "wms浠诲姟鍙�")
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
@TableField("wms_wrk_no")
- private Integer wmsWrkNo;
+ private String taskNo;
- public String getWrkSts$(){
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @ApiModelProperty(value = "缁撴潫鏃堕棿")
+ @TableField("end_time")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date endTime;
+
+ //鍛戒护list
+ @TableField(exist = false)
+ private List<CommandInfo> children;
+
+ public String getWrkSts$() {
BasWrkStatusMapper mapper = SpringUtils.getBean(BasWrkStatusMapper.class);
BasWrkStatus entity = mapper.selectById(this.wrkSts);
if (entity != null) {
@@ -324,7 +340,7 @@
return null;
}
- public String getIoType$(){
+ public String getIoType$() {
BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
BasWrkIotype entity = mapper.selectById(this.ioType);
if (entity != null) {
@@ -333,127 +349,127 @@
return null;
}
- public String getYmd$(){
- if (Cools.isEmpty(this.ymd)){
+ public String getYmd$() {
+ if (Cools.isEmpty(this.ymd)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.ymd);
}
- public String getCrnNo$(){
+ public String getCrnNo$() {
BasCrnpService service = SpringUtils.getBean(BasCrnpService.class);
BasCrnp basCrnp = service.selectById(this.crnNo);
- if (!Cools.isEmpty(basCrnp)){
+ if (!Cools.isEmpty(basCrnp)) {
return String.valueOf(basCrnp.getCrnNo());
}
return null;
}
- public String getWrkDate$(){
- if (Cools.isEmpty(this.wrkDate)){
+ 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)){
+ 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)){
+ 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)){
+ 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)){
+ 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)){
+ 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;
@@ -463,15 +479,15 @@
return appeTime;
}
- 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);
@@ -484,11 +500,18 @@
this.errorMemo = errorMemo;
}
- public String getLogErrTime$(){
- if (Cools.isEmpty(this.logErrTime)){
+ public String getLogErrTime$() {
+ if (Cools.isEmpty(this.logErrTime)) {
return "";
}
return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.logErrTime);
+ }
+
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
}
/**
@@ -500,6 +523,9 @@
}
Date endDate = new Date();
+ if (!Cools.isEmpty(this.endTime)) {
+ endDate = this.endTime;
+ }
//鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
long l = this.ioTime.getTime() - endDate.getTime();
--
Gitblit v1.9.1