diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index ee6958b70..5b33b1470 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/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()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java index 2329a4284..cbca2c791 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionReservationController.java @@ -113,9 +113,7 @@ public class DistributionReservationController extends BladeController { } IPage pages = reservationService.page(Condition.getPage(query),lambda ); pages.getRecords().forEach(i ->{ - log.info("查询用户》》》》》created_user:{}",i.getCreateUser()); R userR = userClient.userInfoById(i.getCreateUser()); - log.info("查询用户结果》》》》》data:{}",userR.getData().getName()); i.setOperator(userR.getData().getName()); });