From 04bf59bbc3fad774c57a2ee5ebf07db24b476bf2 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 17 十二月 2024 17:43:14 +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/service/business/third/WmsService.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java | 2
server/visits/dmvisit_admin/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java | 1
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java | 20 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java | 40 +
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java | 2
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java | 8
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java | 29 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java | 4
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java | 7
server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java | 27 +
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java | 12
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java | 4
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java | 25 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java | 51 ++
server/system_gateway/src/main/resources/bootstrap.yml | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java | 17
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java | 56 +-
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java | 23
server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java | 435 ++++++++++++++++++++++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java | 11
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java | 16
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java | 2
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java | 26
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 24
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 114 ++++--
server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java | 9
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 32 +
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 3
34 files changed, 847 insertions(+), 185 deletions(-)
diff --git a/server/system_gateway/src/main/resources/bootstrap.yml b/server/system_gateway/src/main/resources/bootstrap.yml
index 099da4a..8ecd0a5 100644
--- a/server/system_gateway/src/main/resources/bootstrap.yml
+++ b/server/system_gateway/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: system_gateway
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
index 42d942c..d46799d 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/TmsCloudController.java
@@ -6,10 +6,7 @@
import com.doumee.core.tms.model.request.TmsLockStatusQueryRequest;
import com.doumee.core.tms.model.request.TmsOrderInfoRequest;
import com.doumee.core.tms.model.request.TmsOrderListRequest;
-import com.doumee.core.tms.model.response.TmsBaseResponse;
-import com.doumee.core.tms.model.response.TmsLockStatusQueryResponse;
-import com.doumee.core.tms.model.response.TmsOrderInfoResponse;
-import com.doumee.core.tms.model.response.TmsOrderListResponse;
+import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
import com.doumee.core.wms.model.response.WmsBaseResponse;
import com.doumee.service.business.third.TmsService;
@@ -51,7 +48,7 @@
@ApiOperation("銆怲MS銆戝悎鍚屽垪琛ㄦ帴鍙�")
@LoginNoRequired
@PostMapping("/orderList")
- public ApiResponse<List<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
+ public ApiResponse<TmsBasePageResponse<TmsOrderListResponse>> orderList(@RequestBody TmsOrderListRequest request ) {
return ApiResponse.success(tmsService.orderList(request));
}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
index 643d77e..5698d26 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/PlatformJobRunActController.java
@@ -2,6 +2,7 @@
import com.doumee.api.BaseController;
import com.doumee.config.annotation.LoginNoRequired;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.model.ApiResponse;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.join.PlatformJobJoinMapper;
@@ -71,6 +72,13 @@
BoardCarsListVO data = boardService.platformJobCarsList();
return ApiResponse.success(data);
}
+ @LoginNoRequired
+ @ApiOperation("姹借溅鍛婅浜嬩欢闆嗗悎鏁版嵁")
+ @GetMapping("/carsEventList")
+ public ApiResponse<List<CarsAlarmResultListResponse>> carsEventList() {
+ List<CarsAlarmResultListResponse> data = boardService.carsEventList();
+ return ApiResponse.success(data);
+ }
@LoginNoRequired
@ApiOperation("鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎")
diff --git a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
index 2df12af..9dc10e9 100644
--- a/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
+++ b/server/visits/dmvisit_admin/src/main/resources/bootstrap.yml
@@ -1,6 +1,6 @@
spring:
profiles:
- active: pro
+ active: dev
application:
name: visitsAdmin
# 瀹夊叏閰嶇疆
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
index ed95c67..e29c243 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/haikang/service/HKCarOpenService.java
@@ -34,6 +34,8 @@
private static final String DEFAULT_CHARSET = "UTF-8";
private static final String REGION_ID = "cn-hangzhou";
private static final String VERSION = "2.1.0";
+
+ public static List<CarsDeviceDetaisResponse> HK_CARS_LIST= null;
public static String BASE_URL = "https://open.hikvisionauto.com:14021/v2/";
private static TreeMap<String, String> getBaseParams() {
Map<String, String> params = Maps.newHashMap();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
index af560be..1b41a7a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/TMSContants.java
@@ -14,11 +14,11 @@
String[] getRealTimeInventory = new String[]{"/tms/zhyt/getRealTimeInventory", "銆怲MS銆戝疄鏃跺簱瀛樻煡璇�"};//TMS瀹炴椂搴撳瓨鏌ヨ鎺ュ彛鍦板潃
String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound", "銆怲MS銆戝嚭鍏ュ簱璁板綍鏌ヨ"};//TMS鍑哄叆搴撹褰曟煡璇㈡帴鍙ｅ湴鍧�
String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝湪閫旀槑缁嗗垪琛�"};//TMS鍦ㄩ�旀槑缁嗗垪琛ㄦ帴鍙ｅ湴鍧�
- String[] getOrderList = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
+ String[] getOrderList = new String[]{"/tms/zhyt/getOrderList", "銆怲MS銆戝悎鍚屽垪琛ㄦ煡璇�"};//TMS鍚堝悓鍒楄〃鏌ヨ鎺ュ彛鍦板潃
String[] getElecByContractNumberList = new String[]{"/tms/zhyt/getElecByContractNumberList", "銆怲MS銆戝悎鍚屼笂閿佺姸鎬�"};//TMS鍚堝悓涓婇攣鐘舵�佹帴鍙ｅ湴鍧�
String[] getOrderDetailByContractNumber = new String[]{"/tms/zhyt/getOrderDetailByContractNumber", "銆怲MS銆戝悎鍚岃鎯�"};//TMS鍚堝悓璇︽儏鎺ュ彛鍦板潃
String[] getGis = new String[]{"/tms/zhyt/getGis", "銆怲MS銆戞牴鎹繍杈撳崟鍙锋煡璇is杞�"};//TMS鏍规嵁杩愯緭鍗曞彿鏌ヨgis杞ㄦ帴鍙ｅ湴鍧�
- String[] getOrderStatusByContractNumber = new String[]{";//", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
+ String[] getOrderStatusByContractNumber = new String[]{"/tms/zhyt/getOrderStatusByContractNumber", "銆怲MS銆戝崟鐢熷懡鍛ㄦ湡"};//3.8璁㈠崟鐢熷懡鍛ㄦ湡
}
public enum TopStatusLevel {
@@ -30,17 +30,17 @@
* 宸插埌璐�
* 宸插叆搴�
*/
- ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getKey()}),
- ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getKey()
- ,ChildStatusLevel.ysdcx.getKey()
- ,ChildStatusLevel.shtg.getKey()
- ,ChildStatusLevel.shwtg.getKey()}),
- ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.getKey()
- ,ChildStatusLevel.sqzyzwc.getKey()
- ,ChildStatusLevel.clqddzs.getKey()}),
- clysz(3, "杞﹁締杩愯緭涓�",new Integer[]{ChildStatusLevel.clqdapp.getKey()}),
- ydh(4,"宸插埌璐�",new Integer[]{ChildStatusLevel.ddzhd.getKey()}),
- yrk (5,"宸插叆搴�",new Integer[]{ChildStatusLevel.ddxhd.getKey()});
+ ddsc(0,"璁㈠崟鐢熸垚",new Integer[]{ChildStatusLevel.create.getOrderStatus()}),
+ ydpzz (1,"杩愬崟閰嶈浇涓�",new Integer[]{ChildStatusLevel.ysdxc.getOrderStatus()
+ ,ChildStatusLevel.ysdcx.getOrderStatus()
+ ,ChildStatusLevel.shtg.getOrderStatus()
+ ,ChildStatusLevel.shwtg.getOrderStatus()}),
+ ckckz (2,"浠撳簱鍑哄簱涓�",new Integer[]{ChildStatusLevel.ddzhddzs.getOrderStatus()
+ ,ChildStatusLevel.sqzyzwc.getOrderStatus()
+ ,ChildStatusLevel.clqddzs.getOrderStatus()}),
+ clysz(3, "杞﹁締杩愯緭涓�",new Integer[]{ChildStatusLevel.clqdapp.getOrderStatus()}),
+ ydh(4,"宸插埌璐�",new Integer[]{ChildStatusLevel.ddzhd.getOrderStatus()}),
+ yrk (5,"宸插叆搴�",new Integer[]{ChildStatusLevel.ddxhd.getOrderStatus()});
// 鎴愬憳鍙橀噺
private int key;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
new file mode 100644
index 0000000..efd2fe5
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListPagerRequest.java
@@ -0,0 +1,20 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鍒楄〃椤电爜璇锋眰鍙傛暟")
+public class TmsOrderListPagerRequest {
+
+
+ private Integer page ;//鏄� 鏁板瓧 褰撳墠椤�
+ private Integer rows ;//鏄� 鏁板瓧 姣忛〉鏁版嵁閲廋reateDateTimeEnd;//鎴鏃堕棿
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
new file mode 100644
index 0000000..e2b6122
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListParamRequest.java
@@ -0,0 +1,27 @@
+package com.doumee.core.tms.model.request;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍚堝悓鍒楄〃璇锋眰鍙傛暟")
+public class TmsOrderListParamRequest {
+
+
+ private List<String> permissionDomainIdList; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ private List<String> contractNumbers; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
+ private String contractNumber; // 鍚� 鍚堝悓鍙烽泦鍚�
+ private String deliveryEnterprise ;//鍚� 瀛楃涓� 鍙戣揣鍦�
+ private String receiveEnterprise ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
+ private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
+ private String ncCreateDateTimeEnd;//鎴鏃堕棿
+ private String ncCreateDateTimeStart;// 寮�濮嬫椂闂�
+ private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
+
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
index 270afdc..52a9fb0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/request/TmsOrderListRequest.java
@@ -10,17 +10,11 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("tms鍚堝悓鍒楄〃璇锋眰鍙傛暟")
+@ApiModel("tms鍚堝悓鍒楄〃鍒嗛〉璇锋眰鍙傛暟")
public class TmsOrderListRequest {
- private List<String> permissionDomainIdList; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
- private List<String> contractNumbers; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
- private String fromRepertoty ;//鍚� 瀛楃涓� 鍙戣揣鍦�
- private String toRepertoty ;// 鍚� 瀛楃涓� 鍒拌揣鍦�
- private String provinceName ;// 鍚� 瀛楃涓� 鍒拌揣鍦扮渷浠�
- private String ncCreateDateTimeEnd;//鎴鏃堕棿
- private String ncCreateDateTimeStart;// 寮�濮嬫椂闂�
- private String phoneNumber ;//鍚� 瀛楃涓� 鎵嬫満鍙�
+ private TmsOrderListParamRequest parameters; //鏄� 闆嗗悎 鍖哄煙ID闆嗗悎
+ private TmsOrderListPagerRequest pager; // 鍚� 闆嗗悎 鍚堝悓鍙烽泦鍚�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
new file mode 100644
index 0000000..0c519f9
--- /dev/null
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsBasePageResponse.java
@@ -0,0 +1,16 @@
+package com.doumee.core.tms.model.response;
+
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class TmsBasePageResponse<T> {
+ private int totalCount;// number False 鎬昏褰曟潯鏁�
+ private int totalPage;// 鎬婚〉鏁� Integer
+ private int currentPage ;//褰撳墠椤� Integer
+ private int pageSize;// 鏌ヨ鏁版嵁璁板綍鎬绘暟 Long
+ @JSONField(name="rows",alternateNames = {"results","list"})
+ private List<T> rows ;// object[] False 鏉冮檺缁勫璞″垪琛�
+}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
index ed3a608..0ff38e0 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusListResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
@@ -8,17 +9,27 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熻繑鍥炲弬鏁�")
+@ApiModel("tms鏍规嵁鍚堝悓鍙锋煡璇㈣鍗曠敓鍛藉懆鏈熺姸鎬佹槑缁嗚繑鍥炲弬鏁�")
public class TmsCircleStatusListResponse {
/**
*/
-
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佹弿杩�" )
private String orderStatusDes ;//瀛楃涓� 璁㈠崟鐘舵�佹弿杩�
-
+ @ApiModelProperty(value = "鐘舵�佽褰曟椂闂�" )
private String recordDate ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佺爜" )
private Integer orderStatus;// 瀛楃涓� 璁㈠崟鐘舵�佺爜
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佽褰曠被鍨�" )
private Integer type;// 瀛楃涓� 璁㈠崟鐘舵�佽褰曠被鍨�
+ @ApiModelProperty(value = "鎾ら攢鍘熷洜" )
private String canCelReason;// 瀛楃涓� 鎾ら攢鍘熷洜
+ @ApiModelProperty(value = "鍙风爜" )
private String tel ;//瀛楃涓� 鍙风爜
+
+ @ApiModelProperty(value = "璁㈠崟鐘舵�佸敮涓�鏍囪瘑" )
+ private Integer statusKey;// 瀛楃涓� 璁㈠崟鐘舵�佺爜
+
+ private long timeStamp;//
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
index 8910650..91f44ba 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsCircleStatusResultListResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -14,9 +15,11 @@
public class TmsCircleStatusResultListResponse {
/**
*/
-
- private Integer key ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
- private String name ;//瀛楃涓� 璁㈠崟鐘舵�佺爜
+ @ApiModelProperty(value = "绱㈠紩鍊�" )
+ private int key ;//瀛楃涓� 鐘舵�佽褰曟椂闂�
+ @ApiModelProperty(value = "闃舵鍚嶇О" )
+ private String name ;//瀛楃涓�
+ @ApiModelProperty(value = "浜岀礆鏁版嵁闆嗗悎" )
private List<TmsCircleStatusListResponse> secondList ;//浜岀礆鏁版嵁闆嗗悎
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
index 96599de..292a8c1 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsGisStatusInfoResponse.java
@@ -1,7 +1,10 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+
+import java.math.BigDecimal;
/**
* @author 姹熻箘韫�
@@ -12,13 +15,17 @@
public class TmsGisStatusInfoResponse {
/**
*/
-
- private String startRepertotyName;// 瀛楃涓� 璧风偣鍚嶇О
- private String endRepertotyName;// 瀛楃涓� 缁堢偣鍚嶇О
- private String startLon ;//瀛楃涓� 璧风偣缁忓害
- private String startLat;// 瀛楃涓� 璧风偣绾害
- private String endLon ;//瀛楃涓� 缁堢偣缁忓害
- private String endLat ;//瀛楃涓� 缁堢偣绾害
- private String plateNumber;// 瀛楃涓� 杞︾墝鍙�
+ private String callLetter;//": "40258036812",
+ @ApiModelProperty(value = "闊﹀害" )
+ private Double lon;//": 117.28768,
+ @ApiModelProperty(value = "缁忓害" )
+ private Double lat;//": 32.909134,
+ private String course;//": "200",
+ private BigDecimal speed;//": 310,
+ @ApiModelProperty(value = "鏃堕棿" )
+ private String gpstime;//": "2023/09/04 11:10:29",
+ private String stamp;//": "2023/09/04 11:10:29",
+ private String lon1;//": 117.28768,
+ private String lat1;//": 32.909134
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
index 21e0d04..a0e66fb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderInfoResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -13,22 +14,42 @@
@ApiModel("tms鍚堝悓璇︽儏杩斿洖鍙傛暟")
public class TmsOrderInfoResponse {
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
private String contractNumber ; //鍚堝悓鍙�
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String deliveryEnterprise ; //鍙戣揣鍦�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String receiveEnterprise ; //鍒拌揣鍦�
- private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+// @ApiModelProperty(value = "杞︾墝鍙�" )
+// private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
private String orderStatus ; //褰撳墠杩愯緭鍗曠姸鎬�
+ @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
private String ncCreateDate; // 鍒跺崟鏃堕棿
+ @ApiModelProperty(value = "杩愯緭濡傛湡" )
private String transportDate; //
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
private String transportCode; //
+ @ApiModelProperty(value = "鍙告満濮撳悕" )
private String driverName; //
+ @ApiModelProperty(value = "鍙告満鐢佃瘽" )
private String driverTel; //
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
private String orderStatusDesc; //
+ @ApiModelProperty(value = "杞︾墝鍙�" )
private String plateName; //": "鐨朇C2585",
+ @ApiModelProperty(value = "鍙戣揣浠撳簱缁忓害" )
private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鍙戣揣浠撳簱绾害" )
private String deliveryLat ; // 鍙戣揣浠撳簱绾害
+ @ApiModelProperty(value = "鍗歌揣浠撳簱缁忓害" )
private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
+ @ApiModelProperty(value = "鍗歌揣浠撳簱绾害" )
private String receiveLat; // 鍗歌揣浠撳簱绾害
- private List<TmsGisListResponse> gisList;
+ @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
+ private String plannedArrivedDate; // 璁″垝鍒拌揪鏃堕棿
+ @ApiModelProperty(value = "gis杞ㄨ抗缁忕含搴﹂泦鍚�" )
+ private List<TmsGisListResponse> gisList;
+ @ApiModelProperty(value = "鐢熷懡鍛ㄦ湡闆嗗悎" )
private List<TmsCircleStatusResultListResponse> cicleStatusList;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
index 81d5f4c..fde4887 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/tms/model/response/TmsOrderListResponse.java
@@ -1,6 +1,7 @@
package com.doumee.core.tms.model.response;
import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.List;
@@ -27,18 +28,36 @@
"message": "鎿嶄綔鎴愬姛"
}
*/
+ @ApiModelProperty(value = "鍚堝悓鍙�" )
private String contractNumber; // 鍚堝悓鍙�
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String fromRepertoty; // 鍙戣揣鍦�
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String toRepertoty ; //鍒拌揣鍦�
- private String plateNumber; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "杞︾墝鍙�" )
+ private String plateName; // 杞︾墝鍙� 鍚堝悓鏈厤杞藉垯鏃�
+ @ApiModelProperty(value = "褰撳墠杩愯緭鍗曠姸鎬�" )
private String orderStatus; // 褰撳墠杩愯緭鍗曠姸鎬�
+ @ApiModelProperty(value = "鍒跺崟鏃堕棿" )
private String ncCreateDate; // 鍒跺崟鏃堕棿
+ @ApiModelProperty(value = "鍙戣揣鍦�" )
private String deliveryEnterprise; // 鍙戣揣鍦� 鍙戣揣浠撳簱鍚嶇О
+ @ApiModelProperty(value = "鍒拌揣鍦�" )
private String receiveEnterprise; // 鍒拌揣鍦� 鍗歌揣浠撳簱鍚嶇О
- private String deliveryLon ; // 鍙戣揣浠撳簱缁忓害
- private String deliveryLat ; // 鍙戣揣浠撳簱绾害
- private String receiveLon ; // 鍗歌揣浠撳簱缁忓害
- private String receiveLat; // 鍗歌揣浠撳簱绾害
+ @ApiModelProperty(value = "杩愯緭鍗曞彿" )
private String transportCode; // 杩愯緭鍗曞彿 鍙兘涓虹┖锛堟棤杩愯緭鍗曠殑鎯呭喌锛�
+ @ApiModelProperty(value = "鐘舵�佹弿杩�" )
+ private String orderStatusDesc; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鍙戣揣鍦扮含搴�" )
+ private String deliveryLon; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鍙戣揣鍦扮粡搴�" )
+ private String deliveryLat; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鏀惰揣鍦扮含搴�" )
+ private String receiveLon; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "鏀惰揣鍦扮粡搴�" )
+ private String receiveLat; // 鐘舵�佹弿杩�
+ @ApiModelProperty(value = "璁″垝鍒拌揪鏃堕棿" )
+ private String plannedArrivedDate; // 鐘舵�佹弿杩�
+ private long timeStamp;//鏃堕棿鎴�
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java
index 2cb59e0..93bffdd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsBaseDataResponse.java
@@ -4,6 +4,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @date 2023/11/23 14:03
@@ -16,5 +18,7 @@
private String success;
@ApiModelProperty(value = "娑堟伅鎻忚堪" ,example = "1")
private String msgDescr;
+ @ApiModelProperty(value = "娑堟伅鎻忚堪" ,example = "1")
+ private List<WmsInventoryJsonResponse> json;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java
index 25e1c01..fbb9646 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryDataResponse.java
@@ -1,9 +1,16 @@
package com.doumee.core.wms.model.response;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.fastjson.TypeReference;
+import com.doumee.core.utils.Constants;
+import com.doumee.dao.web.response.platformReport.BoardStockListVO;
+import com.doumee.dao.web.response.platformReport.GeneralVO;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -12,13 +19,437 @@
*/
@Data
@ApiModel("WMS鎺ュ彛澶勭悊杩斿洖data鍙傛暟")
-public class WmsInventoryDataResponse {
-
+public class WmsInventoryDataResponse {
@ApiModelProperty(value = "鏄惁鎺ユ敹鎴愬姛 1鎴愬姛 -1 澶辫触" ,example = "1")
private String success;
@ApiModelProperty(value = "娑堟伅鎻忚堪" ,example = "1")
private String msgDescr;
+
@ApiModelProperty(value = "娑堟伅鎻忚堪" ,example = "1")
private List<WmsInventoryJsonResponse> json;
+ public static void main(String[] args) {
+ String dd ="{\n" +
+ " \"data\": [\n" +
+ " {\n" +
+ " \"json\": [\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode019\",\n" +
+ " \"item_name\": \"榛勫北寰藉晢鏂拌鐣岀粏鏀紙鑺滄箹锛塡",\n" +
+ " \"qty\": 1470,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028223744\",\n" +
+ " \"item_name\": \"榛勫北(璁板繂)\",\n" +
+ " \"qty\": 600,\n" +
+ " \"supplier_code\": \"01\",\n" +
+ " \"supplier_name\": \"铓屽煚鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028123266\",\n" +
+ " \"item_name\": \"榛勫北纭蹇哱",\n" +
+ " \"qty\": 45,\n" +
+ " \"supplier_code\": \"05\",\n" +
+ " \"supplier_name\": \"婊佸窞鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028225175\",\n" +
+ " \"item_name\": \"榛勫北(鏂板埗鐨栫儫)\",\n" +
+ " \"qty\": 41,\n" +
+ " \"supplier_code\": \"01\",\n" +
+ " \"supplier_name\": \"铓屽煚鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028223980\",\n" +
+ " \"item_name\": \"榛勫北(鍗拌薄涓�鍝�)\",\n" +
+ " \"qty\": 8119,\n" +
+ " \"supplier_code\": \"07\",\n" +
+ " \"supplier_name\": \"閲嶅簡涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃\",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028125321\",\n" +
+ " \"item_name\": \"榛勫北(涓浗鐢荤粏鏀�)\",\n" +
+ " \"qty\": 570,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028223980\",\n" +
+ " \"item_name\": \"榛勫北(鍗拌薄涓�鍝�)\",\n" +
+ " \"qty\": 9701,\n" +
+ " \"supplier_code\": \"01\",\n" +
+ " \"supplier_name\": \"铓屽煚鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"FYWL02\",\n" +
+ " \"item_name\": \"闈炵儫鐗╂枡02\",\n" +
+ " \"qty\": 2,\n" +
+ " \"supplier_code\": \"03\",\n" +
+ " \"supplier_name\": \"鍚堣偉鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028131605\",\n" +
+ " \"item_name\": \"榛勫北(澶х孩鏂瑰嵃)\",\n" +
+ " \"qty\": 190,\n" +
+ " \"supplier_code\": \"05\",\n" +
+ " \"supplier_name\": \"婊佸窞鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode009\",\n" +
+ " \"item_name\": \"榛勫北寰藉晢鏂版蹇电粏鏀紙鑺滄箹锛塡",\n" +
+ " \"qty\": 25500,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode009\",\n" +
+ " \"item_name\": \"榛勫北寰藉晢鏂版蹇电粏鏀紙鑺滄箹锛塡",\n" +
+ " \"qty\": 600,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Semifinished\",\n" +
+ " \"itemType_name\": \"鍦ㄥ埗鍝乗"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028223980\",\n" +
+ " \"item_name\": \"榛勫北(鍗拌薄涓�鍝�)\",\n" +
+ " \"qty\": 2722,\n" +
+ " \"supplier_code\": \"05\",\n" +
+ " \"supplier_name\": \"婊佸窞鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028208949\",\n" +
+ " \"item_name\": \"榛勫北(绾㈡柟鍗扮粏鏀�)\",\n" +
+ " \"qty\": 2090,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode028\",\n" +
+ " \"item_name\": \"25鍚堣偉鏂板埗鐨栫焊绠卞璐",\n" +
+ " \"qty\": 5430,\n" +
+ " \"supplier_code\": \"03\",\n" +
+ " \"supplier_name\": \"鍚堣偉鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"FYWL01\",\n" +
+ " \"item_name\": \"闈炵儫鐗╂枡01\",\n" +
+ " \"qty\": 1,\n" +
+ " \"supplier_code\": \"\",\n" +
+ " \"supplier_name\": \"\",\n" +
+ " \"owner_code\": \"\",\n" +
+ " \"owner_name\": \"\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028129664\",\n" +
+ " \"item_name\": \"榛勫北(澶ч粍灞�)\",\n" +
+ " \"qty\": 370,\n" +
+ " \"supplier_code\": \"01\",\n" +
+ " \"supplier_name\": \"铓屽煚鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028125970\",\n" +
+ " \"item_name\": \"榛勫北(寰藉晢鏂版蹇电粏鏀�)\",\n" +
+ " \"qty\": 6876,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode020\",\n" +
+ " \"item_name\": \"榛勫北绾㈡柟鍗扮粏鏀紙鑺滄箹锛塡",\n" +
+ " \"qty\": 3160,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"cailiao001\",\n" +
+ " \"item_name\": \"鏈烘鎵嬪拰鍒嗘嫞绾跨殑鏉愭枡\",\n" +
+ " \"qty\": 1,\n" +
+ " \"supplier_code\": \"07\",\n" +
+ " \"supplier_name\": \"閲嶅簡涓儫宸ヤ笟鏈夐檺璐ｄ换鍏徃\",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode008\",\n" +
+ " \"item_name\": \"鏂板埗鐨栵紙铓屽煚锛塡",\n" +
+ " \"qty\": 30,\n" +
+ " \"supplier_code\": \"01\",\n" +
+ " \"supplier_name\": \"铓屽煚鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode010\",\n" +
+ " \"item_name\": \"澶х孩鏂瑰嵃锛堟粊宸烇級\",\n" +
+ " \"qty\": 140,\n" +
+ " \"supplier_code\": \"05\",\n" +
+ " \"supplier_name\": \"婊佸窞鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028124966\",\n" +
+ " \"item_name\": \"榛勫北(灏忕孩鏂瑰嵃)\",\n" +
+ " \"qty\": 3466,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028126007\",\n" +
+ " \"item_name\": \"榛勫北(鏂颁竴鍝�)\",\n" +
+ " \"qty\": 14219,\n" +
+ " \"supplier_code\": \"05\",\n" +
+ " \"supplier_name\": \"婊佸窞鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode021\",\n" +
+ " \"item_name\": \"閮藉疂锛堟偁閰蜂腑鏀級鑺滄箹\",\n" +
+ " \"qty\": 175,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"cailiao002\",\n" +
+ " \"item_name\": \"鍒嗘嫞绾挎潗鏂橽",\n" +
+ " \"qty\": 2,\n" +
+ " \"supplier_code\": \"03\",\n" +
+ " \"supplier_name\": \"鍚堣偉鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"NoBarCode011\",\n" +
+ " \"item_name\": \"榛勫北灏忕孩鏂瑰嵃锛堣姕婀栵級\",\n" +
+ " \"qty\": 4060,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028124058\",\n" +
+ " \"item_name\": \"榛勫北(榛戦┈缁嗘敮)\",\n" +
+ " \"qty\": 201,\n" +
+ " \"supplier_code\": \"02\",\n" +
+ " \"supplier_name\": \"鑺滄箹鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"EmptyContainer\",\n" +
+ " \"item_name\": \"绌烘墭鐩樼粍\",\n" +
+ " \"qty\": 20561,\n" +
+ " \"supplier_code\": \"\",\n" +
+ " \"supplier_name\": \"\",\n" +
+ " \"owner_code\": \"\",\n" +
+ " \"owner_name\": \"\",\n" +
+ " \"package_type\": \"\",\n" +
+ " \"package_name\": \"\",\n" +
+ " \"itemType_code\": \"\",\n" +
+ " \"itemType_name\": \"\"\n" +
+ " },\n" +
+ " {\n" +
+ " \"item_code\": \"6901028223980\",\n" +
+ " \"item_name\": \"榛勫北(鍗拌薄涓�鍝�)\",\n" +
+ " \"qty\": 10,\n" +
+ " \"supplier_code\": \"04\",\n" +
+ " \"supplier_name\": \"闃滈槼鍗风儫鍘俓",\n" +
+ " \"owner_code\": \"20340001\",\n" +
+ " \"owner_name\": \"瀹夊窘涓儫宸ヤ笟鏈夐檺鍏徃\",\n" +
+ " \"package_type\": \"BoxType_Paper\",\n" +
+ " \"package_name\": \"绾哥\",\n" +
+ " \"itemType_code\": \"ItemStatus_Production\",\n" +
+ " \"itemType_name\": \"鎴愬搧绫籠"\n" +
+ " }\n" +
+ " ],\n" +
+ " \"success\": 1,\n" +
+ " \"msgDescr\": \"OK\"\n" +
+ " }\n" +
+ " ]\n" +
+ "}";
+
+ TypeReference< WmsBaseResponse<WmsInventoryDataResponse>> typeReference = new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){};
+ WmsBaseResponse<WmsInventoryDataResponse> response = JSONObject.parseObject(dd, typeReference.getType());
+
+ BoardStockListVO data = new BoardStockListVO();
+ double toatalNum = 1d;
+ BigDecimal num = new BigDecimal(0);
+ List<GeneralVO> list = new ArrayList<>();
+ try {
+ toatalNum =100000;
+ }catch (Exception e){
+ }
+ if(response!=null && response.getData()!=null && response.getData().size()>0){
+ List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
+ if(t!=null &&t.size()>0){
+ for(WmsInventoryJsonResponse j :t){
+ num = num.add (Constants.formatBigdecimal( j.getQty()));
+ GeneralVO d = new GeneralVO();
+ d.setNum(Constants.formatBigdecimal(j.getQty()));
+ d.setName(j.getItemName());
+ list.add(d);
+ }
+ }
+ }
+ data.setStockList(list);
+ data.setNum(num);
+ if(toatalNum<=0){
+ toatalNum =1;
+ }
+ data.setTotalNum(new BigDecimal(toatalNum));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_UP));
+
+ System.out.println(data.getNum());
+
+ }
+
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java
index b286b9a..c034604 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wms/model/response/WmsInventoryJsonResponse.java
@@ -1,5 +1,6 @@
package com.doumee.core.wms.model.response;
+import com.alibaba.fastjson.annotation.JSONField;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,29 +16,38 @@
@ApiModel("WMS鎺ュ彛澶勭悊杩斿洖data鍙傛暟")
public class WmsInventoryJsonResponse {
- @ApiModelProperty(value = "鏄惁鎺ユ敹鎴愬姛 1鎴愬姛 -1 澶辫触" ,example = "1")
- private String item_code;
- @ApiModelProperty(value = "娑堟伅鎻忚堪" ,example = "1")
- private String item_name;
- @ApiModelProperty(value = "qty" ,example = "1")
+ @ApiModelProperty(value = "item_code" )
+ @JSONField(name="item_code" )
+ private String itemCode;
+ @ApiModelProperty(value = "item_name" )
+ @JSONField(name="item_name" )
+ private String itemName;
+ @ApiModelProperty(value = "qty" )
+ @JSONField(name="qty" )
private BigDecimal qty;
- @ApiModelProperty(value = "supplier_code" ,example = "1")
- private String supplier_code;
- @ApiModelProperty(value = "g" ,example = "1")
- private String supplier_name;
- @ApiModelProperty(value = "owner_code" ,example = "1")
- private String owner_code;
- @ApiModelProperty(value = "owner_name" ,example = "1")
- private String owner_name;
- @ApiModelProperty(value = "package_type" ,example = "1")
- private String package_type;
- @ApiModelProperty(value = "package_name" ,example = "1")
- private String package_name;
- @ApiModelProperty(value = "itemType_code" ,example = "1")
- private String itemType_code;
- @ApiModelProperty(value = "ItemStatus_Production" ,example = "1")
- private String ItemStatus_Production;
- @ApiModelProperty(value = "itemType_name" ,example = "1")
- private String itemType_name;
+ @ApiModelProperty(value = "supplier_code" )
+ @JSONField(name="supplier_code" )
+ private String supplierCode;
+ @ApiModelProperty(value = "supplier_name" )
+ @JSONField(name="supplier_name" )
+ private String supplierName;
+ @ApiModelProperty(value = "owner_code" )
+ @JSONField(name="owner_code" )
+ private String ownerCode;
+ @ApiModelProperty(value = "owner_name" )
+ @JSONField(name="owner_name" )
+ private String ownerName;
+ @ApiModelProperty(value = "package_type" )
+ @JSONField(name="package_type" )
+ private String packageType;
+ @ApiModelProperty(value = "package_name" )
+ @JSONField(name="package_name" )
+ private String packageName;
+ @ApiModelProperty(value = "itemTypeCode" )
+ @JSONField(name="itemTypeCode" )
+ private String itemTypeCode;
+ @ApiModelProperty(value = "itemType_name" )
+ @JSONField(name="itemType_name" )
+ private String itemTypeName;
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
index e0c6a02..e7cd30e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/core/wx/wxPlat/WxPlatNotice.java
@@ -254,7 +254,7 @@
thing13.put("value",Constants.equalsInteger(hiddenDanger.getStatus(),Constants.ONE)?"闅愭偅宸叉暣鏀�":"闅愭偅宸查��鍥�");
//鎻愪氦浜�
Map<String, Object> thing10 = new HashMap<String,Object>();
- thing10.put("value",hiddenDanger.getCheckorName());
+ thing10.put("value",hiddenDanger.getMemberName());
//閫氱煡鏃堕棿
Map<String, Object> time16 = new HashMap<String,Object>();
time16.put("value", DateUtil.getFomartDate(hiddenDanger.getDealTime(),"yyyy骞碝M鏈坉d鏃� HH:mm:ss") );
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
index 5490709..55bdfcb 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/Visits.java
@@ -311,6 +311,10 @@
@TableField(exist = false)
private String createMemberName;
+ @ApiModelProperty(value = "鍒涘缓浜虹數璇�", example = "1")
+ @TableField(exist = false)
+ private String createMobile;
+
@ApiModelProperty(value = "瀹℃壒淇℃伅鏁版嵁")
@TableField(exist = false)
private ApproveDataVO approveDateVO;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
index 5434080..f358047 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/VisitDetailVO.java
@@ -46,8 +46,10 @@
@ApiModelProperty(value = "鎷滆鏃堕棿")
private String visitTime;
- @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵��")
+ @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵�佸��")
private String info;
+ @ApiModelProperty(value = "鏄剧ず閫氱煡鐘舵�� 1=寰呭鎵癸紱2=瀹℃壒閫氳繃锛�3=瀹℃壒鏈�氳繃锛�4=涓氬姟鍙栨秷")
+ private Integer infoStatus;
@ApiModelProperty(value = "闅忚浜哄憳淇℃伅")
private List<Visits> withVisitsList;
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java
index 69a3ac4..15f1ac3 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/BoardStockListVO.java
@@ -19,7 +19,6 @@
private List<GeneralVO> stockList;
@ApiModelProperty(value = "鍖哄煙搴撳瓨姹囨�婚泦鍚�")
private List<GeneralVO> areaTotalList;
-
@ApiModelProperty(value = "搴撳瓨宸插埄鐢�")
private BigDecimal num;
@ApiModelProperty(value = "搴撳瓨鍒╃敤鐜�")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
index ab50462..5f49ba5 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveParamServiceImpl.java
@@ -40,8 +40,6 @@
approveParamMapper.insert(approveParam);
return approveParam.getId();
}
-
-
/**
* 楠岃瘉鏁版嵁蹇呭～
* @param approveParam
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
index 26effca..9f5485e 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/HiddenDangerServiceImpl.java
@@ -210,7 +210,6 @@
hiddenDanger.setMemberName(systemUser.getRealname());
//鎻愪氦浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -222,10 +221,9 @@
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId())
.last(" limit 1 "));
+
//澶勭悊浜虹殑寰俊鍏紬鍙烽�氱煡
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
-
-
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
wxNoticeConfigMapper,hiddenDanger,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
@@ -605,6 +603,7 @@
if(Objects.isNull(hiddenDangerCate)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌闅愭偅绫诲瀷");
}
+ model.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setCategoryName(hiddenDangerCate.getName());
hiddenDanger.setEditor(hiddenDanger.getLoginUserInfo().getId());
hiddenDanger.setEditDate(new Date());
@@ -625,6 +624,7 @@
.eq(Notices::getObjId,hiddenDanger.getId())
.eq(Notices::getObjType,Constants.THREE)
.eq(Notices::getUserId,hiddenDanger.getLoginUserInfo().getMemberId())
+ .orderByDesc(Notices::getId)
.last(" limit 1 ")
);
if(Objects.nonNull(notices)){
@@ -651,6 +651,7 @@
return;
}
hiddenDanger.setMemberName(memberUser.getRealname());
+ model.setMemberName(memberUser.getRealname());
SystemUser checkUser = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
.eq(SystemUser::getDeleted, Constants.ZERO)
.eq(SystemUser::getMemberId,hiddenDanger.getCheckUserId()));
@@ -667,7 +668,7 @@
if(Objects.nonNull(checkUser)&&StringUtils.isNotBlank(checkUser.getOpenid())){
WxPlatNotice wxPlatNotice = new WxPlatNotice();
wxPlatNotice.sendHiddenDangerUploadTemplateNotice(systemDictDataBiz,
- wxNoticeConfigMapper,hiddenDanger,
+ wxNoticeConfigMapper,model,
WxPlatConstants.hiddenDangerContent.hiddenDangerUpload,
systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
Arrays.asList(checkUser.getOpenid().split(",")));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
index 9fb8713..4b577ff 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/SmsEmailServiceImpl.java
@@ -368,19 +368,24 @@
//寮�鍚煭淇￠�氱煡
if(Objects.nonNull(smsConfig) || Constants.equalsInteger(smsConfig.getStatus(),Constants.ZERO)){
String content = systemDictDataBiz.queryByCode(Constants.SMS,Constants.SMS_COMNAME).getCode() + smsConfig.getContent();
- Visits visits = visitsMapper.selectById(objId);
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
+ .selectAs(SystemUser::getMobile,Visits::getCreateMobile)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Visits::getMemberId)
+ .eq(Visits::getId,objId)
+ .last(" limit 1")
+ );
if(Objects.nonNull(visits)){
if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditSuccess)){
// 鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡缁忓鎵归�氳繃锛岃閫氱煡璁垮浜巤棰勭害鍏ュ洯寮�濮嬫椂闂磢鍚庝箻鍧恵杞︾墝鍙穧鍏ュ洯锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉銆�
content = content.replace("{棰勭害鍏ュ洯寮�濮嬫椂闂磢",DateUtil.getFomartDate(visits.getStarttime(),"yyyy-MM-dd HH:mm"))
.replace("{杞︾墝鍙穧",visits.getCarNos());
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingAuditFail)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡琚┏鍥烇紝椹冲洖鍘熷洜涓猴細{椹冲洖鍘熷洜}銆傚鏈夌枒闂紝璇疯仈绯诲鎵逛汉銆�
content = content.replace("{椹冲洖鍘熷洜}",msg);
sendBusinessSms(emayService,smsEmailMapper,
- Arrays.asList(visits.getPhone().split(",")),SmsConstants.visitReport,content,visits.getId());
+ Arrays.asList(visits.getCreateMobile().split(",")),SmsConstants.visitReport,content,visits.getId());
}else if(objCode.equals(SmsConstants.visitReportingContent.visitReportingTimeOutSignOut)){
//鎮ㄧ殑銆愯瀹㈡姤澶囥�戝凡浜巤棰勭害鍏ュ洯缁撴潫鏃堕棿}鍒版湡锛岃鍙婃椂绂诲満锛屽鏈夌枒闂紝璇疯仈绯昏璁夸汉
content = content.replace("{棰勭害鍏ュ洯缁撴潫鏃堕棿}",DateUtil.getFomartDate(visits.getEndtime(),"yyyy-MM-dd HH:mm"));
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index 9a097fd..2876618 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -1409,17 +1409,29 @@
memberId)
);
// }
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.waitCheck)||Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.submitCheck)){
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
+ .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .last(" limit 1 ")
+ );
+ visitDetailVO.setInfoStatus(1);
+ if(Objects.nonNull(notices)){
+ visitDetailVO.setInfo(notices.getInfo());
+ }else{
+ visitDetailVO.setInfo("鏆傛棤");
+ }
+ }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.noPass)){
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.noPass);
+ visitDetailVO.setInfo("瀹℃壒鏈�氳繃");
- Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda().eq(Notices::getObjId,visits.getId())
- .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
- .eq(Notices::getUserId,memberId)
- .eq(Notices::getSendacopy,Constants.ZERO)
- .last(" limit 1 ")
- );
- if(Objects.nonNull(notices)){
- notices.setInfo(notices.getInfo());
+ }else if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.cancel)){
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.cancel);
+ visitDetailVO.setInfo("宸插彇娑�");
}else{
- notices.setInfo("鏆傛棤");
+ visitDetailVO.setInfoStatus(Constants.VisitStatus.pass);
+ visitDetailVO.setInfo("瀹℃壒宸查�氳繃");
}
return visitDetailVO;
}
@@ -1797,7 +1809,7 @@
SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,
SmsConstants.visitContent.visitTimeOutSignOutNum,
- visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+ visitTimeCount.toString(),Arrays.asList(mobile.split(","))
);
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
index 34f2c0d..a026c36 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncNoticeServiceImpl.java
@@ -58,6 +58,19 @@
}
Constants.DEALING_HK_NOTICE_LIST =true;
try {
+ List<String> users = new ArrayList<>();
+ users.add(username);
+ List<Integer> userIds = new ArrayList<>();
+ List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .in(Member::getPhone,users)
+ .eq(Member::getType,Constants.TWO)
+ .eq(Member::getIsdeleted,Constants.ZERO));
+ Member tu= getFromUserList(username,userList);
+ if(tu!=null){
+ userIds.add(tu.getId());
+ }else{
+ throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鏃犳晥璐﹀彿~");
+ }
Date date = new Date();
List<GetTodoListResponse> allHkList = new ArrayList<>();
boolean hasNext = true;
@@ -88,16 +101,10 @@
}
curPage++;
}
- if(allHkList!=null && allHkList.size()>0){
- List<Notices> list = new ArrayList<>();
- List<String> users = new ArrayList<>();
- for(GetTodoListResponse data :allHkList){
- users.add(data.getUserId());
- }
- List<Integer> userIds = new ArrayList<>();
- List<Member > userList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
- .in(Member::getPhone,users)
- .eq(Member::getIsdeleted,Constants.ZERO));
+
+
+ if(allHkList!=null && allHkList.size()>0){
+ List<Notices> list = new ArrayList<>();
for(GetTodoListResponse data :allHkList){
Member u = getFromUserList(data.getUserId(),userList);
if(u==null){
@@ -132,14 +139,17 @@
notices.setType(Constants.noticesObjectType.hknotice);
list.add(notices);
}
- if(list.size()>0){
- //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
- noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
- .eq(Notices::getType, Constants.noticesObjectType.hknotice)
- .in(Notices::getUserId, userIds));
+ if(list.size()>0){
noticesJoinMapper.insert(list);//鎵归噺鎻掑叆璁板綍
}
}
+ if(userIds.size()>0){
+ //娓呯┖娴峰悍鍏ㄩ儴鐨勪唬鍔炴暟鎹�
+ noticesJoinMapper.delete(new UpdateWrapper<Notices>().lambda()
+ .eq(Notices::getType, Constants.noticesObjectType.hknotice)
+ .in(Notices::getUserId, userIds));
+ }
+
}catch (Exception e){
e.printStackTrace();
}finally {
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
index 58982cf..a4f79cd 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java
@@ -488,10 +488,12 @@
//濡傛灉鏄瀹㈢櫥璁帮紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
// retentionList.add(getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType()));
//鏉ヨ鏃堕棿
- inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1);
- updateVistis.setStatus(Constants.VisitStatus.signin);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
+ inoutDayCount.setSigninVisitorNum(Constants.formatIntegerNum(inoutDayCount.getSigninVisitorNum())+1);
+ updateVistis.setStatus(Constants.VisitStatus.signin);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+ updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ }
//鏇存柊鏈�鏂版潵璁挎椂闂�
Member member = new Member();
member.setLastVisitDate(updateVistis.getInDate());
@@ -499,12 +501,14 @@
memberMapper.updateById(member);
}else if (Constants.formatIntegerNum(request.getEventType()) == HKConstants.EventTypes.VISIT_SIGN_ICCM_OUT.getKey()) {
//濡傛灉鏄瀹㈢绂讳簨浠�
- inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
- updateVistis.setStatus(Constants.VisitStatus.signout);
- updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
- updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
- updateVistis.setOutType(Constants.ZERO);
- updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
+ if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.signin)){
+ inoutDayCount.setLeaveVisitorNum(Constants.formatIntegerNum(inoutDayCount.getLeaveVisitorNum())+1);
+ updateVistis.setStatus(Constants.VisitStatus.signout);
+ updateVistis.setInDate(DateUtil.getISO8601DateByStr(data.getBeginTime()));
+ updateVistis.setOutDate(DateUtil.getISO8601DateByStr(data.getFinishTime()));
+ updateVistis.setOutType(Constants.ZERO);
+ updateVistis.setOutInfo("璁垮姝ｅ父绛剧");
+ }
}else{
//濡傛灉浜哄憳淇℃伅瀛樺湪锛屽垏鏄瀹㈤�氳锛屽垯鍒犻櫎涔嬪墠鐨勬墍鏈夎繘鍦烘暟鎹紙鏃犺姝ゆ鎺ㄩ�佹槸杩涘巶杩樻槸鍑哄満鎺ㄩ�佷簨浠讹級
delRetentionLis.add(visits.getMemberId());
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
index afbc248..bc83623 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java
@@ -20,7 +20,7 @@
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.Utils;
import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wms.model.response.WmsInventoryJsonResponse;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
@@ -153,7 +153,7 @@
* @return
*/
@Override
- public BoardStockListVO stockList( ){
+ public BoardStockListVO stockList(){
BoardStockListVO data = new BoardStockListVO();
double toatalNum = 1d;
BigDecimal num = new BigDecimal(0);
@@ -161,9 +161,8 @@
try {
toatalNum =Double.parseDouble(systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_TOTAL_STOCK_NUM).getCode()) ;
}catch (Exception e){
-
}
- WmsBaseResponse<WmsInventoryDataResponse> response = wmsService.getInventoryList();
+ WmsBaseResponse<WmsBaseDataResponse> response = wmsService.getInventoryList();
if(response!=null && response.getData()!=null && response.getData().size()>0){
List<WmsInventoryJsonResponse> t= response.getData().get(0).getJson();
if(t!=null &&t.size()>0){
@@ -171,7 +170,7 @@
num = num.add (Constants.formatBigdecimal( j.getQty()));
GeneralVO d = new GeneralVO();
d.setNum(Constants.formatBigdecimal(j.getQty()));
- d.setName(j.getItem_name());
+ d.setName(j.getItemName());
list.add(d);
}
}
@@ -182,7 +181,7 @@
toatalNum =1;
}
data.setTotalNum(new BigDecimal(toatalNum));
- data.setUseRate(data.getTotalNum().divide(data.getNum(),2,BigDecimal.ROUND_UP));
+ data.setUseRate(Constants.formatBigdecimal(data.getNum()).divide(data.getTotalNum(),2,BigDecimal.ROUND_HALF_UP));
return data;
}
@@ -670,6 +669,7 @@
List<PlatformJob> dataList = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getCreateDate,PlatformJob::getCreateDate)
.selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
@@ -680,7 +680,7 @@
TransportMeasureVO data = new TransportMeasureVO();
data.setPlanDate(date);
data.setPlanTimes(0);
- data.setPlanTaskNum(new BigDecimal(random.nextInt(0)));
+ data.setPlanTaskNum(new BigDecimal( 0));
data.setFinishTaskNum(new BigDecimal(0));
for(PlatformJob job :dataList){
if(queryType == 2){
@@ -729,7 +729,11 @@
.selectAll(PlatformJob.class)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.eq(PlatformJob::getCarCodeFront,param.getCarCode())
- .in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
+ .in(PlatformJob::getStatus,
+ Constants.PlatformJobStatus.DONE.getKey(),
+ Constants.PlatformJobStatus.LEAVED.getKey(),
+ Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
+ Constants.PlatformJobStatus.CALLED.getKey())
.last("limit 1"));
if(job!=null){
List<PlatformLog> logList = platformLogMapper.selectJoinList(PlatformLog.class,
@@ -769,7 +773,7 @@
.orderByDesc(PlatformLog::getCreateDate));
if(detailList!=null){
for(PlatformWmsDetail d : detailList){
- if(!isNotExistIocode(d.getIocode(),data.getContractList())){
+ if(isExistIocode(d.getIocode(),data.getContractList())){
continue;
}
tt = new CarsContractVO();
@@ -804,7 +808,7 @@
return list;
}
- private boolean isNotExistIocode(String iocode, List<CarsContractVO> detailList) {
+ private boolean isExistIocode(String iocode, List<CarsContractVO> detailList) {
if(detailList!=null){
for(CarsContractVO d :detailList){
if(StringUtils.equals(d.getIoCode(),iocode)){
@@ -847,44 +851,50 @@
Date lastYear = DateUtil.addYearToDate(year,-1);//鍘诲勾
List<PlatformJob> monthNum = platformJobMapper.selectJoinList(PlatformJob.class,
- new MPJLambdaWrapper<PlatformJob>()
- .selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
-// .in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(month)+") and month(create_date) = month("+DateUtil.getPlusTime2(month)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(month)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(month)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(month)+"') "));
List<PlatformJob> monthLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getType,PlatformJob::getType)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastMonth)+") and month(create_date) = month("+DateUtil.getPlusTime2(lastMonth)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastMonth)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastMonth)+"') and month(done_date) = month('"+DateUtil.getPlusTime2(lastMonth)+"') and done_date<= '"
+ +DateUtil.getPlusTime2(lastMonth)+"'"));
List<PlatformJob> yearNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
- .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .selectAs(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getType,PlatformJob::getType)
+// .selectCount(PlatformJob::getPlatformId,PlatformJob::getCountum)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(year)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(year)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(year)+"') and done_date<= '"+DateUtil.getPlusTime2(year)+"'"));
List<PlatformJob> yearLastNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getId)
+ .select(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
-// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.in(PlatformJob::getType,Constants.ONE,Constants.THREE)
.in(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply("year(done_date) = year('"+DateUtil.getPlusTime2(lastYear)+"') and done_date<= '"+DateUtil.getPlusTime2(lastYear)+"'"));
data.setMonthOutTotal(getSumTotalByList(monthNum,0,null));//鏈湀鍑哄簱閲�
- data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湁鍑哄簱閲�
+ data.setMonthLastOutTotal(getSumTotalByList(monthLastNum,null,null) );//涓婃湀鍑哄簱閲�
data.setYearOutTotal(getSumTotalByList(yearNum,null,null) );//鏈勾鍑哄簱閲�
data.setYearLastOutTotal(getSumTotalByList(yearLastNum,null,null) );//鍘诲勾鍑哄簱閲�
data.setMonthOutTimes(monthNum!=null?monthNum.size():0);
@@ -900,19 +910,30 @@
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.DONE.getKey(),Constants.PlatformJobStatus.LEAVED.getKey(),Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),Constants.PlatformJobStatus.CALLED.getKey())
- .apply(" and to_days(create_date) <to_days(now())"));
+ .apply(" to_days(create_date) <to_days(now())"));
- //==========浠婂ぉ鍑哄叆搴撲换鍔�
- List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ //==========浠婂ぉ鍑哄叆搴撳畬鎴愰噺
+ List<PlatformJob> currentDoneNum = platformJobMapper.selectJoinList(PlatformJob.class,
new MPJLambdaWrapper<PlatformJob>()
.selectAs(PlatformJob::getId,PlatformJob::getId)
- .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
.eq(PlatformJob::getIsdeleted,Constants.ZERO)
.notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
- .apply("year(create_date) = year("+DateUtil.getPlusTime2(lastYear)+") and to_days(create_date)<= "+DateUtil.getPlusTime2(lastYear)));
+ .apply(" to_days(done_date) = to_days(now())"));
+ //==========浠婂ぉ涓嬪彂鍑哄叆搴撲换鍔�----
+ List<PlatformJob> currentNum = platformJobMapper.selectJoinList(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAs(PlatformJob::getId,PlatformJob::getId)
+ .selectAs(PlatformJob::getType,PlatformJob::getType)
+ .selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
+ .select(PlatformJob::getTotalNum,PlatformJob::getTotalNum)
+// .select("select sum(io_qty) from platform_wms_details a where a.isdeleted=0 and a.job_id=t.id",create_date)
+ .eq(PlatformJob::getIsdeleted,Constants.ZERO)
+ .notIn(PlatformJob::getStatus,Constants.PlatformJobStatus.CALLED.getKey())
+ .apply(" to_days(create_date) = to_days(now())"));
BigDecimal beforeOutNum = (getSumTotalByList(beforeJobNum,0,null));//浠婂ぉ涔嬪墠鏈畬鎴愬嚭搴撲换鍔�
BigDecimal currentOutNum = (getSumTotalByList(currentNum,0,null));//浠婂ぉ涓嬪彂鍑哄簱浠诲姟
@@ -920,12 +941,12 @@
BigDecimal currentInNum = (getSumTotalByList(currentNum,1,null));//浠婂ぉ涓嬪彂鍏ュ簱浠诲姟
data.setCurrentInNum(beforeInNum.add(currentInNum));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
data.setCurrentOutNum(beforeOutNum.add(currentOutNum));//褰撳墠鍑哄簱鎬讳换鍔℃垚閲�
- data.setCurrentInDoneNum(getSumTotalByList(currentNum,0,1));//浠婃棩瀹屾垚閲�
- data.setCurrentOutDoneNum(getSumTotalByList(currentNum,1,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentInDoneNum(getSumTotalByList(currentDoneNum,1,1));//浠婃棩瀹屾垚閲�
+ data.setCurrentOutDoneNum(getSumTotalByList(currentDoneNum,0,1));//浠婃棩瀹屾垚閲�
//------------浠婃棩鍑哄叆搴撴晥鐜�----------------
- BigDecimal outHours = getTotalDoneTimes(currentNum,0);//
- BigDecimal inHours = getTotalDoneTimes(currentNum,1);//
+ BigDecimal outHours = getTotalDoneTimes(currentDoneNum,0);//
+ BigDecimal inHours = getTotalDoneTimes(currentDoneNum,1);//
if(outHours.compareTo(new BigDecimal(0))>0){
data.setTodayOutRate(data.getCurrentOutDoneNum().divide(outHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
@@ -933,15 +954,15 @@
data.setTodayInRate(data.getCurrentInDoneNum().divide(inHours,2));//褰撳墠鍏ュ簱鎬讳换鍔℃垚閲�
}
//------------鏈湀鍑哄叆搴撴晥鐜�----------------
- BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
+// BigDecimal outMonthNum = getSumTotalByList(monthNum,0,null).add(data.getCurrentOutDoneNum());
BigDecimal inMonthNum = getSumTotalByList(monthNum,1,null).add(data.getCurrentInDoneNum());
- BigDecimal outYearHours = getTotalDoneTimes(yearNum,0).add(outHours);//
- BigDecimal inYearHours = getTotalDoneTimes(yearNum,1).add(inHours);//
- if(outYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthOutRate(outMonthNum.divide(outYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ BigDecimal outMonthHours = getTotalDoneTimes(monthNum,0).add(outHours);//
+ BigDecimal inMonthHours = getTotalDoneTimes(monthNum,1).add(inHours);//
+ if(outMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthOutRate(data.getMonthOutTotal().divide(outMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
- if(inYearHours.compareTo(new BigDecimal(0))>0){
- data.setMonthInRate(inMonthNum.divide(inYearHours,2));//鏈湀鍏ュ簱鏁堢巼
+ if(inMonthHours.compareTo(new BigDecimal(0))>0){
+ data.setMonthInRate(inMonthNum.divide(inMonthHours,0,BigDecimal.ROUND_HALF_UP));//鏈湀鍏ュ簱鏁堢巼
}
return data;
}
@@ -1015,12 +1036,20 @@
// if(Constants.formatBigdecimal(job.getIoQty()).compareTo(new BigDecimal(0)) >0){
// r.add( job.getIoQty());
// }else{
- r.add(Constants.formatBigdecimal(job.getTotalNum()));
+ r = r.add(Constants.formatBigdecimal(job.getTotalNum()));
// }
}
return Constants.formatBigdecimal0Float(r);
}
+ @Override
+ public List<CarsAlarmResultListResponse> carsEventList(){
+
+ if(HKCarOpenService.HK_CARS_LIST == null){
+ HKCarOpenService.HK_CARS_LIST = HKCarOpenService.getAllCarsDetais();
+ }
+ return HKCarOpenService.getAlarmEvemtList( HKCarOpenService.HK_CARS_LIST,new Date());
+ }
@Override
public BoardCarsListVO platformJobCarsList(){
BoardCarsListVO data = new BoardCarsListVO();
@@ -1057,7 +1086,8 @@
.groupBy(PlatformJob::getCarCodeFront));
data.setBusyNum( busyNum!=null ?busyNum.size():0);//鍦ㄩ�旀湁浠诲姟鏁伴噺
data.setIdleNum(codes.size() -data.getBusyNum());//鏃犱换鍔＄┖闂叉暟閲�
- data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
+ HKCarOpenService.HK_CARS_LIST = detaisResponses;
+// data.setEventList(HKCarOpenService.getAlarmEvemtList(detaisResponses,new Date()));
if(busyNum != null){
FLAG: for(CarsDeviceDetaisResponse model:detaisResponses){
for(PlatformJob job : busyNum){
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
index 7772152..f0f2918 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/TmsServiceImpl.java
@@ -9,6 +9,7 @@
import com.doumee.core.tms.model.request.*;
import com.doumee.core.tms.model.response.*;
import com.doumee.core.utils.Constants;
+import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.HttpsUtil;
import com.doumee.core.wms.model.request.*;
import com.doumee.core.wms.model.response.WmsBaseDataResponse;
@@ -154,7 +155,9 @@
}
}
}
-
+ Collections.sort(list, (o1, o2) -> {
+ return o2.getKey() - o1.getKey(); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -169,19 +172,26 @@
for(TmsCircleStatusListResponse status :data){
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FOUR)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.clqdapp.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),Constants.FIVE)
&& Constants.equalsInteger(status.getType(),TMSContants.StatusCode.app)) {
- status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getKey());
+ status.setOrderStatus(TMSContants.ChildStatusLevel.ddzhd.getOrderStatus());
}
if(Constants.equalsInteger(status.getOrderStatus(),t )){
status.setOrderStatusDes(TMSContants.ChildStatusLevel.getInfo(status.getOrderStatus(),null));
list.add(status);
}
+ Date td =DateUtil.fromStringToDate("yyy-MM-dd HH:mm:ss",status.getRecordDate());
+ if(td!=null){
+ status.setTimeStamp(td.getTime());
+ }
}
}
}
+ Collections.sort(list, (o1, o2) -> {
+ return (int) (o2.getTimeStamp() - o1.getTimeStamp()); //鎸夋暟閲忎粠澶у埌灏忔帓搴�
+ });
return list;
}
@@ -192,21 +202,36 @@
* @return TmsBaseResponse
*/
@Override
- public List<TmsOrderListResponse> orderList(TmsOrderListRequest param){
- if(StringUtils.isBlank(param.getPhoneNumber())){
- param.setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
+ public TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param){
+ if(param == null){
+ param = new TmsOrderListRequest();
+ }
+ if(param.getParameters() == null){
+ param.setParameters( new TmsOrderListParamRequest());
+ }
+ if(param.getPager() == null){
+ param.setPager( new TmsOrderListPagerRequest());
+ }
+ if(param.getPager().getPage() == null){
+ param.getPager().setPage(1);
+ }
+ if(param.getPager().getRows() == null){
+ param.getPager().setRows(10);
+ }
+ if(StringUtils.isBlank(param.getParameters().getPhoneNumber())){
+ param.getParameters().setPhoneNumber("00000000000");//鎵嬫満鍙峰繀濉�
}
- if(param.getContractNumbers()==null || param.getContractNumbers().size()==0){
- param.setContractNumbers(null);
+ if(param.getParameters().getContractNumbers()==null || param.getParameters().getContractNumbers().size()==0){
+ param.getParameters().setContractNumbers(null);
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderList[0];
- TmsBaseResponse<List<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
- ,new TypeReference< TmsBaseResponse<List<TmsOrderListResponse>>>(){});
+ TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderList[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsBasePageResponse<TmsOrderListResponse>>>(){});
if(response ==null){
- return new ArrayList<>();
+ return new TmsBasePageResponse<>();
}else{
- return response.getData()==null?new ArrayList<>():response.getData();
+ return response.getData()==null?new TmsBasePageResponse<>():response.getData();
}
}
/**
@@ -222,7 +247,7 @@
}
String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+TMSContants.InterfacePath.getOrderDetailByContractNumber[0];
- TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],JSONObject.toJSONString(param)
+ TmsBaseResponse<TmsOrderInfoResponse> response = sendHttpRequest(url,TMSContants.InterfacePath.getOrderDetailByContractNumber[1],param.getContractNumber()
,new TypeReference< TmsBaseResponse<TmsOrderInfoResponse>>(){});
if(response!=null && response.getData()!=null){
result =response.getData();
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
index 17f07a1..9301a87 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/WmsServiceImpl.java
@@ -11,7 +11,7 @@
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.core.wms.model.response.WmsInventoryDataResponse;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
@@ -145,10 +145,10 @@
* @return
*/
@Override
- public WmsBaseResponse<WmsInventoryDataResponse> getInventoryList(){
+ public WmsBaseResponse<WmsBaseDataResponse> getInventoryList(){
String url = systemDictDataBiz.queryByCode(Constants.WMS_PARAM,Constants.WMS_GET_INVENTORYLIST_URL).getCode() ;
String name = "銆怶MS銆戝簱瀛樻煡璇�" ;
- WmsBaseResponse<WmsInventoryDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsInventoryDataResponse>>(){});
+ WmsBaseResponse<WmsBaseDataResponse> response = sendHttpRequest(url,name,JSONObject.toJSONString(new JSONObject()),new TypeReference< WmsBaseResponse<WmsBaseDataResponse>>(){});
if(response!=null
&& response.getData() !=null
&& response.getData().size()>0
@@ -214,6 +214,7 @@
return result;
}catch (Exception e){
success = 1;
+ e.printStackTrace();
log.error("銆�"+name+"銆�================澶辫触===="+ JSONObject.toJSONString(param));
}finally {
saveInterfaceLog(url,name,param,success,res,Constants.ZERO);
@@ -344,8 +345,6 @@
}
}
}
-
-
}
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
index d024f45..c7f9572 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java
@@ -1,5 +1,6 @@
package com.doumee.service.business.third;
+import com.doumee.core.haikang.model.cars.response.CarsAlarmResultListResponse;
import com.doumee.core.haikang.model.param.respose.PageFireChannelInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageRegionInfoResponse;
import com.doumee.core.haikang.model.param.respose.PageSensorStatusResponse;
@@ -89,4 +90,6 @@
BoardStockListVO stockList();
List<GeneralVO> todayTotalInList();
+
+ List<CarsAlarmResultListResponse> carsEventList();
}
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
index ee29b17..96842a4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -34,7 +34,7 @@
* @param param 鍙傛暟
* @return TmsBaseResponse
*/
- List<TmsOrderListResponse> orderList(TmsOrderListRequest param);
+ TmsBasePageResponse<TmsOrderListResponse> orderList(TmsOrderListRequest param);
List<TmsGisListResponse> gisList(TmsGisListRequest param);
List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
/**
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
index ee20ede..9a95c05 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/WmsService.java
@@ -5,7 +5,7 @@
import com.doumee.core.wms.model.request.WmsInboundNoticeRequest;
import com.doumee.core.wms.model.request.WmsOutboundNoticeRequest;
import com.doumee.core.wms.model.response.WmsBaseResponse;
-import com.doumee.core.wms.model.response.WmsInventoryDataResponse;
+import com.doumee.core.wms.model.response.WmsBaseDataResponse;
import com.doumee.dao.business.model.PlatformJob;
import java.util.List;
@@ -22,7 +22,7 @@
* @return WmsBaseResponse
*/
WmsBaseResponse orderPlatformBind(PlatformJob job);
- WmsBaseResponse<WmsInventoryDataResponse> getInventoryList();
+ WmsBaseResponse<WmsBaseDataResponse> getInventoryList();
void saveInterfaceLog(String url,String name,String param,Integer success,String respone,int type);
/**
* 鍏ュ簱鍗曟壒閲忛�氱煡
--
Gitblit v1.9.3