From 9ffe50c41999fee1c47bfd5d525b6141c4d22b7a Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 24 一月 2025 15:54:51 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
index abd060e..8e07e9c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java
@@ -43,6 +43,8 @@
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
private Integer isdeleted;
+ @ApiModelProperty(value = "浣滀笟鏉ユ簮锛�0鑷缓 1wms鎺ㄩ��", example = "1")
+ private Integer origin;
@ApiModelProperty(value = "鍚嶇О")
private String name;
@@ -51,7 +53,7 @@
private String remark;
@ApiModelProperty(value = "鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�" , example = "1")
- @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0:寰呯‘璁�;1:寰呯鍒�;2:绛夊緟鍙彿;3:鍏ュ洯绛夊緟;4:宸插彨鍙�;5:浣滀笟涓�;6:浣滀笟瀹屾垚;7:杞Щ涓�;8:寮傚父鎸傝捣;9:宸叉巿鏉冪鍥�;10:宸茬鍥�;11:宸茶繃鍙�;12:鍙栨秷锛圵MS锛�;")
+ @ExcelColumn(name="鐘舵��",index = 8, valueMapping = "0=寰呯‘璁�;1=寰呯鍒�;2=绛夊緟鍙彿;3=鍏ュ洯绛夊緟;4=宸插彨鍙�;5=浣滀笟涓�;6=浣滀笟瀹屾垚;7=杞Щ涓�;8=寮傚父鎸傝捣;9=宸叉巿鏉冪鍥�;10=宸茬鍥�;11=宸茶繃鍙�;12=鍙栨秷锛圵MS锛�;")
private Integer status;
@ApiModelProperty(value = "杞﹁締杩涘叆鐘舵�� 0涓嶅湪 1杩涘叆 " , example = "1")
@@ -247,6 +249,11 @@
@TableField(exist = false)
private Integer lineUpNum;
+ @ApiModelProperty(value = "wms杩愯緭閲�", example = "1")
+ @TableField(exist = false)
+ private BigDecimal ioQty;
+
+
@ApiModelProperty(value = "棰勮绛夊緟鏃堕棿", example = "1")
@TableField(exist = false)
private String waitTime;
@@ -255,6 +262,10 @@
@TableField(exist = false)
private String finishTimeStr;
+ @ApiModelProperty(value = "浣滀笟鏈堝彴缂栫爜")
+ @TableField(exist = false)
+ private String platformCode;
+
@ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О")
@TableField(exist = false)
private String platformName ;
@@ -262,13 +273,16 @@
@TableField(exist = false)
private String ledContent ;
- @ApiModelProperty(value = "鏄惁瓒呮椂锛�0=鏄紱1=鍚�", example = "1")
+ @ApiModelProperty(value = "鏄惁瓒呮椂锛�1=鏄紱0=鍚�", example = "1")
@TableField(exist = false)
private Integer isTimeOut;
@ApiModelProperty(value = "浣滀笟閲�" ,hidden = true)
@TableField(exist = false)
private BigDecimal workNum ;
+ @ApiModelProperty(value = "缁熻閲�" ,hidden = true)
+ @TableField(exist = false)
+ private Integer countum ;
@ApiModelProperty(value = "WMS浠诲姟鏃堕棿")
@@ -291,6 +305,7 @@
@ExcelColumn(name="杩愯緭鍏徃",index = 3)
@TableField(exist = false)
private String carrierName ;
+
@ApiModelProperty(value = "璺濈绛惧埌鐐硅窛绂�")
@TableField(exist = false)
@@ -331,6 +346,14 @@
@JsonFormat(pattern = "yyyy-MM-dd")
@TableField(exist = false)
private Date beginWorkDateStart;
+ @ApiModelProperty(value = "寮�濮嬫椂闂磋捣")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @TableField(exist = false)
+ private Date createDateStart;
+ @ApiModelProperty(value = "寮�濮嬫椂闂存")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ private Date createDateEnd;
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂存")
@JsonFormat(pattern = "yyyy-MM-dd")
@@ -347,14 +370,6 @@
@TableField(exist = false)
private Date beginDoneDateEnd;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿璧�")
- @TableField(exist = false)
- private Date createDateStart;
-
- @ApiModelProperty(value = "鍒涘缓鏃堕棿姝�")
- @TableField(exist = false)
- private Date createDateEnd;
@ApiModelProperty(value = "鏈堝彴缁勫悕绉�")
@TableField(exist = false)
@@ -385,6 +400,9 @@
@ApiModelProperty(value = "浣滀笟绫诲瀷鏌ヨ 澶氫釜浠�,鍒嗗壊")
@TableField(exist = false)
private String queryType;
+ @ApiModelProperty(value = "wms鍚堝悓鍙�")
+ @TableField(exist = false)
+ private String wmsContractNum;
@ApiModelProperty(value = "鐢靛瓙閿佺姸鎬侊細0=鏈笂閿� 1=閮ㄥ垎涓婇攣 2=鍏ㄩ儴涓婇攣")
@TableField(exist = false)
@@ -397,18 +415,21 @@
public void dealTime(){
if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey())
- || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey())
- ){
+ || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) ){
return;
}
if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CALL.getKey())){
- this.setOptTime(this.getSignDate().getTime());
+ if(this.getSignDate()!=null)
+ this.setOptTime(this.getSignDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.IN_WAIT.getKey())){
- this.setOptTime(this.getInwaitDate().getTime());
+ if(this.getInwaitDate()!=null)
+ this.setOptTime(this.getInwaitDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.CALLED.getKey())){
- this.setOptTime(this.getCallDate().getTime());
+ if(this.getCallDate()!=null)
+ this.setOptTime(this.getCallDate().getTime());
}else if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WORKING.getKey())){
- this.setOptTime(this.getStartDate().getTime());
+ if(this.getStartDate()!=null)
+ this.setOptTime(this.getStartDate().getTime());
}
}
--
Gitblit v1.9.3