productDev/dmvisit.git

			@@ -1,7 +1,5 @@
			package com.doumee.service.business.impl.thrid;

			import com.alibaba.fastjson.JSONObject;
			import com.alibaba.fastjson.TypeReference;
			import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
			import com.doumee.biz.system.SystemDictDataBiz;
			import com.doumee.core.constants.ResponseStatus;
			@@ -16,7 +14,6 @@
			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.core.tms.model.TMSContants;
			import com.doumee.core.tms.model.request.TmsFacrotyCodeListRequest;
			import com.doumee.core.tms.model.request.TmsOrderNoFinishListRequest;
			import com.doumee.core.tms.model.request.TmsOutQtyAndVehicleQtyRequest;
			@@ -32,6 +29,7 @@
			import com.doumee.dao.business.join.PlatformWarnEventJoinMapper;
			import com.doumee.dao.business.join.VisitsJoinMapper;
			import com.doumee.dao.business.model.*;
			import com.doumee.dao.business.model.Member;
			import com.doumee.dao.web.reqeust.CarsJobAndContractDTO;
			import com.doumee.dao.web.response.platformReport.*;
			import com.doumee.service.business.impl.PlatformJobServiceImpl;
			@@ -1109,10 +1107,11 @@
			//如果是在线或者休眠，查询在途还是空闲ty
			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取消（WMS）
			List<PlatformJob> busyNum = platformJobMapper.selectList(new QueryWrapper<PlatformJob>() .lambda()
			@@ -1197,10 +1196,10 @@
			BaseResponse<FireStatisticResponse> response1 = HKService.fireStatisticMonth(param);
			if(response1 != null && StringUtils.equals(response1.getCode(), HKConstants.RESPONSE_SUCCEE)
			&& response1.getData()!=null ) {
			data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNum()));
			data.setMonthAddNum(Constants.formatIntegerNum(response1.getData().getMaintenanceNumMonth()));
			data.setMonthTotalNum(Constants.formatIntegerNum(response1.getData().getDeviceTotalNum()));
			}
			return data;
			return data;

			}

			@@ -1270,7 +1269,13 @@
			temperatureHumidityDataResponseList.stream().filter(i->i.getIndexCode().indexOf(code)>=Constants.ZERO).collect(Collectors.toList());
			TemperatureHumidityDataVO temperatureHumidityDataVO = new TemperatureHumidityDataVO();
			for (TemperatureHumidityDataResponse data:dateList) {
			if(data.getSensorType().equals("temp")){
			if(StringUtils.isNotBlank(data.getName())){
			Integer index = data.getName().indexOf("-");
			if(index>=0){
			data.setName(data.getName().substring(0,index));
			}
			}
			if(data.getSensorType().equals("currTemperature")){
			temperatureHumidityDataVO.setTemperatureData(data);
			}else{
			temperatureHumidityDataVO.setHumidityData(data);
			@@ -1782,11 +1787,13 @@
			.select("( select pl.CREATE_DATE from platform_log pl where t.id = pl.obj_id and pl.OBJ_TYPE = "+Constants.PlatformJobLogType.WORKING.getKey()+" order by pl.CREATE_DATE desc limit 1 ) as newStartDate")
			//.select(" ( select sum(ifnull(pl.IO_QTY , 0 )) from platform_wms_detail pl where pl.job_id = t.id and pl.isdeleted=0 )",PlatformJob::getWorkNum)
			.select(" ( case when t.total_num is null then ( select sum(pwd.IO_QTY) from platform_wms_detail pwd where pwd.JOB_ID = t.id ) else t.total_num end )",PlatformJob::getWorkNum)
			.apply("to_days(t.create_date) = to_days(now())")
			// .apply("to_days(t.create_date) = to_days(now())")
			.eq(Platform::getIsdeleted, Constants.ZERO)
			.in(PlatformJob ::getStatus,new Integer[]{Constants.PlatformJobStatus.WORKING.getKey(),Constants.PlatformJobStatus.CALLED.getKey() })
			// .leftJoin(Platform.class,Platform::getId,PlatformJob::getPlatformId)
			.orderByDesc(PlatformJob::getStatus ));
			.orderByDesc(PlatformJob::getStatus )
			.orderByAsc(PlatformJob::getId )
			);
			//月台状态：0=作业中；1=空闲中；2=作业超时;3=叫号
			for(Platform model : platformList){
			PlatformWorkDataVO platformDurationVO = new PlatformWorkDataVO();
			@@ -2148,8 +2155,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 +2182,6 @@
			}
			}*/
			initOutboundCapability(data,factoryCode);

			return data;

			}
			@@ -2236,7 +2242,6 @@
			}
			}
			if(result.getCurrentDayAgoOrderList()!=null && result.getCurrentDayAgoOrderList().size()>0){

			for(TmsOutboundCapabilityInfoResponse model :result.getCurrentDayAgoOrderList()){
			/**
			* out_date为空，sum(NC_TOTALITY) 昨天未完成出库计划任务
			@@ -2371,8 +2376,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 +2387,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;