From 57fa3510fe6573f70a5dfc043a775da32530fbc6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期六, 15 三月 2025 16:22:12 +0800
Subject: [PATCH] 配置信息
---
src/main/java/com/zy/asrs/entity/WrkMast.java | 788 +++++++++++---------------------------------------------
1 files changed, 158 insertions(+), 630 deletions(-)
diff --git a/src/main/java/com/zy/asrs/entity/WrkMast.java b/src/main/java/com/zy/asrs/entity/WrkMast.java
index 2f55604..ba93a27 100644
--- a/src/main/java/com/zy/asrs/entity/WrkMast.java
+++ b/src/main/java/com/zy/asrs/entity/WrkMast.java
@@ -6,15 +6,23 @@
import com.baomidou.mybatisplus.enums.IdType;
import com.core.common.Cools;
import com.core.common.SpringUtils;
-import com.zy.asrs.service.*;
+import com.zy.asrs.mapper.BasWrkIotypeMapper;
+import com.zy.asrs.mapper.BasWrkStatusMapper;
+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")
public class WrkMast implements Serializable {
@@ -23,889 +31,466 @@
/**
* 宸ヤ綔鍙�
*/
- @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;
- public WrkMast() {}
+ /**
+ * wms浠诲姟鍙�
+ */
+ @ApiModelProperty(value = "wms浠诲姟鍙�")
+ @TableField("wms_wrk_no")
+ private String taskNo;
- public WrkMast(String invWh,Date ymd,String mk,Integer whsType,Long wrkSts,Integer ioType,Integer crnNo,String sheetNo,Double ioPri,Date wrkDate,String locNo,Integer staNo,Integer sourceStaNo,String sourceLocNo,String locSts,String picking,String linkMis,String onlineYn,String updMk,String exitMk,Integer pltType,String emptyMk,Date ioTime,Integer ctnType,String packed,String oveMk,Double mtnType,String userNo,Date crnStrTime,Date crnEndTime,Date plcStrTime,Date crnPosTime,Double loadTime,Double expTime,Double refWrkno,Date refIotime,Long modiUser,Date modiTime,Long appeUser,Date appeTime,String pauseMk,Date errorTime,String errorMemo,Integer ctnKind,String manuType,String memo,Double scWeight,String logMk,Date logErrTime,String logErrMemo,String barcode,String PdcType,String ctnNo,String fullPlt) {
- this.invWh = invWh;
- this.ymd = ymd;
- this.mk = mk;
- this.whsType = whsType;
- this.wrkSts = wrkSts;
- this.ioType = ioType;
- this.crnNo = crnNo;
- this.sheetNo = sheetNo;
- this.ioPri = ioPri;
- this.wrkDate = wrkDate;
- this.locNo = locNo;
- this.staNo = staNo;
- this.sourceStaNo = sourceStaNo;
- this.sourceLocNo = sourceLocNo;
- this.locSts = locSts;
- this.picking = picking;
- this.linkMis = linkMis;
- this.onlineYn = onlineYn;
- this.updMk = updMk;
- this.exitMk = exitMk;
- this.pltType = pltType;
- this.emptyMk = emptyMk;
- this.ioTime = ioTime;
- this.ctnType = ctnType;
- this.packed = packed;
- this.oveMk = oveMk;
- this.mtnType = mtnType;
- this.userNo = userNo;
- this.crnStrTime = crnStrTime;
- this.crnEndTime = crnEndTime;
- this.plcStrTime = plcStrTime;
- this.crnPosTime = crnPosTime;
- this.loadTime = loadTime;
- this.expTime = expTime;
- this.refWrkno = refWrkno;
- this.refIotime = refIotime;
- this.modiUser = modiUser;
- this.modiTime = modiTime;
- this.appeUser = appeUser;
- this.appeTime = appeTime;
- this.pauseMk = pauseMk;
- this.errorTime = errorTime;
- this.errorMemo = errorMemo;
- this.ctnKind = ctnKind;
- this.manuType = manuType;
- this.memo = memo;
- this.scWeight = scWeight;
- this.logMk = logMk;
- this.logErrTime = logErrTime;
- this.logErrMemo = logErrMemo;
- this.barcode = barcode;
- this.PdcType = PdcType;
- this.ctnNo = ctnNo;
- this.fullPlt = fullPlt;
+ /**
+ * 缁撴潫鏃堕棿
+ */
+ @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) {
+ return entity.getWrkDesc();
+ }
+ return null;
}
-// WrkMast wrkMast = new WrkMast(
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 宸ヤ綔鐘舵��
-// null, // 鍏ュ嚭搴撶被鍨�
-// null, // 鍫嗗灈鏈�
-// null, //
-// null, // 浼樺厛绾�
-// null, //
-// null, // 鐩爣搴撲綅
-// null, // 鐩爣绔�
-// null, // 婧愮珯
-// null, // 婧愬簱浣�
-// null, //
-// null, // 鎷ｆ枡
-// null, //
-// null, //
-// null, //
-// null, // 閫�鍑�
-// null, //
-// null, // 绌烘澘
-// null, // 宸ヤ綔鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鍫嗗灈鏈哄惎鍔ㄦ椂闂�
-// null, // 鍫嗗灈鏈哄仠姝㈡椂闂�
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鎷ｆ枡鏃堕棿
-// null, // 淇敼浜哄憳
-// null, // 淇敼鏃堕棿
-// null, // 鍒涘缓鑰�
-// null, // 娣诲姞鏃堕棿
-// null, //
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 澶囨敞
-// null, //
-// null, //
-// null, //
-// null, //
-// null, // 鏉＄爜
-// null, //
-// null, //
-// null // 婊℃澘
-// );
-
- public Integer getWrkNo() {
- return wrkNo;
+ public String getIoType$() {
+ BasWrkIotypeMapper mapper = SpringUtils.getBean(BasWrkIotypeMapper.class);
+ BasWrkIotype entity = mapper.selectById(this.ioType);
+ if (entity != null) {
+ return entity.getIoDesc();
+ }
+ return null;
}
- public void setWrkNo(Integer wrkNo) {
- this.wrkNo = wrkNo;
- }
-
- public String getInvWh() {
- return invWh;
- }
-
- public void setInvWh(String invWh) {
- this.invWh = invWh;
- }
-
- public Date getYmd() {
- return ymd;
- }
-
- 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 void setYmd(Date ymd) {
- this.ymd = ymd;
- }
-
- public String getMk() {
- return mk;
- }
-
- public void setMk(String mk) {
- this.mk = mk;
- }
-
- public Integer getWhsType() {
- return whsType;
- }
-
- public void setWhsType(Integer whsType) {
- this.whsType = whsType;
- }
-
- public Long getWrkSts() {
- return wrkSts;
- }
-
- public void setWrkSts(Long wrkSts) {
- this.wrkSts = wrkSts;
- }
-
- public Integer getIoType() {
- return ioType;
- }
-
- public void setIoType(Integer ioType) {
- this.ioType = ioType;
- }
-
- public Integer getCrnNo() {
- return crnNo;
- }
-
- 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 void setCrnNo(Integer crnNo) {
- this.crnNo = crnNo;
- }
-
- public String getSheetNo() {
- return sheetNo;
- }
-
- public void setSheetNo(String sheetNo) {
- this.sheetNo = sheetNo;
- }
-
- public Double getIoPri() {
- return ioPri;
- }
-
- public void setIoPri(Double ioPri) {
- this.ioPri = ioPri;
- }
-
- public Date getWrkDate() {
- return wrkDate;
- }
-
- 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 void setWrkDate(Date wrkDate) {
- this.wrkDate = wrkDate;
- }
-
- public String getLocNo() {
- return locNo;
- }
-
- 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 void setLocNo(String locNo) {
- this.locNo = locNo;
- }
-
- public Integer getStaNo() {
- return staNo;
- }
-
- 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 void setStaNo(Integer staNo) {
- this.staNo = staNo;
- }
-
- public Integer getSourceStaNo() {
- return sourceStaNo;
- }
-
- 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 void setSourceStaNo(Integer sourceStaNo) {
- this.sourceStaNo = sourceStaNo;
- }
-
- public String getSourceLocNo() {
- return sourceLocNo;
- }
-
- 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 void setSourceLocNo(String sourceLocNo) {
- this.sourceLocNo = sourceLocNo;
- }
-
- public String getLocSts() {
- return locSts;
- }
-
- public void setLocSts(String locSts) {
- this.locSts = locSts;
- }
-
- public String getPicking() {
- return picking;
- }
-
- public void setPicking(String picking) {
- this.picking = picking;
- }
-
- public String getLinkMis() {
- return linkMis;
- }
-
- public void setLinkMis(String linkMis) {
- this.linkMis = linkMis;
- }
-
- public String getOnlineYn() {
- return onlineYn;
- }
-
- public void setOnlineYn(String onlineYn) {
- this.onlineYn = onlineYn;
- }
-
- public String getUpdMk() {
- return updMk;
- }
-
- public void setUpdMk(String updMk) {
- this.updMk = updMk;
- }
-
- public String getExitMk() {
- return exitMk;
- }
-
- public void setExitMk(String exitMk) {
- this.exitMk = exitMk;
- }
-
- public Integer getPltType() {
- return pltType;
- }
-
- public void setPltType(Integer pltType) {
- this.pltType = pltType;
- }
-
- public String getEmptyMk() {
- return emptyMk;
- }
-
- public void setEmptyMk(String emptyMk) {
- this.emptyMk = emptyMk;
- }
-
- public Date getIoTime() {
- return ioTime;
- }
-
- 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 void setIoTime(Date ioTime) {
- this.ioTime = ioTime;
- }
-
- public Integer getCtnType() {
- return ctnType;
- }
-
- public void setCtnType(Integer ctnType) {
- this.ctnType = ctnType;
- }
-
- public String getPacked() {
- return packed;
- }
-
- public void setPacked(String packed) {
- this.packed = packed;
- }
-
- public String getOveMk() {
- return oveMk;
- }
-
- public void setOveMk(String oveMk) {
- this.oveMk = oveMk;
- }
-
- public Double getMtnType() {
- return mtnType;
- }
-
- public void setMtnType(Double mtnType) {
- this.mtnType = mtnType;
- }
-
- public String getUserNo() {
- return userNo;
- }
-
- public void setUserNo(String userNo) {
- this.userNo = userNo;
- }
-
- public Date getCrnStrTime() {
- return crnStrTime;
- }
-
- 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 void setCrnStrTime(Date crnStrTime) {
- this.crnStrTime = crnStrTime;
- }
-
- public Date getCrnEndTime() {
- return crnEndTime;
- }
-
- 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 void setCrnEndTime(Date crnEndTime) {
- this.crnEndTime = crnEndTime;
- }
-
- public Date getPlcStrTime() {
- return plcStrTime;
- }
-
- 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 void setPlcStrTime(Date plcStrTime) {
- this.plcStrTime = plcStrTime;
- }
-
- public Date getCrnPosTime() {
- return crnPosTime;
- }
-
- 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 void setCrnPosTime(Date crnPosTime) {
- this.crnPosTime = crnPosTime;
- }
-
- public Double getLoadTime() {
- return loadTime;
- }
-
- public void setLoadTime(Double loadTime) {
- this.loadTime = loadTime;
- }
-
- public Double getExpTime() {
- return expTime;
- }
-
- public void setExpTime(Double expTime) {
- this.expTime = expTime;
- }
-
- public Double getRefWrkno() {
- return refWrkno;
- }
-
- public void setRefWrkno(Double refWrkno) {
- this.refWrkno = refWrkno;
- }
-
- public Date getRefIotime() {
- return refIotime;
- }
-
- 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 void setRefIotime(Date refIotime) {
- this.refIotime = refIotime;
- }
-
- public Long getModiUser() {
- return modiUser;
- }
-
- 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 void setModiUser(Long modiUser) {
- this.modiUser = modiUser;
- }
-
- public Date getModiTime() {
- return modiTime;
- }
-
- 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 void setModiTime(Date modiTime) {
- this.modiTime = modiTime;
- }
-
- public Long getAppeUser() {
- return appeUser;
- }
-
- 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 void setAppeUser(Long appeUser) {
- this.appeUser = appeUser;
}
public Date getAppeTime() {
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 void setAppeTime(Date appeTime) {
- this.appeTime = appeTime;
- }
-
- public String getPauseMk() {
- return pauseMk;
- }
-
- public void setPauseMk(String pauseMk) {
- this.pauseMk = pauseMk;
- }
-
- public Date getErrorTime() {
- return errorTime;
- }
-
- 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 void setErrorTime(Date errorTime) {
- this.errorTime = errorTime;
- }
-
- public String getErrorMemo() {
- return errorMemo;
}
public void setErrorMemo(String errorMemo) {
@@ -915,100 +500,43 @@
this.errorMemo = errorMemo;
}
- public Integer getCtnKind() {
- return ctnKind;
- }
-
- public void setCtnKind(Integer ctnKind) {
- this.ctnKind = ctnKind;
- }
-
- public String getManuType() {
- return manuType;
- }
-
- public void setManuType(String manuType) {
- this.manuType = manuType;
- }
-
- public String getMemo() {
- return memo;
- }
-
- public void setMemo(String memo) {
- this.memo = memo;
- }
-
- public Double getScWeight() {
- return scWeight;
- }
-
- public void setScWeight(Double scWeight) {
- this.scWeight = scWeight;
- }
-
- public String getLogMk() {
- return logMk;
- }
-
- public void setLogMk(String logMk) {
- this.logMk = logMk;
- }
-
- public Date getLogErrTime() {
- return logErrTime;
- }
-
- 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 void setLogErrTime(Date logErrTime) {
- this.logErrTime = logErrTime;
+ public String getEndTime$() {
+ if (Cools.isEmpty(this.endTime)) {
+ return "";
+ }
+ return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.endTime);
}
- public String getLogErrMemo() {
- return logErrMemo;
- }
+ /**
+ * 鑾峰彇鎸佺画鏃堕棿
+ */
+ public String getDurationTime() {
+ if (Cools.isEmpty(this.ioTime)) {
+ return "";
+ }
- public void setLogErrMemo(String logErrMemo) {
- this.logErrMemo = logErrMemo;
- }
+ Date endDate = new Date();
+ if (!Cools.isEmpty(this.endTime)) {
+ endDate = this.endTime;
+ }
- public String getBarcode() {
- return barcode;
- }
+ //鐢ㄦ潵鑾峰彇涓や釜鏃堕棿鐩稿樊鐨勬绉掓暟
+ long l = this.ioTime.getTime() - endDate.getTime();
- public void setBarcode(String barcode) {
- this.barcode = barcode;
- }
+ //鍒嗗埆璁＄畻鐩稿樊鐨勫ぉ銆佸皬鏃躲�佸垎銆佺
+ long day = l / (24 * 60 * 60 * 1000);
+ long hour = (l / (60 * 60 * 1000) - day * 24);
+ long min = ((l / (60 * 1000)) - day * 24 * 60 - hour * 60);
+ long s = (l / 1000 - day * 24 * 60 * 60 - hour * 60 * 60 - min * 60);
- public String getPdcType() {
- return PdcType;
+ return Math.abs(day) + "澶�" + Math.abs(hour) + "灏忔椂" + Math.abs(min) + "鍒�" + Math.abs(s) + "绉�";
}
-
- public void setPdcType(String PdcType) {
- this.PdcType = PdcType;
- }
-
- public String getCtnNo() {
- return ctnNo;
- }
-
- public void setCtnNo(String ctnNo) {
- this.ctnNo = ctnNo;
- }
-
- public String getFullPlt() {
- return fullPlt;
- }
-
- public void setFullPlt(String fullPlt) {
- this.fullPlt = fullPlt;
- }
-
}
--
Gitblit v1.9.1