From f63d3a3be83fea258e7920efccd2567b6a511bb3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 16 一月 2025 16:52:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/thrid/BoardServiceImpl.java | 165 ++++++++++++++++++++++++++++++++----------------------
1 files changed, 98 insertions(+), 67 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 d17348e..5a06a00 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
@@ -14,6 +14,7 @@
import com.doumee.core.haikang.model.param.respose.*;
import com.doumee.core.haikang.service.HKCarOpenService;
import com.doumee.core.haikang.service.HKService;
+import com.doumee.dao.web.reqeust.CarsJobAndContractByJobIdDTO;
import com.doumee.service.business.third.model.request.TmsFacrotyCodeListRequest;
import com.doumee.service.business.third.model.request.TmsOrderNoFinishListRequest;
import com.doumee.service.business.third.model.request.TmsOutQtyAndVehicleQtyRequest;
@@ -806,6 +807,36 @@
Constants.PlatformJobStatus.AUTHED_LEAVE.getKey(),
Constants.PlatformJobStatus.CALLED.getKey())
.last("limit 1"));
+
+ dealJobDetailAndContractBiz(job,data);
+
+ return data;
+
+ }
+ /**
+ * 銆愬洯鍖虹墿鏂欎腑蹇冭皟搴︺�戠湅鏉�-鏍规嵁杞︾墝鍙锋煡璇綔涓氫俊鎭拰鍚堝悓淇℃伅闆嗗悎
+ *
+ * @return
+ *
+ */
+ @Override
+ public CarsJobAndContractVO getJobDetailsById(CarsJobAndContractByJobIdDTO param) {
+ CarsJobAndContractVO data = new CarsJobAndContractVO();
+ if(param.getId() == null){
+ return data;
+ }
+ PlatformJob job = platformJobMapper.selectJoinOne(PlatformJob.class,
+ new MPJLambdaWrapper<PlatformJob>()
+ .selectAll(PlatformJob.class)
+ .eq(PlatformJob::getId,param.getId())
+ .last("limit 1"));
+ dealJobDetailAndContractBiz(job,data);
+
+ return data;
+
+ }
+
+ private void dealJobDetailAndContractBiz(PlatformJob job, CarsJobAndContractVO data) {
if(job!=null){
List<PlatformLog> logList = platformLogMapper.selectJoinList(PlatformLog.class,
new MPJLambdaWrapper<PlatformLog>()
@@ -845,7 +876,7 @@
if(detailList!=null){
for(PlatformWmsDetail d : detailList){
if(isExistIocode(d.getIocode(),data.getContractList())){
- continue;
+ continue;
}
tt = new CarsContractVO();
tt.setIoCode(d.getIocode());
@@ -858,10 +889,6 @@
}
}
-
-
- return data;
-
}
private List<PlatformWmsDetail> getDetailListByCode(String iocode, List<PlatformWmsDetail> detailList,CarsContractVO tt) {
@@ -911,11 +938,8 @@
@Override
public PlatformJobRunBoardNewVO platformJobCenterData(){
PlatformJobRunBoardNewVO data = new PlatformJobRunBoardNewVO();
- Random random = new Random();
-
- data.setMonthOutTimes(random.nextInt(1000));
- data.setYearOutTimes(random.nextInt(1000) * 11);
-
+ data.setMonthOutTimes(0);
+ data.setYearOutTimes(0);
Date month = Utils.Date.getStart(new Date());//鏈湀
Date lastMonth = DateUtil.addMonthToDate(month,-1);//涓婃湀
Date year = Utils.Date.getStart(new Date());//浠婂勾
@@ -978,7 +1002,7 @@
.selectAs(PlatformJob::getStatus,PlatformJob::getStatus)
.selectAs(PlatformJob::getType,PlatformJob::getType)
.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)
+ // .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(" to_days(create_date) <to_days(now())"));
@@ -1037,7 +1061,6 @@
}
return data;
}
-
private BigDecimal getDoneHoursByData(String start ,String end) {
List<PlatformLog> platformLogList = platformLogMapper.selectList(new QueryWrapper<PlatformLog>().lambda()
@@ -2208,6 +2231,9 @@
data.setHoursAbility(new BigDecimal(0));
data.setCurrentPlanNum(new BigDecimal(0));
data.setCurrentOrderNum(new BigDecimal(0));
+ data.setNoNeedTransportOrderNum(new BigDecimal(0));
+ data.setNeedTransportOrderNum(new BigDecimal(0));
+ data.setCurrentOrderNum(new BigDecimal(0));
data.setCrrentRestNum(new BigDecimal(0));
data.setCrrentOutNum(new BigDecimal(0));
List<TmsFactoryParam> paramList = factoryList();
@@ -2255,73 +2281,26 @@
}
TmsOutboundCapabilityResponse result= tmsService.getOutboundCapability(param);
if(result !=null){
+ String todayDate = DateUtil.getShortTime(new Date());
List<String> planCodes = new ArrayList<>();
List<String> todayCodes = new ArrayList<>();
- String todayDate = DateUtil.getShortTime(new Date());
if(result.getCurrentDayOrderList()!=null && result.getCurrentDayOrderList().size()>0){
for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayOrderList()){
- data.setCurrentOrderNum(data.getCurrentOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
- /**
- * DISPATCH_TYPE in(1,2) 涓� TRANSPORT_CODE涓嶄负绌猴紝sum(NC_TOTALITY) + DISPATCH_TYPE not in(1,2) sum(NC_TOTALITY)
- * 浠婃棩鍑哄簱涓嬭揪鐨勮鍒掍换鍔℃�婚噺
- */
- if(StringUtils.isNotBlank(model.getTransportCode())
- && (StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
- data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
- }
- if(!(StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
- data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
- }
-
- /**
- * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
- * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
- */
- if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
- planCodes.add(model.getTransportCode());
- }
- /**
- * 浠婃棩涓嬭揪鍑哄簱鐨勮鍒掍换鍔″搴旂殑杩愯緭杞︽鏁�
- * TRANSPORT_CODE涓嶄负绌篶ount(transport_code )
- */
- if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
- planCodes.add(model.getTransportCode());
- }
- /**
- * out_date涓哄綋鏃�,sum(NC_TOTALITY) 浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔℃�婚噺
- * TRANSPORT_CODE涓嶄负绌� 涓攐ut_date涓哄綋鏃� count(transport_code) 浠婃棩瀹屾垚鐨勫嚭搴撲綔涓氫换鍔＄殑杩愯緭杞︽鏁�
- */
- if(StringUtils.isNotBlank(model.getOutDate()) && model.getOutDate().length()> 10){
- String tDate = model.getOutDate().substring(0,10);
- if(tDate.equals(todayDate)){
- //濡傛灉鏄綋鏃�
- data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁㈠崟閲�
- }
- if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),todayCodes)){
- todayCodes.add(model.getTransportCode());
- }
- }
+ dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
}
}
if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){
for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
- /**
- * out_date涓虹┖锛宻um(NC_TOTALITY) 鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔�
- * out_date涓虹┖ 涓擳RANSPORT_CODE涓嶄负绌� * count(transport_code ) 鏄ㄥぉ鏈畬鎴愬嚭搴撹鍒掍换鍔¤溅娆�
- */
- if(StringUtils.isBlank(model.getOutDate())){
- data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩璁″垝閲�
- if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),planCodes)){
- planCodes.add(model.getTransportCode());
- }
- }
+ dealOutOrderBiz(data,model,planCodes,todayCodes,todayDate);
}
}
- data.setCurrentPlanCarNum(planCodes.size());//浠婃棩璁″垝杞︽
+ data.setCurrentPlanCarNum(planCodes.size());//浠婃棩浠诲姟杞︽
data.setCrrentOutCarNum(todayCodes.size());//浠婃棩鍑哄簱杞︽
}
- data.setCrrentRestNum(data.getCurrentPlanNum().subtract(data.getCrrentOutNum()));
- data.setCrrentRestCarNum(data.getCurrentPlanCarNum() -data.getCrrentOutCarNum());
+// data.setCrrentRestNum(data.getCurrentPlanNum().subtract(data.getCrrentOutNum()));
+// data.setCrrentRestCarNum(data.getCurrentPlanCarNum() -data.getCrrentOutCarNum());
+ data.setCrrentRestNum(data.getCurrentPlanNum());
+ data.setCrrentRestCarNum(data.getCurrentPlanCarNum());
if(data.getCrrentRestNum().compareTo(new BigDecimal(0)) <=0){
data.setCrrentRestNum(new BigDecimal(0));
}
@@ -2336,9 +2315,61 @@
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));
}
}
+ /**
+ * 1銆佸綋鍓嶈鍗曢噷锛氭埅姝㈢洰鍓嶆湭閰嶈浇璁㈠崟閲忥紱
+ * 2銆佸綋鍓嶄换鍔￠噺锛氭埅姝㈢洰鍓嶅凡閰嶈浇鏈嚭搴撹鍗曢噺+鏃犻渶閰嶈浇鐨勬湭鍑哄簱浠诲姟閲忥紱
+ * 3銆佸綋鍓嶄换鍔￠噺鍜屽墿浣欎换鍔￠噺缁熻閫昏緫涓�鑷达紱
+ * @param data
+ * @param model
+ */
+ private void dealOutOrderBiz(WholeProvinceBoardVO data, TmsOutboundCapabilityInfoResponse model,List<String> planCodes,List<String> todayCodes, String todayDate ) {
+
+ /**
+ * 褰撳墠璁㈠崟閲忥細鎴嚦鐩墠鏈厤杞界殑鏁版嵁
+ */
+ if(StringUtils.isBlank(model.getTransportCode())
+ &&( StringUtils.equals("1",model.getDispatchType()) || StringUtils.equals("2",model.getDispatchType()))){
+ data.setCurrentOrderNum(data.getCurrentOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠璁㈠崟閲�
+ }
+ /**
+ * 褰撳墠浠诲姟閲�(鍜屽墿浣欎换鍔￠噷锛夛細鎴嚦鐩墠宸查厤杞芥湭鍑哄簱鐨勮鍗�
+ */
+ if(StringUtils.isNotBlank(model.getTransportCode()) && StringUtils.isBlank(model.getOutDate())){
+ data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠浠诲姟閲忥紙绱锛�
+ data.setNeedTransportOrderNum(data.getNeedTransportOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//鍚屽煄鍓╀綑浠诲姟閲忥紙绱锛�
+ if(notInList(model.getTransportCode(),planCodes)){
+ planCodes.add(model.getTransportCode());
+ }
+ }
+ /**
+ * 鍚屽煄鍗曞瓙锛堟棤闇�閰嶈浇浣嗘槸鏈畬鎴愶級
+ */
+ if(StringUtils.isBlank(model.getOutDate())
+ && !StringUtils.equals("1",model.getDispatchType()) && !StringUtils.equals("2",model.getDispatchType())){
+ data.setNoNeedTransportOrderNum(data.getNoNeedTransportOrderNum().add(Constants.formatBigdecimal(model.getNcTotality())));//鍚屽煄鍓╀綑浠诲姟閲忥紙绱锛�
+ data.setCurrentPlanNum(data.getCurrentPlanNum().add(Constants.formatBigdecimal(model.getNcTotality())));//褰撳墠浠诲姟閲忥紙绱锛�
+ }
+ /**
+ * 浠婃棩鍑哄簱閲忥紝鍑哄簱鏃堕棿涓轰粖澶╃殑
+ */
+ if(StringUtils.isNotBlank(model.getOutDate()) && model.getOutDate().length()> 10){
+ String tDate = model.getOutDate().substring(0,10);
+ if(tDate.equals(todayDate)){
+ //濡傛灉鏄綋鏃�
+ data.setCrrentOutNum(data.getCrrentOutNum().add(Constants.formatBigdecimal(model.getNcTotality())));//浠婃棩鍑哄簱閲�
+ if(StringUtils.isNotBlank(model.getTransportCode()) && notInList(model.getTransportCode(),todayCodes)){
+ todayCodes.add(model.getTransportCode());
+ }
+ }
+ }
+
+ }
+
private boolean notInList(String transportCode, List<String> planCodes) {
for(String s :planCodes){
if(StringUtils.equals(transportCode,s)){
--
Gitblit v1.9.3