Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -1611,7 +1611,6 @@ public class DistributionStockupAppController extends BladeController {
 				entity.setOutboundType(distributionStockupEntity.getTypeService());
 //				entity.setStockupArea(stockupDTO.getStockupAllocationName());
 //				entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
-				distributionStockService.save(entity);
 				//修改订单备货状态
 				distributionAsyncService.updateStockArticleStock(one.getStockArticleId());
 				//修改备货时间
@@ -1659,7 +1658,10 @@ public class DistributionStockupAppController extends BladeController {
 						jsonObject.put("num", 1);
 						//进行了备货库位的选择才进行备货库位的上架
 						warehouseUpdownStockUpAreaClient.upStockUpShelf(jsonObject);
+						entity.setStockupAreaId(stockupDTO.getStockupAllocationId());
 					}
+				distributionStockService.save(entity);
+
 					//修改包件备货状态
 				DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
 				parcelListEntity.setId(entity.getParcelListId());

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java

@@ -113,9 +113,7 @@ public class DistributionReservationController extends BladeController {
 		}
 		IPage<DistributionReservationEntity> pages = reservationService.page(Condition.getPage(query),lambda );
 		pages.getRecords().forEach(i ->{
-			log.info("查询用户》》》》》",i.getCreateUser());
 			R<User> userR = userClient.userInfoById(i.getCreateUser());
-			log.info("查询用户结果》》》》》",userR.getData().getName());
 			i.setOperator(userR.getData().getName());
 		});