Merge branch 'dev' into pre-production

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockArticleVO.java

@@ -59,7 +59,7 @@ public class DistributionStockArticleVO extends DistributionStockArticleEntity {
 	@ApiModelProperty(value = "托盘")
 	private String pallet;
 	/**
-	 * 托盘
+	 * 包条码
 	 */
 	@ApiModelProperty(value = "包条码")
 	private String orderPackageCode;

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/excel/DistributionStockArticleExcel.java

@@ -181,6 +181,10 @@ public class DistributionStockArticleExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("所在托盘")
 	private String trays;
+
+	@ColumnWidth(20)
+	@ExcelProperty("所在货位")
+	private String allocation;
 	/**
 	 * 冻结状态
 	 */
@@ -257,6 +261,10 @@ public class DistributionStockArticleExcel implements Serializable {
 	@ColumnWidth(20)
 	@ExcelProperty("创建时间")
 	private Date createTime;
+
+	@ColumnWidth(20)
+	@ExcelProperty("是否零单")
+	private String isZeroString;
 //	/**
 //	 * 配载件数
 //	 */

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionDeliveryListMapper.xml

@@ -887,8 +887,7 @@
             </if>
 
         </where>
-        GROUP BY
+        GROUP BY lddl.id
-        lddl.id
         ORDER BY lddl.create_time DESC
     </select>
     <select id="getDeliveryStockArticleInfo" resultType="com.logpm.distribution.vo.DistributionStockArticleVO">

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockArticleMapper.xml

@@ -825,12 +825,13 @@
                ldsa.accept_warehouse_id,
                ldsa.accept_warehouse_name,
                ldsa.order_delivery_status,
-               group_concat(DISTINCT lwtg.tray_code)      as trays,
+               group_concat(DISTINCT lwt.pallet_name)    as trays,
                group_concat(DISTINCT lwug.position_code)  as allocation
         from logpm_platform.logpm_distribution_stock_article ldsa
                  left join logpm_platform.logpm_distribution_parcel_list ldpl on ldsa.id = ldpl.stock_article_id and ldpl.tenant_id = '627683'
                  left join logpm_platform.logpm_warehouse_tray_goods lwtg on lwtg.association_id = ldpl.id
                  left join logpm_platform.logpm_warehouse_updown_goods lwug on lwug.association_id = ldpl.id
+                left JOIN logpm_warehouse_tray lwt on lwtg.tray_id= lwt.id
         <where>
             ldsa.is_deleted = 0 and ldsa.order_status != '80'
             <if test="paramMap.warehouseId != null and paramMap.warehouseId != ''">

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

@@ -5583,7 +5583,10 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 				//这里就需要进行零担计划的查询
 				//对于零担订单对于同一个预约客户而言这里只能出现一种，这里就是单条结果
 				DistributionReservationStockarticleEntity reservationStockarticleEntity = reservationStockarticleEntityList.get(0);
-				List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda().eq(DistributionReservationZeroPackageEntity::getReservationId, reservationStockarticleEntity.getReservationId()).eq(DistributionReservationZeroPackageEntity::getStockArticleId, reservationStockarticleEntity.getStockArticleId()).ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()));
+				List<DistributionReservationZeroPackageEntity> reservationZeroPackageEntityList = distributionReservationZeroPackageService.list(Wrappers.<DistributionReservationZeroPackageEntity>query().lambda().
+					eq(DistributionReservationZeroPackageEntity::getReservationId, reservationStockarticleEntity.getReservationId()).
+					eq(DistributionReservationZeroPackageEntity::getStockArticleId, distrilbutionloadingscanDTO.getOrderId()).
+					ne(DistributionReservationZeroPackageEntity::getZeroPackageStatus, ReservationPackageStatusConstant.quxiao.getValue()));
 				if (Func.isNotEmpty(reservationZeroPackageEntityList)) {
 					//查询零担订单品类信息
 					List<Long> zeroPackageIds = reservationZeroPackageEntityList.stream().map(DistributionReservationZeroPackageEntity::getParcelListId).collect(Collectors.toList());

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

@@ -174,40 +174,75 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 
 		List<DistributionStockArticleEntity> list = baseMapper.exportDistributionStockArticle(paramMap, idArr);
 		List<DistributionStockArticleExcel> excelList = new ArrayList<>();
-		if (list.size() > 61) {
+//
-			list.parallelStream().forEach(li -> {
-				li.setCreateUserName(userClient.userInfoById(li.getCreateUser()).getData().getName());
-				DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(li);
-				DistributionStockArticleExcel excel = new DistributionStockArticleExcel();
-				if (distributionStockArticleVO.getTotalNumber() != null &&
-					distributionStockArticleVO.getIncomingNum() != null) {
-					distributionStockArticleVO.setUnreceivedQuantity(
-						distributionStockArticleVO.getTotalNumber() - distributionStockArticleVO.getIncomingNum()
-					);
-				}
-				BeanUtil.copyProperties(distributionStockArticleVO, excel);
-				excelList.add(excel);
-			});
-		} else {
 		list.forEach(li -> {
-				li.setCreateUserName(userClient.userInfoById(li.getCreateUser()).getData().getName());
+			DistributionStockArticleVO distributionStockArticleVO = buildVo(li);
-				DistributionStockArticleVO distributionStockArticleVO = DistributionStockArticleWrapper.build().entityVO(li);
 			DistributionStockArticleExcel excel = new DistributionStockArticleExcel();
+            assert distributionStockArticleVO != null;
             if (distributionStockArticleVO.getTotalNumber() != null &&
 				distributionStockArticleVO.getIncomingNum() != null) {
 				distributionStockArticleVO.setUnreceivedQuantity(
 					distributionStockArticleVO.getTotalNumber() - distributionStockArticleVO.getIncomingNum()
 				);
 			}
+			excel.setIsZeroString("1".equals(distributionStockArticleVO.getIsZero())?"是":"否");
 			BeanUtil.copyProperties(distributionStockArticleVO, excel);
 			excelList.add(excel);
 		});
-		}
 
 
 		return excelList;
 	}
 
+
+	/**
+	 * 构建参数
+	 * @param distributionStockArticle
+	 * @return
+	 */
+	private DistributionStockArticleVO buildVo(DistributionStockArticleEntity distributionStockArticle) {
+
+		DistributionStockArticleVO distributionStockupVO = Objects.requireNonNull(BeanUtil.copy(distributionStockArticle, DistributionStockArticleVO.class));
+
+
+		distributionStockupVO.setTrays(distributionStockArticle.getTrays());
+//计算在库天数
+		if (ObjectUtils.isNotNull(distributionStockArticle.getWarehouseEntryTime())) {
+
+			long time1 = distributionStockArticle.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(distributionStockArticle.getCompleteSet())) {
+			switch (distributionStockArticle.getCompleteSet()) {
+				case 1:
+					distributionStockupVO.setCompleteSetName("否");
+					break;
+				case 2:
+					distributionStockupVO.setCompleteSetName("是");
+					break;
+			}
+		}
+
+		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(userClient.userInfoById(distributionStockupVO.getCreateUser()).getData().getName());
+		}
+
+		distributionStockupVO.setOrderReceiveStatusName(DictBizCache.getValue(DictBizConstant.ORDER_RECEIVE_STATUS, distributionStockupVO.getOrderReceiveStatus()));
+		return null;
+	}
+
 	/**
 	 * 订单转库存品操作
 	 *

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

@@ -2523,37 +2523,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 							distributionAsyncService.getInventorySelfPickup(distrilbutionBillLadingInventoryAppVO.getStockArticleId());
 						}
 
-
-
 					}else {
 						return Resp.scanFail("库存品暂未备货请联系库管人员！", "库存品暂未备货请联系库管人员");
 
 					}
 
-
-
-//					//查询签收数量
-//					List<DistributionBillLadingScanEntity> list = distributionBillLadingScanService.list(Wrappers.<DistributionBillLadingScanEntity>query().lambda()
-//						.eq(DistributionBillLadingScanEntity::getBillLadingId, billLadingId)
-//						.eq(DistributionBillLadingScanEntity::getMaterialType, "1")
-//						.eq(DistributionBillLadingScanEntity::getStockListId, inventoryAppVO.getStockListId())
-//					);
-//					if (list.size() == inventoryAppVO.getQuantity() + 1) {
-//						//修改完成状态
-//						distributionAsyncService.getInventoryOrderSelfPickup(inventoryAppVO.getLdddId());
-//					}
-//					if (list.size() > inventoryAppVO.getQuantity()) {
-//						return Resp.scanFail("已完成！", "已完成！！");
-//					}
-//					//修改库存品签收
-//					distributionAsyncService.getInventorySelfPickup(inventoryAppVO.getStockArticleId());
-//
-//					distributionBillLadingScan.setPacketBarCode((String) coding);
-//					distributionBillLadingScan.setStockListId(inventoryAppVO.getStockListId());
-//					distributionBillLadingScan.setQuantity(1);
-//					distributionBillLadingScanService.save(distributionBillLadingScan);
-
-
 				} else {
 					return Resp.scanFail("包件信息不存在", "包件信息不存在");
 				}