From 74812b1bee02f9042e9586c7d81da5fd227fdd79 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 25 十二月 2024 17:05:53 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
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 a4a0975..33d49b2 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
@@ -1109,10 +1109,11 @@
//濡傛灉鏄湪绾挎垨鑰呬紤鐪狅紝鏌ヨ鍦ㄩ�旇繕鏄┖闂瞭y
codes.add(model.getPlateNum());
model.setJobStatus(Constants.ZERO);
- }else
+ }else{
model.setJobStatus(Constants.TWO);
data.setOfflineNum(data.getOfflineNum()+1);
}
+ }
if(codes.size()>0){
//鐘舵�� 0寰呯‘璁� 1寰呯鍒� 2绛夊緟鍙彿 3鍏ュ洯绛夊緟 4宸插彨鍙� 5浣滀笟涓� 6浣滀笟瀹屾垚 7杞Щ涓� 8寮傚父鎸傝捣 9宸叉巿鏉冪鍥� 10宸茬鍥� 11 宸茶繃鍙� 12鍙栨秷锛圵MS锛�
List<PlatformJob> busyNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>() .lambda()
@@ -2148,8 +2149,8 @@
for(TmsFactoryParam param : paramList){
if(StringUtils.isNotBlank(factoryCode)){
if(StringUtils.equals(param.getCode(),factoryCode)){
- data.setHoursAbility(data.getHoursAbility().add(Constants.formatBigdecimal(param.getParam3())));
- data.setMaxAbility(data.getMaxAbility().add(Constants.formatBigdecimal(param.getNum2())));
+ data.setHoursAbility(Constants.formatBigdecimal(param.getParam3()));
+ data.setMaxAbility(Constants.formatBigdecimal(param.getNum2()));
code = param.getCode();
break;
}
@@ -2175,7 +2176,6 @@
}
}*/
initOutboundCapability(data,factoryCode);
-
return data;
}
@@ -2236,7 +2236,6 @@
}
}
if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){
-
for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
/**
* out_date涓虹┖锛宻um(NC_TOTALITY) 鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔�
@@ -2371,8 +2370,8 @@
tt =new WholeProvinceMapVO();
tt.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
tt.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
- tt.setProvinceCode(model.getFromProvinceCode());
- tt.setProvinceName(model.getFromProvinceName());
+ tt.setProvinceCode(model.getToProvinceCode());
+ tt.setProvinceName(model.getToProvinceName());
result.add(tt);
}
}
@@ -2382,7 +2381,7 @@
private WholeProvinceMapVO getFromProvinceResultList(TmsDistributionOfDeliveryLocResponse model, List<WholeProvinceMapVO> result) {
for(WholeProvinceMapVO t : result){
- if(StringUtils.equals(t.getProvinceCode(), model.getFromProvinceCode())){
+ if(StringUtils.equals(t.getProvinceCode(), model.getToProvinceCode())){
t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).add(Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity())));
t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).add(Constants.formatBigdecimal0Float(model.getYearOutboundQuantity())));
return t;
--
Gitblit v1.9.3