From eb49564ab17c6695d8928d5a63a57c58b3cfd79c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十二月 2024 18:21:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 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..99e6b30 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;
@@ -262,13 +269,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浠诲姟鏃堕棿")
@@ -292,6 +302,7 @@
@TableField(exist = false)
private String carrierName ;
+
@ApiModelProperty(value = "璺濈绛惧埌鐐硅窛绂�")
@TableField(exist = false)
private BigDecimal getDistance;
--
Gitblit v1.9.3