Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -40,6 +40,7 @@ import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import com.logpm.distribution.vo.app.queryOrderVO;
 import com.logpm.distribution.wrapper.DistributionParcelListWrapper;
+import com.logpm.distribution.wrapper.DistributionStockArticleNewWrapper;
 import com.logpm.distribution.wrapper.DistributionStockArticleWrapper;
 import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity;
 import com.logpm.warehouse.entity.WarehouseUpdownGoodsEntity;
@@ -1165,11 +1166,8 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 		}
 
 		IPage<DistributionStockArticleEntity> stockArticleEntityList = baseMapper.selectAllDistributionOrder(page, stockArticleEntity);
-		List<DistributionStockArticleVO> stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList.getRecords());
-//		List<DistributionStockArticleVO> stockArticleVOS = DistributionStockArticleWrapper.build().listVO(stockArticleEntityList);
+		List<DistributionStockArticleVO> stockArticleVOS = DistributionStockArticleNewWrapper.build().listVO(stockArticleEntityList.getRecords());
 		IPage<DistributionStockArticleVO> distributionStockArticleEntityIPage = page.setRecords(stockArticleVOS);
-//		IPage<DistributionStockArticleVO> distributionStockArticleVOIPage = this.handlePackage(distributionStockArticleEntityIPage);
-//		distributionStockArticleVOIPage.setTotal(stockArticleEntityList.size());
 		return distributionStockArticleEntityIPage;
 	}
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/wrapper/DistributionStockArticleNewWrapper.java

@@ -0,0 +1,89 @@
+package com.logpm.distribution.wrapper;
+
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.logpm.distribution.entity.DistributionStockArticleEntity;
+import com.logpm.distribution.service.IDistributionLoadscanService;
+import com.logpm.distribution.service.IDistributionParcelListService;
+import com.logpm.distribution.vo.DistributionStockArticleVO;
+import lombok.extern.log4j.Log4j2;
+import org.springblade.common.constant.DictBizConstant;
+import org.springblade.core.mp.support.BaseEntityWrapper;
+import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
+import org.springblade.system.cache.DictBizCache;
+import org.springblade.system.feign.IUserClient;
+
+import java.util.Date;
+import java.util.Objects;
+
+/**
+ * 在库订单实体VO 转换
+ */
+@Log4j2
+public class DistributionStockArticleNewWrapper extends BaseEntityWrapper<DistributionStockArticleEntity, DistributionStockArticleVO> {
+	private IUserClient userCliient = SpringUtil.getBean(IUserClient.class);
+	private IDistributionParcelListService distributionParcelListService = SpringUtil.getBean(IDistributionParcelListService.class);
+	private IDistributionLoadscanService distributionLoadscanService = SpringUtil.getBean(IDistributionLoadscanService.class);
+
+
+	public static DistributionStockArticleNewWrapper build() {
+
+		return new DistributionStockArticleNewWrapper();
+	}
+
+	@Override
+	public DistributionStockArticleVO entityVO(DistributionStockArticleEntity entity) {
+
+		DistributionStockArticleVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(entity, DistributionStockArticleVO.class));
+
+		if ("80".equals(entity.getOrderStatus())) {
+			//查询配送完毕的所有司机
+			String driverName = distributionLoadscanService.selectDriverNameByOrderId(entity.getId());
+			distributionStockupVO.setDriverName(driverName);
+		}
+		//计算在库天数
+		if (ObjectUtils.isNotNull(entity.getWarehouseEntryTime())) {
+
+			long time1 = entity.getWarehouseEntryTime().getTime(); //入库
+			long time2 = new Date().getTime(); // 现在
+			int days = (int) ((time2 - time1) / (1000 * 60 * 60 * 24));
+			if (days == 0) {
+				days = 1;
+			}
+			distributionStockupVO.setStoreTime(days + "天");
+		}
+
+		if(ObjectUtils.isNotNull(entity.getCompleteSet())){
+			switch (entity.getCompleteSet()) {
+				case 1:
+					distributionStockupVO.setCompleteSetName("否");
+					break;
+				case 2:
+					distributionStockupVO.setCompleteSetName("是");
+					break;
+			}
+		}
+//		distributionStockupVO.setIsZeroString("1".equals(distributionStockupVO.getIsZero())?"是":"否");
+		distributionStockupVO.setReservationNum(entity.getHandQuantity()-entity.getDeliveryQuantity());
+		buildVoInfor(distributionStockupVO);
+		return distributionStockupVO;
+	}
+
+
+	public DistributionStockArticleVO buildVoInfor(DistributionStockArticleVO distributionStockupVO) {
+		distributionStockupVO.setTypeServerName(DictBizCache.getValue(DictBizConstant.DISTRIBUTION_TYPE, distributionStockupVO.getTypeService()));
+		distributionStockupVO.setOrderStatusName(DictBizCache.getValue(DictBizConstant.DELIVERY_ORDER_STATUS, distributionStockupVO.getOrderStatus()));
+		distributionStockupVO.setGroundingStatusName(DictBizCache.getValue(DictBizConstant.BASIC_GROUNDING, distributionStockupVO.getGroundingStatus()));
+		distributionStockupVO.setFreezeStatusName(DictBizCache.getValue(DictBizConstant.FREEZE_STATUS, distributionStockupVO.getFreezeStatus()));
+		distributionStockupVO.setReservationStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RESERVATION_STATUS, distributionStockupVO.getReservationStatus()));
+		distributionStockupVO.setStockupStatusName(DictBizCache.getValue(DictBizConstant.ORDER_STOCKUP_STATUS, distributionStockupVO.getStockupStatus()));
+		if (ObjectUtils.isNotNull(distributionStockupVO.getCreateUser())) {
+			distributionStockupVO.setCreateUserName(userCliient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());
+		}
+
+		distributionStockupVO.setOrderReceiveStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RECEIVE_STATUS, distributionStockupVO.getOrderReceiveStatus()));
+		return distributionStockupVO;
+	}
+
+
+}