From 451d1783bc66b1ec1625f707d8d56df04ffe45a5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 09 五月 2025 16:42:36 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java | 8 +-
server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java | 16 +++++
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPushServiceImpl.java | 7 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 76 ++++++++++++++++++++----
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java | 12 +++
server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java | 3
admin/src/views/business/retention.vue | 6 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/third/BoardService.java | 1
server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java | 1
server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGetOutCapabilityResponse.java | 46 +++++++++++++++
10 files changed, 150 insertions(+), 26 deletions(-)
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index b0d72f8..3d4f9d6 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -10,9 +10,9 @@
<el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
</el-form-item>
<el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
- <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮" value="0"></el-option>
- <el-option label="鐩搁暱鏈熷叧鏂�" value="1"></el-option>
+ <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="1"></el-option>
+ <el-option label="鐩搁暱鏈熷叧鏂�" value="4"></el-option>
<el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
<el-option label="璐ц繍鍙告満" value="5"></el-option>
</el-select>
diff --git a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
index a80b1c6..9c192ae 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/impl/third/TmsServiceImpl.java
@@ -313,6 +313,22 @@
return response.getData();
}
/**
+ * 鍑哄簱鑳藉姏姹囨�绘帴鍙�
+ * @param param 鍙傛暟
+ * @return TmsBaseResponse
+ */
+ @Override
+ public TmsGetOutCapabilityResponse getOutCapacity(TmsFacrotyCodeListRequest param){
+ String url = systemDictDataBiz.queryByCode(Constants.TSM_PARAM,Constants.TMS_INTERFACE_URL_PREFIX).getCode()
+ +TMSContants.InterfacePath.getOutCapacity[0];
+ TmsBaseResponse<TmsGetOutCapabilityResponse > response = sendHttpRequest(url,TMSContants.InterfacePath.getOutboundCapability[1],JSONObject.toJSONString(param)
+ ,new TypeReference< TmsBaseResponse<TmsGetOutCapabilityResponse>>(){});
+ if(response ==null || response.getData() == null){
+ return new TmsGetOutCapabilityResponse();
+ }
+ return response.getData();
+ }
+ /**
* 鍚堝悓鍒楄〃鎺ュ彛
* 鏍规嵁鍖哄煙ID闆嗗悎+绛涢�夋潯浠讹紙鍚堝悓鍙枫�佸埗鍗曞紑濮嬫棩鏈熴�佸埗鍗曠粨鏉熸棩鏈熴�佸彂璐у湴銆佸埌璐у湴銆佺渷浠斤紝闈為渶瑕侊級锛岃繑鍥炲悎鍚屽垪琛ㄤ俊鎭紝鎸夌収鏃堕棿鍊掑簭灞曠ず锛�
* @param param 鍙傛暟
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java b/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
index 32b37d0..ab12095 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/TmsService.java
@@ -35,6 +35,7 @@
TmsBasePageResponse<TmsOrderNoFinishListResponse> getNotFinishOrderList(TmsOrderNoFinishListRequest param);
TmsOutboundCapabilityResponse getOutboundCapability(TmsFacrotyCodeListRequest param);
List<TmsCircleStatusResultListResponse> getCicleStatusList(TmsCircleStatusListRequest param);
+ TmsGetOutCapabilityResponse getOutCapacity(TmsFacrotyCodeListRequest param);
/**
* 鍚堝悓璇︽儏鎺ュ彛
* @param param 鍙傛暟
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
index 171657c..182391e 100644
--- a/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/TMSContants.java
@@ -28,7 +28,8 @@
String[] getInboundOutbound = new String[]{"/tms/zhyt/getInboundOutbound", "銆怲MS銆戝嚭鍏ュ簱璁板綍鏌ヨ"};//TMS鍑哄叆搴撹褰曟煡璇㈡帴鍙ｅ湴鍧�
String[] getIntransitDetails = new String[]{"/tms/zhyt/getIntransitDetails", "銆怲MS銆戝湪閫旀槑缁嗗垪琛�"};//TMS鍦ㄩ�旀槑缁嗗垪琛ㄦ帴鍙ｅ湴鍧�
String[] getSevenArrivalStatus = new String[]{"/tms/zhyt/getSevenArrivalStatus", "銆怲MS銆戣繎7鏃ュ埌璐ф儏鍐�"};//TMS杩�7鏃ュ埌璐ф儏鍐垫帴鍙ｅ湴鍧�
- String[] getCurrentTransportationTask = new String[]{ "銆怲MS銆�/zhyt/getCurrentTransportationTask", "銆怲MS銆戝綋鍓嶈繍杈撲换鍔�"};//TMS褰撳墠杩愯緭浠诲姟鎺ュ彛鍦板潃
+ String[] getCurrentTransportationTask = new String[]{ "/tms/zhyt/getCurrentTransportationTask", "銆怲MS銆戝綋鍓嶈繍杈撲换鍔�"};//TMS褰撳墠杩愯緭浠诲姟鎺ュ彛鍦板潃
+ String[] getOutCapacity = new String[]{ "/tms/zhyt/getOutCapacity", "銆怲MS銆戝嚭搴撹兘鍔涙眹鎬绘帴鍙�"};//3.20TMS鍑哄簱鑳藉姏姹囨�绘帴鍙ｆ帴鍙ｅ湴鍧�
}
public enum TopStatusLevel {
diff --git a/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGetOutCapabilityResponse.java b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGetOutCapabilityResponse.java
new file mode 100644
index 0000000..0e3a3a1
--- /dev/null
+++ b/server/system_service/src/main/java/com/doumee/service/business/third/model/response/TmsGetOutCapabilityResponse.java
@@ -0,0 +1,46 @@
+package com.doumee.service.business.third.model.response;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+/**
+ * @author 姹熻箘韫�
+ * @date 2023/11/23 14:03
+ */
+@Data
+@ApiModel("tms鍑哄簱鑳藉姏姹囨�昏繑鍥炲弬鏁�")
+public class TmsGetOutCapabilityResponse {
+ /**
+ * {
+ "code":0,
+ "data":{
+ "currentOrderNum":0, 褰撳墠璁㈠崟閲�
+ "currentTransportNum":0, 褰撳墠浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+ "currentNotTransportNum":0, 褰撳墠浠诲姟閲�-鏃犻渶璋冨害
+ "currentTransportVehicleNum":0, 褰撳墠浠诲姟閲忚溅娆�-宸查厤杞芥湭鍑哄簱
+ "currentOutNum":0, 浠婃棩鍑哄簱閲�
+ "currentOutVehicleNum":0, 浠婃棩鍑哄彛閲忚溅娆�
+ },
+ "message":"鎿嶄綔鎴愬姛"
+ }
+ */
+
+ @ApiModelProperty(value = "褰撳墠璁㈠崟閲�" )
+ private BigDecimal currentOrderNum;// 褰撴棩璁㈠崟閲�
+ @ApiModelProperty(value = "褰撳墠浠诲姟閲�-宸查厤杞芥湭鍑哄簱" )
+ private BigDecimal currentTransportNum;// 褰撳墠浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+ @ApiModelProperty(value = "褰撳墠浠诲姟閲�-鏃犻渶璋冨害" )
+ private BigDecimal currentNotTransportNum;// 褰撴棩璁㈠崟閲�
+ @ApiModelProperty(value = "褰撳墠浠诲姟閲忚溅娆�-宸查厤杞芥湭鍑哄簱" )
+ private BigDecimal currentTransportVehicleNum;// 褰撳墠浠诲姟閲忚溅娆�-宸查厤杞芥湭鍑哄簱
+ @ApiModelProperty(value = "浠婃棩鍑哄簱閲�" )
+ private BigDecimal currentOutNum;// 浠婃棩鍑哄簱閲�
+ @ApiModelProperty(value = "浠婃棩鍑哄彛閲忚溅娆�" )
+ private BigDecimal currentOutVehicleNum;// 浠婃棩鍑哄彛閲忚溅娆�
+
+
+}
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
index 7cbca10..50bb40f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/board/WholeProvinceController.java
@@ -38,7 +38,7 @@
@Autowired
private BoardService boardService;
@LoginNoRequired
- @ApiOperation("涓績鏁版嵁")
+ @ApiOperation("涓績鏁版嵁锛堝簾寮冿級")
@GetMapping("/centerData")
@ApiImplicitParams({
@ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
@@ -47,6 +47,16 @@
WholeProvinceBoardVO data = boardService.centerProvinceData( factoryCode);
return ApiResponse.success(data);
}
+ @LoginNoRequired
+ @ApiOperation("涓績鏁版嵁锛堟洿鏂扮増鏈級")
+ @GetMapping("/centerDataNew")
+ @ApiImplicitParams({
+ @ApiImplicitParam(paramType = "query", dataType = "String", name = "factoryCode", value = "鏌ヨ绫诲瀷鍘傚尯缂栫爜", required = false)
+ })
+ public ApiResponse<WholeProvinceBoardVO> centerDataNew(@RequestParam(required = false) String factoryCode) {
+ WholeProvinceBoardVO data = boardService.centerProvinceDataNew( factoryCode);
+ return ApiResponse.success(data);
+ }
@LoginNoRequired
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
index 962850e..2b2afa4 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/web/response/platformReport/WholeProvinceBoardVO.java
@@ -17,11 +17,11 @@
@ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鏃ヨ鍗曢噷")
private BigDecimal currentOrderNum;
- @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鏃ヨ鍒掗噺")
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鏃ヨ鍒掗噺锛堝悓鍩庡叡搴撲换鍔￠噺+杩愯緭浠诲姟閲忥級")
private BigDecimal currentPlanNum;
- @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戞棤闇�閰嶈浇鐨勪换鍔￠噺")
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戞棤闇�閰嶈浇鐨勪换鍔￠噺(鍚屽煄鍏卞簱浠诲姟閲�)")
private BigDecimal noNeedTransportOrderNum;
- @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戦渶閰嶈浇鐨勪换鍔￠噺")
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戦渶閰嶈浇鐨勪换鍔￠噺锛堣繍杈撲换鍔￠噺锛�")
private BigDecimal needTransportOrderNum;
@ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝綋鍓嶄换鍔¤溅娆�")
private int currentPlanCarNum;
@@ -31,7 +31,7 @@
@ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戜粖鏃ュ嚭搴撹溅娆￠噺")
private int crrentOutCarNum;
- @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝墿浣欎换鍔￠噺")
+ @ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝墿浣欎换鍔￠噺锛堝悓褰撴棩璁″垝閲忥級")
private BigDecimal crrentRestNum;
@ApiModelProperty(value = "銆愬嚭搴撹兘鍔涖�戝墿浣欎换鍔¤溅娆￠噺")
private int crrentRestCarNum;
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 4e7d5c0..154ab24 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
@@ -583,8 +583,9 @@
record.setDeviceName((request.getData()!=null &&request.getData().getParamValues()!=null)?
request.getData().getParamValues().getSrcName():request.getSrcName());
//濡傛灉鏄瀹㈤�氳
- if(request.getData()!=null&&request.getData().getParamValues()!=null &&
- StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
+ if(request.getData()!=null
+ &&request.getData().getParamValues()!=null
+ &&StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
//濡傛灉鏄瀹㈣繘鍏ワ紝褰曞叆浜哄憳鐨勫湪鍦烘暟鎹褰�
Retention r = getRetentionModelByVisitRequest(visits, request.getHappenTime(),request.getSrcType());
r.setCarNo(request.getData().getParamValues().getPlateNos());
@@ -598,7 +599,7 @@
if(request.getData()!=null&&request.getData().getParamValues()!=null &&
!StringUtils.equals(request.getData().getParamValues().getInOrOut(),"0")){
inoutDayCount.setOutVisitorNum(Constants.formatIntegerNum(inoutDayCount.getOutVisitorNum())+1);
- record.setInOrOut(Constants.ONE);
+ record.setInOrOut(Constants.ONE);//绂诲洯
}
if( request.getData().getParamValues()!=null
&& StringUtils.isNotBlank(request.getData().getParamValues().getPlateNos())
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 126b630..eb2fe8c 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
@@ -2507,6 +2507,36 @@
*/
@Override
public WholeProvinceBoardVO centerProvinceData(String factoryCode){
+ WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);
+ /* Date date = new Date();
+ TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
+ param.setDateEnd(DateUtil.getShortTime(date));
+ param.setDateStart(DateUtil.getShortTime(date));
+ if(StringUtils.isNotBlank(code)){
+ param.setFacrotyCodeList(new ArrayList<>());
+ param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+ }
+ List<TmsOutQtyAndVehicleQtyResponse> listSame= tmsService.getOutQtyAndVehicleQty(param);
+ if(listSame!=null ){
+ for(TmsOutQtyAndVehicleQtyResponse model : listSame){
+ data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getTotalOutQty())));//浠婃棩鍑哄簱閲�
+ data.setCrrentOutCarNum(data.getCrrentOutCarNum()+(Constants.formatIntegerNum(model.getVehicleQty())));//浠婃棩鍑哄簱杞︽
+ }
+ }*/
+ initOutboundCapability(data,factoryCode);
+ return data;
+
+ }
+ @Override
+ public WholeProvinceBoardVO centerProvinceDataNew(String factoryCode){
+ WholeProvinceBoardVO data = initWholeProvinceBoardVOData(factoryCode);
+
+ initOutboundCapabilityNew(data,factoryCode);
+ return data;
+
+ }
+
+ private WholeProvinceBoardVO initWholeProvinceBoardVOData(String factoryCode) {
WholeProvinceBoardVO data = new WholeProvinceBoardVO();
data.setMaxAbility(new BigDecimal(0));
data.setHoursAbility(new BigDecimal(0));
@@ -2535,24 +2565,42 @@
}
}
}
- /* Date date = new Date();
- TmsOutQtyAndVehicleQtyRequest param = new TmsOutQtyAndVehicleQtyRequest();
- param.setDateEnd(DateUtil.getShortTime(date));
- param.setDateStart(DateUtil.getShortTime(date));
+ return data;
+ }
+
+ private void initOutboundCapabilityNew(WholeProvinceBoardVO data, String code) {
+ TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
if(StringUtils.isNotBlank(code)){
param.setFacrotyCodeList(new ArrayList<>());
- param.getFacrotyCodeList().add(code);//鏌ヨ鎸囧畾鍘傚尯
+ param.getFacrotyCodeList().add(code);
}
- List<TmsOutQtyAndVehicleQtyResponse> listSame= tmsService.getOutQtyAndVehicleQty(param);
- if(listSame!=null ){
- for(TmsOutQtyAndVehicleQtyResponse model : listSame){
- data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getTotalOutQty())));//浠婃棩鍑哄簱閲�
- data.setCrrentOutCarNum(data.getCrrentOutCarNum()+(Constants.formatIntegerNum(model.getVehicleQty())));//浠婃棩鍑哄簱杞︽
- }
- }*/
- initOutboundCapability(data,factoryCode);
- return data;
+ TmsGetOutCapabilityResponse result= tmsService.getOutCapacity(param);
+ if(result !=null){
+ data.setCrrentOutNum(Constants.formatBigdecimal(result.getCurrentOutNum()) );//浠婃棩鍑哄簱閲�
+ data.setNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//褰撳墠浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+ data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(result.getCurrentNotTransportNum()) );//褰撳墠浠诲姟閲�-鏃犻渶璋冨害
+ data.setCrrentRestNum(Constants.formatBigdecimal(result.getCurrentTransportNum()));//鍓╀綑浠诲姟閲�-宸查厤杞芥湭鍑哄簱
+ data.setCurrentOrderNum(Constants.formatBigdecimal(result.getCurrentOrderNum()) );//褰撳墠璁㈠崟閲�
+ data.setCurrentPlanCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//褰撳墠浠诲姟杞︽
+ data.setCrrentRestCarNum(Constants.formatBigdecimal(result.getCurrentTransportVehicleNum()).intValue() );//鍓╀綑浠诲姟杞︽閲�
+ data.setCrrentOutCarNum(Constants.formatBigdecimal(result.getCurrentOutVehicleNum()).intValue());//浠婃棩鍑哄簱杞︽
+ //褰撳墠浠诲姟閲忓拰鍓╀綑浠诲姟閲忥紝涓猴紙鏃犻渶閰嶈浇+闇�瑕侀厤杞界殑浠诲姟閲忎箣鍜岋級
+ data.setCurrentPlanNum(data.getNeedTransportOrderNum().add(data.getNoNeedTransportOrderNum()));//褰撳墠浠诲姟閲�
+ data.setCrrentRestNum(data.getCurrentPlanNum());//褰撳墠浠诲姟閲�
+
+ }
+ //澶勭悊鍗曚綅鎴愨�滅鈥濓紝涓�绠�=5涓囨敮
+ if(Constants.UNIT_TYPE == 1) {
+ data.setMaxAbility(Constants.formatBigdecimal(data.getMaxAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setHoursAbility(Constants.formatBigdecimal(data.getHoursAbility()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCrrentRestNum(Constants.formatBigdecimal(data.getCrrentRestNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCurrentPlanNum(Constants.formatBigdecimal(data.getCurrentPlanNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCrrentOutNum(Constants.formatBigdecimal(data.getCrrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setCurrentOrderNum(Constants.formatBigdecimal(data.getCurrentOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setNoNeedTransportOrderNum(Constants.formatBigdecimal(data.getNoNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ data.setNeedTransportOrderNum(Constants.formatBigdecimal(data.getNeedTransportOrderNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
+ }
}
private void initOutboundCapability(WholeProvinceBoardVO data, String code) {
TmsFacrotyCodeListRequest param = new TmsFacrotyCodeListRequest();
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 3a985c5..e0da371 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
@@ -109,6 +109,7 @@
TotalOutQtyNumVO totalOutQtyNum(int queryType,String factoryId);
WholeProvinceBoardVO centerProvinceData(String factoryId);
+ WholeProvinceBoardVO centerProvinceDataNew(String factoryCode);
List<LastSevenDaysOrderVo> arriveGoodsList(String factoryid);
--
Gitblit v1.9.3