From c47f7b9c4899036c52ad0e4f46c4aff7102110bc Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期一, 09 九月 2024 19:56:07 +0800 Subject: [PATCH] 最新版本 --- server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 42 ++++++++++++++++++++++++++++++++++++++---- 1 files changed, 38 insertions(+), 4 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 f3e24c0..c916a3d 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 @@ -98,6 +98,21 @@ @ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1") @ExcelColumn(name="绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌") private Integer singType; + @ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴鏃堕棿") + @ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴鏃堕棿") + private Date wmsSendDate; + @ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴鐘舵�� 0寰呴�氱煡 1閫氱煡鎴愬姛 2閫氱煡澶辫触", example = "1") + @ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴鐘舵�� 0寰呴�氱煡 1閫氱煡鎴愬姛 2閫氱煡澶辫触") + private Integer wmsSendStatus; + @ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴绶ㄧ⒓", example = "1") + @ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴绶ㄧ⒓") + private String wmsSendPlatformCode; + @ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴澶囨敞", example = "1") + @ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴澶囨敞") + private String wmsSendInfo; + @ApiModelProperty(value = "閫氱煡WMS浣滀笟缁戝畾鏈堝彴娆℃暟", example = "1") + @ExcelColumn(name="閫氱煡WMS浣滀笟缁戝畾鏈堝彴娆℃暟") + private Integer wmsSendNum; @ApiModelProperty(value = "绛惧埌璺濈(绫筹級", example = "1") @ExcelColumn(name="绛惧埌璺濈(绫筹級") @@ -274,13 +289,21 @@ @TableField(exist = false) private String finishTimeStr; - @ApiModelProperty(value = "鍏宠仈鏈堝彴缁勭紪鐮侊紙鍏宠仈platform_group琛級", example = "1") - @TableField(exist = false) - private Integer groupId; - @ApiModelProperty(value = "浣滀笟鏈堝彴鍚嶇О") @TableField(exist = false) private String platformName ; + + @ApiModelProperty(value = "wms涓氬姟涓婚敭") + @TableField(exist = false) + private Integer wmsId ; + + @ApiModelProperty(value = "鏈堝彴缁勭被鍨嬶細0瀹夋嘲鐗╂祦瑁呰揣 1瀹夋嘲鐗╂祦鍗歌揣 2甯傚叕鍙稿嵏璐�") + @TableField(exist = false) + private Integer groupType ; + + @ApiModelProperty(value = "鎵胯繍鍟�") + @TableField(exist = false) + private String carrierName ; @ApiModelProperty(value = "璺濈绛惧埌鐐硅窛绂�") @TableField(exist = false) @@ -302,6 +325,17 @@ @TableField(exist = false) private PlatformWmsJob platformWmsJob; + @ApiModelProperty(value = "鏀惰揣鍦帮紙鐩殑鍦帮級") + @TableField(exist = false) + private String repertotyAddress; + @ApiModelProperty(value = "wms鏈堝彴缂栧彿") + @TableField(exist = false) + private String platformWmsCode; + + @ApiModelProperty(value = "鍙彿绫诲瀷锛�1=鍙彿鍏ュ洯 锛� 2=鏈堝彴鍙彿 锛� 3=鎺掗槦鎯呭喌", example = "1") + @TableField(exist = false) + private Integer callType; + public void dealTime(){ if(Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WAIT_CONFIRM.getKey()) || Constants.equalsInteger(this.getStatus(),Constants.PlatformJobStatus.WART_SIGN_IN.getKey()) -- Gitblit v1.9.3