productDev/dmvisit.git

			@@ -38,6 +38,7 @@
			import com.doumee.service.business.third.model.response.*;
			import com.github.xiaoymin.knife4j.core.util.CollectionUtils;
			import com.github.yulichang.wrapper.MPJLambdaWrapper;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.extern.slf4j.Slf4j;
			import org.apache.commons.lang3.StringUtils;
			import org.springframework.beans.BeanUtils;
			@@ -2150,6 +2151,11 @@
			if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
			t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
			}
			if(Constants.UNIT_TYPE == 1) {
			//处理单位成“箱”，一箱=5万支
			t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			}
			}
			result.getDetailList().add(t);
			result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
			@@ -2292,6 +2298,15 @@
			if(data.getCrrentRestCarNum()<=0){
			data.setCrrentRestCarNum(0);
			}
			//处理单位成“箱”，一箱=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));
			}
			}

			private boolean notInList(String transportCode, List<String> planCodes) {
			@@ -2380,6 +2395,16 @@
			data.setSameOutNum(data.getLastOutNum());
			data.setSameInNum(data.getLastInNum());
			}

			//处理单位成“箱”，一箱=5万支
			if(Constants.UNIT_TYPE == 1) {
			data.setCurrentInNum(Constants.formatBigdecimal(data.getCurrentInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			data.setCurrentOutNum(Constants.formatBigdecimal(data.getCurrentOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			data.setLastInNum(Constants.formatBigdecimal(data.getLastInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			data.setLastOutNum(Constants.formatBigdecimal(data.getLastOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			data.setSameInNum(Constants.formatBigdecimal(data.getSameInNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			data.setSameOutNum(Constants.formatBigdecimal(data.getSameOutNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			}
			return data;
			}
			/**
			@@ -2397,14 +2422,20 @@
			List<TmsDistributionOfDeliveryLocResponse> response = tmsService.getDistributionOfDeliveryLocations(param);//查询出库量
			if(response!=null &&response.size()>0){
			for(TmsDistributionOfDeliveryLocResponse model : response){
			WholeProvinceMapVO tt = getFromProvinceResultList(model ,result);
			if(tt == null){
			tt =new WholeProvinceMapVO();
			tt.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
			tt.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));
			tt.setProvinceCode(model.getToProvinceCode());
			tt.setProvinceName(model.getToProvinceName());
			result.add(tt);
			WholeProvinceMapVO t = getFromProvinceResultList(model ,result);
			if(t == null){
			t =new WholeProvinceMapVO();
			t.setMonthNum( Constants.formatBigdecimal0Float(model.getMonthOutboundQuantity()));
			t.setYearNum( Constants.formatBigdecimal0Float(model.getYearOutboundQuantity()));

			if(Constants.UNIT_TYPE == 1) {
			//处理单位成“箱”，一箱=5万支
			t.setMonthNum(Constants.formatBigdecimal(t.getMonthNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			t.setYearNum(Constants.formatBigdecimal(t.getYearNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			}
			t.setProvinceCode(model.getToProvinceCode());
			t.setProvinceName(model.getToProvinceName());
			result.add(t);
			}
			}
			}
			@@ -2528,6 +2559,12 @@
			if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
			t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
			}
			if(Constants.UNIT_TYPE == 1) {
			//处理单位成“箱”，一箱=5万支
			t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));
			t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5), 2, BigDecimal.ROUND_HALF_UP));

			}
			result.getDetailList().add(t);
			result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
			result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));
			@@ -2586,6 +2623,11 @@
			if(t.getTotalNum().compareTo(new BigDecimal(0)) !=0){
			t.setUseRate(t.getCurrentNum().divide(t.getTotalNum(),4,BigDecimal.ROUND_HALF_UP));
			}
			if(Constants.UNIT_TYPE == 1){
			//处理单位成“箱”，一箱=5万支
			t.setCurrentNum(Constants.formatBigdecimal(t.getCurrentNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
			t.setTotalNum(Constants.formatBigdecimal(t.getTotalNum()).divide(new BigDecimal(5),2,BigDecimal.ROUND_HALF_UP));
			}
			result.getDetailList().add(t);
			result.setCurrentNum(result.getCurrentNum().add(t.getCurrentNum()));
			result.setTotalNum(result.getTotalNum().add(t.getTotalNum()));