修改自提字段查询

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

@@ -43,4 +43,8 @@ public class DistributionBillOrderVO {
 	 * 提货状态
 	 */
 	private String conditions;
+	/**
+	 * 提货状态名稱
+	 */
+	private String conditionsName;
 }

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

@@ -1792,6 +1792,11 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				parcelListEntity.setId(i.getParceListId());
 				parcelListEntity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue());
 				distributionParcelListService.updateById(parcelListEntity);
+				//修改订单状态
+				DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
+				stockArticleEntity.setId(i.getStockArticleId());
+				stockArticleEntity.setOrderReceiveStatus(OrderReservationStatusConstant.bufenyuyue.getValue());
+				distributionStockArticleService.updateById(stockArticleEntity);
 //				DistributionBillLadingScanEntity billLadingScan = new DistributionBillLadingScanEntity();
 //				billLadingScan.setMaterialType("2");
 //				billLadingScan.setScanType(2);

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

@@ -71,6 +71,9 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 			if(StringUtils.isNotBlank(i.getStockupStatus())){
 				i.setStockupStatusName(DictBizCache.getValue(DictBizConstant.STOCKUP_STATUS,i.getStockupStatus()));
 			}
+			if(ObjectUtils.isNotNull(i.getConditions())){
+				i.setConditionsName(DictBizCache.getValue(DictBizConstant.BILL_CONDITIONS_STATUS,i.getConditions()));
+			}
 		});
 		return billOrderDetail;
 	}
@@ -90,10 +93,13 @@ public class DistrilbutionBillStockServiceImpl extends BaseServiceImpl<Distrilbu
 		DistrilbutionBillStockEntity billStock = JSON.parseObject(JSON.toJSONString(distrilbutionBillStock), DistrilbutionBillStockEntity.class);
 		IPage<DistributionBillOrderPackVO> billOrderPack = baseMapper.getBillOrderPack(page, billStock);
 		billOrderPack.getRecords().forEach(i -> {
+			if(ObjectUtils.isNotNull(i.getStockupCreateUser())){
 				R<User> userR = userClient.userInfoById(Long.valueOf(i.getStockupCreateUser()));
 				if(userR.isSuccess() && ObjectUtils.isNotNull(userR.getData())){
 					i.setStockupCreateUser(userR.getData().getRealName());
 				}
+			}
+
 		});
 		return billOrderPack;
 	}