From 4d0bbb93c6e5be3515157326089eff6ee4581ccc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 13 八月 2024 17:41:53 +0800
Subject: [PATCH] 最新版本
---
server/system_service/src/main/java/com/doumee/core/utils/Constants.java | 116 +++----------
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java | 13 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformJob.java | 28 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java | 11 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java | 205 ++++++++++++++++++++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java | 6
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java | 6
server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java | 2
18 files changed, 284 insertions(+), 147 deletions(-)
diff --git a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
index ef5d593..c979bea 100644
--- a/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
+++ b/server/meeting/meeting_service/src/main/java/com/doumee/dao/business/model/Rooms.java
@@ -37,7 +37,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- // @JsonFormat(pattern = "yyyy-MM-dd")
+ //
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
diff --git a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
index 42bbf6a..da04b9a 100644
--- a/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
+++ b/server/system_service/src/main/java/com/doumee/core/utils/Constants.java
@@ -160,6 +160,17 @@
public static final int custom = 4;
public static final int self = -1;
}
+
+ /**
+ * 浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣
+ */
+ public interface platformJobType{
+ int zycxh = 0;
+ int zyczh = 1;
+ int wxcxh = 2;
+ int wxczh = 3;
+ int sgscxh = 4;
+ }
public static Date getBirthdyByCardNo(String idCard){
if(idCard ==null || idCard.length()<14){
return null;
@@ -597,7 +608,6 @@
}
-
public enum NoticeType {
ZERO(0, "寰呭鏍�","","","寰呭鏍�","寰呭鐞�","澶勭悊涓�"),
@@ -697,28 +707,25 @@
}
+
/**
- * 鍛樺伐淇℃伅缁存姢鎿嶄綔鍘嗗彶绫诲瀷 0瑙ｅ喕 1鍐荤粨 2鎷夐粦 3鎭㈠ 4璁句负鎷滆浜� 5鍙栨秷鎷滆浜� 6璁句负楂樼骇瀹℃壒浜� 7鍙栨秷楂樼骇瀹℃壒浜� 8鎵嬪姩绂诲満 9鍒犻櫎 10鏇存柊 11鎺堟潈闂ㄧ鏉冮檺 12绂昏亴 13鎭㈠鍦ㄨ亴
+ * 鏈堝彴浣滀笟 鐘舵��
+ * 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙�
*/
- public enum UserActionType {
- CANCEL_FREEZE(0, "瑙ｅ喕","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯В鍐汇��" ),
- FREEZE(1, "鍐荤粨","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬喕缁撱��" ),
- BLACKLIST(2, "鎷夐粦","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愭媺榛戙��"),
- CANCEL_BLACKLIST(3, "鎭㈠","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愮Щ鍑洪粦鍚嶅崟銆�" ),
- CANVISIT(4, "璁句负鎷滆浜�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯涓烘嫓璁夸汉銆�" ),
- CANCEL_VISIT(5, "鍙栨秷鎷滆浜�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬彇娑堟嫓璁夸汉銆�" ),
+ public enum PlatformJobStatus {
+ WAIT_CONFIRM(0, "寰呯‘璁�","" ),
+ WART_SIGNIN(1, "寰呯鍒�","寰呯鍒�" ),
+ WAIT_CALL(2, "绛夊緟鍙彿","绛夊緟鍙彿"),
+ IN_WAIT(3, "鍏ュ洯绛夊緟","鍏ュ洯绛夊緟" ),
+ CALLED(4, "宸插彨鍙�","宸插彨鍙�" ),
+ WORKING(5, "浣滀笟涓�","浣滀笟涓�" ),
//缁繚閫氱煡
- HIGHCHECKOR(6, "璁句负楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯涓洪珮绾у鎵逛汉銆�" ),
- CANCEL_HIGHCHECKOR(7, "鍙栨秷楂樼骇瀹℃壒浜�","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬彇娑堥珮绾у鎵逛汉銆�" ),
- LEVEL(8, "鎵嬪姩绂诲満","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愭墜鍔ㄧ鍦恒��" ),
- DELETE(9, "鍒犻櫎","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬垹闄ゃ��" ),
- EDIT(10, "鏇存柊","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愭洿鏂般��" ),
- AUTH_ROLE(11, "鎺堟潈闂ㄧ鏉冮檺","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愭巿鏉冮棬绂佹潈闄愩��" ),
- WORK_OFF(12, "绂昏亴","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愮鑱屻�戞搷浣�" ),
- WORK_ON(13, "鍦ㄨ亴","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬湪鑱屻�戞搷浣�" ),
- IMPORT_TRAIMETIME(14, "瀵煎叆鍩硅鏈夋晥","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬鍏ュ煿璁湁鏁堛�戞搷浣�" ),
- BE_HEAD(15, "璁句负涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愯涓轰富绠°�戞搷浣�" ),
- NOT_HEAD(16, "鍙栨秷涓荤","鐢便��${param1}銆戜簬銆�${param2}銆戯紝杩涜銆愬彇娑堜富绠°�戞搷浣�" ),
+ DONE(6, "浣滀笟瀹屾垚 ","浣滀笟瀹屾垚 " ),
+ TRANSFERING(7, "杞Щ涓�","7杞Щ涓�" ),
+ EXCEPTION(8, "寮傚父鎸傝捣","寮傚父鎸傝捣" ),
+ AUTHED_LEAVE(9, "宸叉巿鏉冪鍥�","宸叉巿鏉冪鍥�" ),
+ LEAVED(10, "宸茬鍥� ","宸茬鍥� " ),
+ OVER_NUMBER(11, "宸茶繃鍙�","宸茶繃鍙�" ),
;
// 鎴愬憳鍙橀噺
@@ -727,13 +734,13 @@
private String info;
// 鏋勯�犳柟娉�
- UserActionType(int key, String name,String info ) {
+ PlatformJobStatus(int key, String name,String info ) {
this.key = key;
this.info = info;
this.name = name;
}
public static String getName(int index) {
- for (UserActionType c : UserActionType.values()) {
+ for (PlatformJobStatus c : PlatformJobStatus.values()) {
if (c.getKey() == index) {
return c.name;
}
@@ -764,71 +771,6 @@
public void setInfo(String info) {
this.info = info;
}
- }
- /**
- * 鍏宠仈瀵硅薄绫诲瀷
- 鍏宠仈瀵硅薄绫诲瀷 0浼佷笟钀ヤ笟鎵х収 1鐞嗚禂鎶ユ浜嬫晠瑙嗛鎴栧浘鐗� 2鐞嗚禂鍛樺伐鍏崇郴璇佹槑鏉愭枡 3鐞嗚禂闂ㄨ瘖璧勬枡 4鐞嗚禂浣忛櫌璧勬枡 5鐞嗚禂浼ゆ畫璧勬枡 6鐞嗚禂璧斾粯缁撴鏉愭枡 7浼佷笟韬唤璇佸彿 8淇濆崟鐢宠琛≒DF 9绛剧讲鍚庝繚鍗曠敵璇疯〃PDF 10浼佷笟绛剧珷 11鏈�缁堟姤鍗�
- */
- public enum MultiFile{
- HIDDEN_DANGER_SUBMIT(0, "闅愭偅闅忔墜鎷嶆彁鎶�", "闅愭偅闅忔墜鎷嶆彁鎶�"),
- HIDDEN_DANGER_DEAL_BEFORE(1, "闅愭偅闅忔墜鎷嶅鐞嗗墠", "闅愭偅闅忔墜鎷嶅鐞嗗墠"),
- HIDDEN_DANGER_DEAL_AFTER(2, "闅愭偅闅忔墜鎷嶅鐞嗗悗 ", "闅愭偅闅忔墜鎷嶅鐞嗗悗 "),
- ;
- // 鎴愬憳鍙橀噺
- private String name;
- private int key;
- private String noteinfo;// 鎻忚堪
-
- // 鏋勯�犳柟娉�
- MultiFile(int key, String name, String noteinfo) {
- this.name = name;
- this.key = key;
- this.noteinfo = noteinfo;
- }
-
- // 鏅�氭柟娉�
- public static String getName(int index) {
- for (MultiFile c : MultiFile.values()) {
- if (c.getKey() == index) {
- return c.name;
- }
- }
- return null;
- }
-
- // 鏅�氭柟娉�
- public static String getInfo(int index) {
- for (MultiFile c : MultiFile.values()) {
- if (c.getKey() == index) {
- return c.noteinfo;
- }
- }
- return null;
- }
-
- // get set 鏂规硶
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getKey() {
- return key;
- }
-
- public void setKey(int key) {
- this.key = key;
- }
-
- public String getNoteinfo() {
- return noteinfo;
- }
-
-
-
}
/**
* 瀹℃壒妯℃嫙绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
index 48c6832..4d0bb63 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/CarUseBook.java
@@ -62,12 +62,12 @@
@ApiModelProperty(value = "寮�濮嬫椂闂�")
@ExcelColumn(name="寮�濮嬫椂闂�")
-// @JsonFormat(pattern = "yyyy-MM-dd")
+//
private Date startTime;
@ApiModelProperty(value = "缁撴潫鏃堕棿")
@ExcelColumn(name="缁撴潫鏃堕棿")
-// @JsonFormat(pattern = "yyyy-MM-dd")
+//
private Date endTime;
@ApiModelProperty(value = "棰勮鍑哄彂鏃堕棿")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
index 1189b13..c8b8d0b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Cars.java
@@ -104,6 +104,10 @@
@ApiModelProperty(value = "鐘舵�� 0绂佺敤 1鍚敤", example = "1")
@ExcelColumn(name="鐘舵�� 0绂佺敤 1鍚敤")
private Integer status;
+
+ @ApiModelProperty(value = "鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯", example = "1")
+ @ExcelColumn(name="鐘舵�� 0涓嶅湪鍥� 1鍦ㄥ洯")
+ private Integer inStatus;
@ApiModelProperty(value = "鎺堟潈鐘舵�� 0鍚� 1鏄�", example = "1")
@ExcelColumn(name="鎺堟潈鐘舵�� 0鍚� 1鏄�")
private Integer authStatus;
@@ -113,8 +117,8 @@
@ExcelColumn(name="鎵�灞炲垎缁勭紪鐮侊紙鍏宠仈car_group)")
private Integer groupId;
- @ApiModelProperty(value = "绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�", example = "1")
- @ExcelColumn(name="绫诲瀷 0鍛樺伐杞﹁締 1瀹夋嘲鍏姟杞� 2鑷湁鐗╂祦杞�3澶栧崗鐗╂祦杞� 4甯傚叕鍙哥墿娴佽溅 5甯傚叕鍙告敞鍐岃溅杈�")
+ @ApiModelProperty(value = "绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠", example = "1")
+ @ExcelColumn(name="绫诲瀷 0瀹夋嘲鍏姟杞� 1瀹夋嘲鑷湁鐗╂祦杞� 2鍏跺畠")
private Integer type;
@@ -162,6 +166,9 @@
@ApiModelProperty(value = "杞︿富鎺堟潈鐘舵��", example = "1")
@TableField(exist = false)
private Integer memberAuthStatus;
+ @ApiModelProperty(value = "褰撳墠浣滀笟鏁伴噺", example = "1")
+ @TableField(exist = false)
+ private int jobNum;
@ApiModelProperty(value = "鎺堟潈鍋滆溅鍦虹紪鐮侀泦鍚�", example = "1")
@TableField(exist = false)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
index 96da8e3..a871f6e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Platform.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -90,7 +90,7 @@
@ApiModelProperty(value = "鏈�鍚庝簨浠舵帹閫佹椂闂�")
@ExcelColumn(name="鏈�鍚庝簨浠舵帹閫佹椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date lastEventTime;
@ApiModelProperty(value = "鐩戞帶鐐瑰悕绉帮紝澶氫釜鐢ㄨ嫳鏂囬�楀彿闅斿紑")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
index 4e04d39..482fbd7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBooks.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -66,7 +66,7 @@
@ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
@ExcelColumn(name="棰勮鍒板満鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date arriveDate;
@ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
index 54ab04c..10fe1fc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformBroadcastLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -85,7 +85,7 @@
@ApiModelProperty(value = "鎻愰啋涓嬪彂鏃堕棿")
@ExcelColumn(name="鎻愰啋涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date hkDate;
@ApiModelProperty(value = "鎻愰啋涓嬪彂澶囨敞")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
index 0f5927c..fbdeb5b 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformDevice.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
index 8540f4f..6ff8f36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformGroup.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
index 3d14fd1..f1e1ae3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformInterfaceLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -61,7 +61,7 @@
@ApiModelProperty(value = "鍦板潃淇℃伅")
@ExcelColumn(name="鍦板潃淇℃伅")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date url;
@ApiModelProperty(value = "璇锋眰鍙傛暟")
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 7df6ac4..3958bb0 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
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -90,7 +90,7 @@
@ApiModelProperty(value = "绛惧埌鏃堕棿")
@ExcelColumn(name="绛惧埌鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date signDate;
@ApiModelProperty(value = "绛惧埌鏂瑰紡 0app绛惧埌 1鎵爜绛惧埌", example = "1")
@@ -115,7 +115,7 @@
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鏃堕棿")
@ExcelColumn(name="閫氱煡鍏ュ洯绛夊緟鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date inwaitDate;
@ApiModelProperty(value = "閫氱煡鍏ュ洯绛夊緟鎿嶄綔浜虹紪鐮�", example = "1")
@@ -124,7 +124,7 @@
@ApiModelProperty(value = "鍙彿鏃堕棿")
@ExcelColumn(name="鍙彿鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date callDate;
@ApiModelProperty(value = "鍙彿浜虹紪鐮�", example = "1")
@@ -137,17 +137,17 @@
@ApiModelProperty(value = "寮�濮嬩綔涓氭椂闂�")
@ExcelColumn(name="寮�濮嬩綔涓氭椂闂�")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date startDate;
@ApiModelProperty(value = "浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
@ExcelColumn(name="浣滀笟瀹屾垚鏃堕棿锛堟渶缁堟椂闂达級")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date doneDate;
@ApiModelProperty(value = "寮傚父鎸傝捣鏃堕棿")
@ExcelColumn(name="寮傚父鎸傝捣鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date errorDate;
@ApiModelProperty(value = "寮傚父鎸傝捣浜虹紪鐮�", example = "1")
@@ -160,7 +160,7 @@
@ApiModelProperty(value = "鏈堝彴杞氦鏃堕棿")
@ExcelColumn(name="鏈堝彴杞氦鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date transPlatformDate;
@ApiModelProperty(value = "鏈堝彴杞氦澶勭悊浜�", example = "1")
@@ -173,12 +173,11 @@
@ApiModelProperty(value = "杞﹁締杩涘巶鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date inDate;
@ApiModelProperty(value = "杞﹁締绂诲巶鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date outDate;
@ApiModelProperty(value = "绂诲巶鏂瑰紡 0鑷姩绂诲巶 1鎵嬪姩绂诲満", example = "1")
@@ -191,7 +190,7 @@
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締绂诲巶涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date outHkdate;
@ApiModelProperty(value = "杞﹁締绂诲巶涓嬪彂澶囨敞")
@@ -208,7 +207,7 @@
@ApiModelProperty(value = "杞﹁締杩涘巶涓嬪彂鏃堕棿")
@ExcelColumn(name="杞﹁締杩涘巶涓嬪彂鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date inHkdate;
@ApiModelProperty(value = "浣滀笟绫诲瀷 0鑷湁杞﹀嵏璐� 1鑷湁杞﹁璐� 2澶栧崗杞﹀嵏璐� 3澶栧崗杞﹁璐� 4甯傚叕鍙稿鍗忚溅鍗歌揣", example = "1")
@@ -233,7 +232,7 @@
@ApiModelProperty(value = "浣滃簾鏃堕棿")
@ExcelColumn(name="浣滃簾鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date cancelDate;
@ApiModelProperty(value = "浣滃簾澶勭悊浜虹紪鐮�", example = "1")
@@ -254,7 +253,6 @@
@ApiModelProperty(value = "棰勮鍒板満鏃堕棿")
@ExcelColumn(name="棰勮鍒板満鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date arriveDate;
@ApiModelProperty(value = "鍏ュ簱绫诲瀷 0鏁存墭鐩� 1浠剁儫", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
index 75657bb..972c60c 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformLog.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
index 4bee734..7329f89 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformQueue.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
index 6594e1b..da9e9ab 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformReason.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
index 3e3c96d..d3048c2 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformShowParam.java
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +40,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
index c9de2b1..6abd296 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsDetail.java
@@ -32,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -41,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
index e07bf62..5b9a619 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/PlatformWmsJob.java
@@ -1,5 +1,6 @@
package com.doumee.dao.business.model;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.doumee.core.annotation.excel.ExcelColumn;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -31,7 +32,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -40,7 +41,7 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
@@ -81,8 +82,7 @@
@ApiModelProperty(value = "閫氱煡鍒涘缓鏃ユ湡")
@ExcelColumn(name="閫氱煡鍒涘缓鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
- private Date ioCreatedate;
+ private String ioCreatedate;
@ApiModelProperty(value = "鐘舵�� 0鏈鐞� 1宸插鐞� 2宸插彇娑�", example = "1")
@ExcelColumn(name="鐘舵�� 0鏈鐞� 1宸插鐞� 2宸插彇娑�")
@@ -90,7 +90,7 @@
@ApiModelProperty(value = "鍙栨秷鏃堕棿")
@ExcelColumn(name="鍙栨秷鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+
private Date cancelDate;
@ApiModelProperty(value = "鍙栨秷澶囨敞")
@@ -108,5 +108,8 @@
@ApiModelProperty(value = "鍚堝悓鍙穈")
@ExcelColumn(name="鍚堝悓鍙穈")
private String contractNum;
+ @ApiModelProperty(value = "鏄惁鏂版暟鎹甡")
+ @TableField(exist = false)
+ private int isNew;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
index 08b14c1..2560fdc 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/wms/WmsServiceImpl.java
@@ -1,19 +1,27 @@
package com.doumee.service.business.impl.wms;
-import com.doumee.core.wms.model.request.WmsActionNoticeRequest;
-import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
-import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.doumee.core.utils.Constants;
+import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsBaseResponse;
+import com.doumee.dao.business.CarsMapper;
+import com.doumee.dao.business.PlatformJobMapper;
import com.doumee.dao.business.PlatformWmsDetailMapper;
import com.doumee.dao.business.PlatformWmsJobMapper;
+import com.doumee.dao.business.model.Cars;
+import com.doumee.dao.business.model.PlatformJob;
+import com.doumee.dao.business.model.PlatformWmsDetail;
import com.doumee.dao.business.model.PlatformWmsJob;
import com.doumee.service.business.WmsService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
+import java.util.Date;
import java.util.List;
/**
@@ -26,6 +34,10 @@
@Autowired
private PlatformWmsJobMapper platformWmsJobMapper;
@Autowired
+ private CarsMapper carsMapper;
+ @Autowired
+ private PlatformJobMapper platformJobMapper;
+ @Autowired
private PlatformWmsDetailMapper platformWmsDetailMapper;
/**
@@ -34,17 +46,130 @@
* @return
*/
@Override
+ @Transactional
public WmsBaseResponse inboundNotice(List<WmsInboundNoticeRequest> list) {
- //TODO-------------------澶勭悊鍏ュ簱閫氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
- WmsBaseResponse response = new WmsBaseResponse();
- response.setData(new ArrayList<>());
+ List<PlatformJob> jobList = new ArrayList<>();
+ List<PlatformWmsDetail> details = new ArrayList<>();
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsInboundNoticeRequest param : list){
+ if(StringUtils.isBlank(param.getIoCode()) ||
+ StringUtils.isBlank(param.getCarrierBillCode())||
+ StringUtils.isBlank(param.getPlateNumber())||
+ StringUtils.isBlank(param.getDriverPhone())){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
+ }
+ //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+ PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+ .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ .last("limit 1" ));
- return response;
+ if(job == null){
+ PlatformJob model =dealJobBizInbound(param);
+ job = new PlatformWmsJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setIsNew(Constants.ONE);
+ job.setCarryBillCode(param.getCarrierBillCode());
+ job.setIocode(param.getIoCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setPlateNumber(param.getPlateNumber());
+ job.setType(Constants.ONE);
+ job.setIoCreatedate(param.getCreateDate());
+ job.setJobId(model.getId());
+ job.setDriverPhone(param.getDriverPhone());
+ platformWmsJobMapper.insert(job);
+ jobList.add(model);
+ }
+ if(param.getDetails()!=null && param.getDetails().size()>0){
+ for(WmsInboundDetailRequest d :param.getDetails()){
+ PlatformWmsDetail entity = new PlatformWmsDetail();
+ entity.setCreateDate(new Date());
+ entity.setIsdeleted(Constants.ZERO);
+ entity.setIocode(d.getIoCode());
+ entity.setJobId(job.getId());
+ entity.setIoQty(d.getIoQty());
+ entity.setRate(d.getRate());
+ entity.setMaterialName(d.getMaterialName());
+ entity.setInRepertotyCode(d.getInRepertotyCode());
+ iocodeList.add(d.getIoCode());
+ details.add(entity);
+ }
+ if(job.getIsNew() == 1&& iocodeList.size()>0){
+ //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getJobId,job.getJobId())
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ );
+ }
+ }
+ }
+ if(details.size()>0){
+ platformWmsDetailMapper.insert(details);
+ }
+ if(jobList.size()>0){
+ startEndNoticeToDriver(jobList);
+ }
+ return returnSuccessReuslt(null);
}
+ private void startEndNoticeToDriver(List<PlatformJob> jobList) {
+ for(PlatformJob job : jobList){
+ //-----TODO-----------浠诲悍锛屽彂閫佸徃鏈哄叕浼楀彿鍜岀煭淇￠�氱煡
+ }
+ }
+
+ private PlatformJob dealJobBizInbound(WmsInboundNoticeRequest param) {
+ PlatformJob job = new PlatformJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setType(Constants.platformJobType.wxcxh);//榛樿鏄鍗忚溅鍗歌揣
+ job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+ Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+ .lambda()
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .eq(Cars::getType,Constants.ONE)
+ .eq(Cars::getCode,param.getPlateNumber()));
+ if(car !=null){
+ //濡傛灉鏄嚜鏈夌墿娴佽溅
+ job.setType(Constants.platformJobType.zycxh);//鑷湁杞﹀嵏璐�
+ if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
+ //濡傛灉杞﹁締鍦ㄥ洯
+ job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
+ }
+ }
+ platformJobMapper.insert(job);
+ return job;
+ }
+ private PlatformJob dealJobBizOutbound(WmsOutboundNoticeRequest param) {
+ PlatformJob job = new PlatformJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setType(Constants.platformJobType.wxczh);//榛樿鏄鍗忚溅瑁呭ソ
+ job.setStatus(Constants.PlatformJobStatus.WAIT_CONFIRM.getKey());//榛樿寰呯‘璁ょ姸鎬�
+ Cars car = carsMapper.selectOne(new QueryWrapper<Cars>()
+ .select("*,(select count(1) from platform_job b where b.plate_num='"+param.getPlateNumber()+"' and b.status in()) as jobNum")
+ .lambda()
+ .eq(Cars::getIsdeleted,Constants.ZERO)
+ .eq(Cars::getType,Constants.ONE)
+ .eq(Cars::getCode,param.getPlateNumber()));
+ if(car !=null){
+ //濡傛灉鏄嚜鏈夌墿娴佽溅
+ job.setType(Constants.platformJobType.zyczh);//鑷湁杞﹁璐�
+ if(Constants.equalsInteger(car.getInStatus(),Constants.ONE) && car.getJobNum() == 0) {
+ //濡傛灉杞﹁締鍦ㄥ洯
+ job.setStatus(Constants.PlatformJobStatus.WAIT_CALL.getKey());//鍦ㄥ洯鏃犱綔涓氱姸鎬侊紝鍒欒嚜鍔ㄣ�愬凡绛惧埌銆戝鐞�
+ }
+ }
+ platformJobMapper.insert(job);
+ return job;
+ }
/**
@@ -54,11 +179,73 @@
*/
@Override
public WmsBaseResponse outboundNotice(List<WmsOutboundNoticeRequest> list) {
- //TODO-------------------澶勭悊鍑哄簱閫氱煡涓氬姟--------------------
if(list ==null || list.size() ==0){
return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶈兘涓虹┖");
}
- return null;
+ List<PlatformJob> jobList = new ArrayList<>();
+ List<PlatformWmsDetail> details = new ArrayList<>();
+ List<String> iocodeList = new ArrayList<>();
+ for(WmsOutboundNoticeRequest param : list){
+ if(StringUtils.isBlank(param.getIoCode()) ||
+ StringUtils.isBlank(param.getCarrierBillCode())||
+ StringUtils.isBlank(param.getPlateNumber())||
+ StringUtils.isBlank(param.getDriverPhone())){
+ return returnFailReuslt("璇锋眰鍙傛暟涓嶆纭紝鍙傛暟涓嶅悎娉�!");
+ }
+ //鏍规嵁鎵胯繍鍗曞彿鏌ヨ浠诲姟淇℃伅
+ PlatformWmsJob job = platformWmsJobMapper.selectOne(new QueryWrapper<PlatformWmsJob>().lambda()
+ .eq(PlatformWmsJob::getCarryBillCode,param.getCarrierBillCode())
+ .eq(PlatformWmsJob::getIsdeleted, Constants.ZERO)
+ .last("limit 1" ));
+
+ if(job == null){
+ PlatformJob model =dealJobBizOutbound(param);
+ job = new PlatformWmsJob();
+ job.setCreateDate(new Date());
+ job.setIsdeleted(Constants.ZERO);
+ job.setIsNew(Constants.ONE);
+ job.setCarryBillCode(param.getCarrierBillCode());
+ job.setIocode(param.getIoCode());
+ job.setCarrierName(param.getCarrierName());
+ job.setPlateNumber(param.getPlateNumber());
+ job.setType(Constants.ONE);
+ job.setIoCreatedate(param.getCreateDate());
+ job.setJobId(model.getId());
+ job.setDriverPhone(param.getDriverPhone());
+ platformWmsJobMapper.insert(job);
+ jobList.add(model);
+ }
+ if(param.getDetails()!=null && param.getDetails().size()>0){
+ for(WmsOutboundDetailRequest d :param.getDetails()){
+ PlatformWmsDetail entity = new PlatformWmsDetail();
+ entity.setCreateDate(new Date());
+ entity.setIsdeleted(Constants.ZERO);
+ entity.setIocode(d.getIoCode());
+ entity.setJobId(job.getId());
+ entity.setIoQty(d.getIoQty());
+ entity.setRate(d.getRate());
+ entity.setMaterialName(d.getMaterialName());
+ iocodeList.add(d.getIoCode());
+ details.add(entity);
+ }
+ if(job.getIsNew() == 1&& iocodeList.size()>0){
+ //鍏堟竻鐞嗗悓涓�涓壙杩愬崟鍙蜂笅閲嶅鎺ㄩ�佺殑iocode鏁版嵁锛屼互鏈�鍚庝竴娆℃帹閫佷负涓�
+ platformWmsDetailMapper.update(null,new UpdateWrapper<PlatformWmsDetail>().lambda()
+ .set(PlatformWmsDetail::getIsdeleted,Constants.ONE)
+ .eq(PlatformWmsDetail::getIsdeleted,Constants.ZERO)
+ .eq(PlatformWmsDetail::getJobId,job.getJobId())
+ .in(PlatformWmsDetail::getIocode,iocodeList)
+ );
+ }
+ }
+ }
+ if(details.size()>0){
+ platformWmsDetailMapper.insert(details);
+ }
+ if(jobList.size()>0){
+ startEndNoticeToDriver(jobList);
+ }
+ return returnSuccessReuslt(null);
}
/**
* 鍏ュ簱鍙栨秷閫氱煡浠诲姟涓氬姟澶勭悊
--
Gitblit v1.9.3