Merge branch 'dev' into pre-production

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

@@ -62,7 +62,7 @@ public class DistributionCityExcel implements Serializable {
 	private String stockupArea;
 
 	@ColumnWidth(20)
-	@ExcelProperty("指派状态;1-未指派、2-已指派")
+	@ExcelProperty("指派状态")
 	private String assignStatus;
 
 	@ColumnWidth(20)
@@ -71,7 +71,7 @@ public class DistributionCityExcel implements Serializable {
 
 	@ColumnWidth(20)
 	@ExcelProperty("备货人员")
-	private Long forklift;
+	private String forkliftName;
 
 	@ColumnWidth(20)
 	@ExcelProperty("所在托盘")

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

@@ -66,7 +66,7 @@ public class DistributionMarketExcel implements Serializable {
 	private String stockupArea;
 
 	@ColumnWidth(20)
-	@ExcelProperty("指派状态;1-未指派、2-已指派")
+	@ExcelProperty("指派状态")
 	private String assignStatus;
 
 	@ColumnWidth(20)

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

@@ -62,7 +62,7 @@ public class DistributionSelfExcel implements Serializable {
 	private String stockupArea;
 
 	@ColumnWidth(20)
-	@ExcelProperty("指派状态;1-未指派、2-已指派")
+	@ExcelProperty("指派状态")
 	private String assignStatus;
 
 	@ColumnWidth(20)
@@ -71,7 +71,7 @@ public class DistributionSelfExcel implements Serializable {
 
 	@ColumnWidth(20)
 	@ExcelProperty("备货人员")
-	private Long forklift;
+	private String forkliftName;
 
 	@ColumnWidth(20)
 	@ExcelProperty("所在托盘")

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

@@ -644,14 +644,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 							Map<Long, DistributionParcelListEntity> parcelListEntityMap = parcelListEntityList.stream().collect(Collectors.toMap(DistributionParcelListEntity::getId, Function.identity(), (k1, k2) -> k2));
 							boolean reservationFlag = parcelListEntities.stream().allMatch(p -> Func.isNotEmpty(parcelListEntityMap.get(p.getId())));
 							if (reservationFlag) {
+								try {
+									warehouseUpdownTypeClient.downTray(distrilbutionloadingscanDTO.getBarcode(),myCurrentWarehouse.getId());
+								}catch (Exception e){
+									log.error("#################货物下架错误：{}",distrilbutionloadingscanDTO.getBarcode());
+									return Resp.scanFail("装车失败", "装车失败");
+								}
 								List<DistributionLoadscanEntity> reservationLoadscanEntities = new ArrayList<>();
 								for (DistributionParcelListEntity parcelListEntity : parcelListEntities) {
-									try {
-										warehouseUpdownTypeClient.downTray(parcelListEntity.getOrderPackageCode(),myCurrentWarehouse.getId());
-									}catch (Exception e){
-										log.error("#################货物下架错误：{}",parcelListEntity.getOrderPackageCode());
-										return Resp.scanFail("装车失败", "装车失败");
-									}
 									if (parcelListEntity.getOrderPackageLoadingStatus().equals(OrderPackageLoadingStatusConstant.weizhuancghe.getValue())) {
 										parcelListEntity.setOrderPackageLoadingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 										parcelListEntity.setOrderPackageStatus(OrderPackageStatusConstant.yichuku.getValue());

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

@@ -487,11 +487,13 @@ public class DistributionSignforServiceImpl extends BaseServiceImpl<Distribution
 //			return null;
 //		}
 		List<Long> orderIds = reservationStockarticleEntityList.stream().map(DistributionReservationStockarticleEntity::getStockArticleId).collect(Collectors.toList());
+
 		if (Func.isNotEmpty(orderIds)){
 			List<DistributionStockArticleEntity> stockArticleEntities = distributionStockArticleService.listByIds(orderIds);
 			List<DistributionSignPrintVO> printEntities = baseMapper.selectSignImgsUrl(distributionSignforVO.getReservationId());
 			distributionSignforVO.setPrintVOList(printEntities);
 			if (Func.isNotEmpty(stockArticleEntities)) {
+
 				distributionSignforVO.setOrderInfo(DistributionStockArticleWrapper.build().listVO(stockArticleEntities));
 			}
 		}

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

@@ -1758,16 +1758,18 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			return Resp.scanFail("备货失败！有其他包件无法整托", "备货失败！有其他包件无法整托");
 		} else {
 			List<DistributionStockEntity> list1 = new ArrayList<>();
+
 			voList.forEach(i -> {
 				//查询是否已备货
 				DistributionParcelListEntity byId = distributionParcelListService.getById(i.getParcelListId());
 				if(ObjectUtils.isNotNull(byId) && !byId.getOrderPackageStockupStatus().equals(OrderPackageStockupStatusConstant.yibeihu.getValue())){
 					DistributionStockEntity distributionStock = new DistributionStockEntity();
 					//修改包件备货状态
-					DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
-					parcelList.setId(i.getParcelListId());
-					parcelList.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
-					distributionParcelListService.updateById(parcelList);
+
+//					DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
+//					parcelList.setId(i.getParcelListId());
+//					parcelList.setOrderPackageStockupStatus(OrderPackageStockupStatusConstant.yibeihu.getValue());
+//					distributionParcelListService.updateById(parcelList);
 
 					//判断备货任务是否完成
 					if(one.getStockUpType().equals("3")){
@@ -1830,6 +1832,15 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 			//添加扫描记录
 
 			if(!list1.isEmpty()){
+				List<Long> collect = voList.stream().map(DistributionStockPackageVO::getParcelListId).collect(Collectors.toList());
+				boolean update = distributionParcelListService.update(Wrappers.<DistributionParcelListEntity>lambdaUpdate()
+					.in(DistributionParcelListEntity::getId, collect)
+					.set(DistributionParcelListEntity::getOrderPackageStockupStatus, OrderPackageStockupStatusConstant.yibeihu.getValue())
+				);
+				if(!update){
+					log.info("包件备货信息修改失败!!");
+					throw new ServiceException("包件备货信息修改失败！！");
+				}
 
 				//判断备货任务是否完成
 				if(one.getStockUpType().equals("3")){

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/api/WarehouseTaskApiController.java

@@ -252,7 +252,7 @@ public class WarehouseTaskApiController {
 			map.put("allocationCode",allocationCode);
 			map.put("allNum",allNUm);
 			map.put("finishNum",finishNUm);
-			map.put("list", ObjectUtils.isNotNull(list.getRecords()) ? list.getRecords() : null);
+			map.put("list", ObjectUtils.isNotNull(list) ? list.getRecords() : null);
 			return R.data(map);
 		}catch (CustomerException e){
 			log.warn(e.message);

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/ITaskQuestService.java

@@ -112,6 +112,10 @@ public interface ITaskQuestService extends BaseService<TaskQuestEntity> {
 	 */
 	IPage<QuestDetailEntity> allocationDetailByStock(IPage<Object> page,TaskSearchDTO taskSearchDTO);
 
+	/**
+	 * 修改包件信息
+	 * @param taskSearchDTO
+	 */
 	void updateQuestSetail(TaskSearchDTO taskSearchDTO);
 
 	/**

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/TaskQuestServiceImpl.java

@@ -1140,13 +1140,16 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity : questChildEntitys) {
-			if (Objects.isNull(marketNames)) {
-				marketNames = new ArrayList<>();
+		if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){
+			for (TaskQuestChildEntity childEntity : questChildEntitys) {
+				if (Objects.isNull(marketNames)) {
+					marketNames = new ArrayList<>();
+				}
+				marketNames.add(childEntity.getRefName());
 			}
-			marketNames.add(childEntity.getRefName());
+			taskSearchDTO.setMarketNames(marketNames);
 		}
-		taskSearchDTO.setMarketNames(marketNames);
+
 
 		//判断是否有明细数据存入
 //		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();
@@ -1198,13 +1201,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity : questChildEntitys) {
-			if (Objects.isNull(marketNames)) {
-				marketNames = new ArrayList<>();
+
+		if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){
+			for (TaskQuestChildEntity childEntity : questChildEntitys) {
+				if (Objects.isNull(marketNames)) {
+					marketNames = new ArrayList<>();
+				}
+				marketNames.add(childEntity.getRefName());
 			}
-			marketNames.add(childEntity.getRefName());
+			taskSearchDTO.setMarketNames(marketNames);
 		}
-		taskSearchDTO.setMarketNames(marketNames);
+//		for (TaskQuestChildEntity childEntity : questChildEntitys) {
+//			if (Objects.isNull(marketNames)) {
+//				marketNames = new ArrayList<>();
+//			}
+//			marketNames.add(childEntity.getRefName());
+//		}
+//		taskSearchDTO.setMarketNames(marketNames);
 
 		//判断是否有明细数据存入
 //		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();
@@ -1256,13 +1269,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 			.eq("is_deleted", 0);
 		List<TaskQuestChildEntity> questChildEntitys = taskQuestChildService.list(queryWrapper);
 		List<String> marketNames = null;
-		for (TaskQuestChildEntity childEntity : questChildEntitys) {
-			if (Objects.isNull(marketNames)) {
-				marketNames = new ArrayList<>();
+		if(ObjectUtils.isNotNull(questChildEntitys) && !questChildEntitys.isEmpty()){
+			for (TaskQuestChildEntity childEntity : questChildEntitys) {
+				if (Objects.isNull(marketNames)) {
+					marketNames = new ArrayList<>();
+				}
+				marketNames.add(childEntity.getRefName());
 			}
-			marketNames.add(childEntity.getRefName());
+			taskSearchDTO.setMarketNames(marketNames);
 		}
-		taskSearchDTO.setMarketNames(marketNames);
+
+//		for (TaskQuestChildEntity childEntity : questChildEntitys) {
+//			if (Objects.isNull(marketNames)) {
+//				marketNames = new ArrayList<>();
+//			}
+//			marketNames.add(childEntity.getRefName());
+//		}
+//		taskSearchDTO.setMarketNames(marketNames);
 
 		//判断是否有明细数据存入
 //		QueryWrapper<QuestDetailEntity> questDetailEntityQueryWrapper = new QueryWrapper<>();