Merge remote-tracking branch 'origin/dev' into dev

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/ClerkCheckPushDataQueueHandler.java

@@ -235,7 +235,15 @@ public class ClerkCheckPushDataQueueHandler {
 			if (ObjectUtils.isNotNull(user)) {
 				assert user != null;
 				signPushDataUnitDTO.setAdministratorsName(user.getName());
-				signPushDataUnitDTO.setAdministratorsPhone(user.getPhone());
+				if (ObjectUtils.isNotEmpty(user.getPhone())){
+					signPushDataUnitDTO.setAdministratorsPhone(user.getPhone());
+				}else {
+					if (ObjectUtils.isNotEmpty(user.getAccount())){
+						signPushDataUnitDTO.setAdministratorsPhone(user.getAccount());
+					}else {
+						log.info("用户无电话号码且账号信息为空>>用户名称:{}",user.getName());
+					}
+				}
 			}
 
 		}

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

@@ -2058,6 +2058,14 @@ public class DistributionDeliveryListServiceImpl extends BaseServiceImpl<Distrib
 					DisStockListDetailEntity disStockListDetailEntity = disStockListDetailEntities.get(0);
 					disStockListDetailEntity.setStockLockingStatus(OrderPackageLoadingStatusConstant.yizhuangche.getValue());
 					disStockListDetailService.updateById(disStockListDetailEntity);
+					//维护包件装车状态
+					boolean update = distributionParcelListService.update(
+						Wrappers.<DistributionParcelListEntity>update().lambda()
+							.eq(DistributionParcelListEntity::getOrderPackageCode, disStockListDetailEntity.getStockPackageCode())
+							.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId())
+							.eq(DistributionParcelListEntity::getMaterialCode, disStockListDetailEntity.getSku())
+					);
+					log.info(">>>>>>>>>>>>>>>>>>>装车修改库存品包件>装车包件码:{},",disStockListDetailEntity.getStockPackageCode());
 					DistributionLoadscaninvnEntity distributionLoadscaninvnEntity = getDistributionLoadscaninvnEntity(distrilbutionloadingscanDTO, distributionDeliverySelfEntity, disStockListDetailEntities);
 					packageLockIds.add(distributionLoadscaninvnEntity.getInventoryPackageId());
 					distributionLoadscaninvnService.save(distributionLoadscaninvnEntity);

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

@@ -603,21 +603,23 @@ public class TaskQuestServiceImpl extends BaseServiceImpl<TaskQuestMapper, TaskQ
 
 		}
 		boolean save = this.save(taskQuest);
-		//存入子表
-		if (!taskQuest.getList().isEmpty()) {
-//			List<TaskQuestChildEntity> list = taskQuest.getList();
-//			for (TaskQuestChildEntity taskQuestChildEntity : list) {
-//				taskQuestChildEntity.setWarehouseId(id);
-//				taskQuestChildEntity.setQuestId(taskQuest.getId());
-//
-//			}
-//			taskQuestChildService.saveBatch(list);
-//			//添加包件信息
-//			List<Long> collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList());
-//			addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId());
-		} else {
-			addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
-		}
+//		存入子表  todo 暂时不要商场
+//		if (!taskQuest.getList().isEmpty()) {
+////			List<TaskQuestChildEntity> list = taskQuest.getList();
+////			for (TaskQuestChildEntity taskQuestChildEntity : list) {
+////				taskQuestChildEntity.setWarehouseId(id);
+////				taskQuestChildEntity.setQuestId(taskQuest.getId());
+////
+////			}
+////			taskQuestChildService.saveBatch(list);
+////			//添加包件信息
+////			List<Long> collect = list.stream().map(TaskQuestChildEntity::getRefId).collect(Collectors.toList());
+////			addQuestDetail(myCurrentWarehouse.getId(), collect, questNum, taskQuest.getId());
+//		} else {
+//			addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
+//		}
+
+		addQuestDetail(myCurrentWarehouse.getId(), null, questNum, taskQuest.getId());
 
 		return save ? R.success("添加成功") : R.fail("添加失败");
 	}