From b6a17535b4d974d17bad45cffee7e67083ae0413 Mon Sep 17 00:00:00 2001 From: caoyizhong <1270296080> Date: Fri, 5 Jan 2024 17:04:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pda=E5=BA=93=E5=AD=98?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=95=B0=E9=87=8F=E4=B8=8D=E5=A2=9E=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../appcontroller/DistributionStockupAppController.java | 2 +- .../distribution/mapper/DistributionStockupMapper.xml | 2 +- .../service/impl/DistributionAsyncServiceImpl.java | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) 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 b3342b18f..7824aea2f 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 @@ -1425,7 +1425,7 @@ public class DistributionStockupAppController extends BladeController { entity.setOutboundType(stockupEntity.getTypeService()); distributionStockService.save(entity); // //修改备货时间 -// distributionAsyncService.updateStockupDate(stockupDTO); + distributionAsyncService.updateStockupStockListDate(stockupDTO); // dataSourceTransactionManager.commit(transactionStatus);//提交 Map map = new HashMap<>(); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 2999bcf1a..16e712743 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -927,7 +927,7 @@ from logpm_warehouse_updown_goods where association_id = ldsii.material_id and association_type = 4 and market_id =ldsii.market_id and incoming_batch = ldsii.incoming_batch - ) goodsAllocation,ldrsi.stock_status stockStatus,ldsii.start_time_stocking startTimeStocking,ldsii.end_time_stocking endTimeStocking + ) goodsAllocation,ldrsi.stock_status stockStatus,ldrsi.start_time_stocking startTimeStocking,ldrsi.end_time_stocking endTimeStocking from logpm_distribution_stockup_info ldsi LEFT JOIN logpm_distribution_reservation_stocklist ldrsi on ldrsi.reservation_id = ldsi.reservation_id LEFT JOIN logpm_distribution_stock_list ldsii on ldsii.id = ldrsi.stocklist_id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java index 2c45e3773..6ae59838a 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionAsyncServiceImpl.java @@ -1720,7 +1720,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { case 2: //库存品 billLadingEntity1.setReserveQuantity(billLadingEntity1.getReserveQuantity() + 1); - updateStockupStockListDate(stockupDTO); +// updateStockupStockListDate(stockupDTO); break; } distrilbutionBillLadingMapper.updateById(billLadingEntity1); @@ -1743,7 +1743,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { case 2: //库存品 reservationEntity.setReserveQuantity(distributionReservationEntity.getReserveQuantity() + 1); - updateStockupStockListDate(stockupDTO); +// updateStockupStockListDate(stockupDTO); break; } //计算是否完成 @@ -1766,6 +1766,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { * 备货库存品备货时间回显 */ @Override + @Async public void updateStockupStockListDate(StockupDTO stockupDTO) { Integer scanType = stockupDTO.getScanType();//扫码类型 1 包件 2库存品 Long reservationId = stockupDTO.getReservationId();//预约ID @@ -1811,7 +1812,7 @@ public class DistributionAsyncServiceImpl implements IDistributionAsyncService { } distributionDeliveryDetailsService.updateById(entity); } else { - //预约的库存品 + //预约的库存品 商 市 DistributionReservationStocklistEntity one1 = distributionReservationStocklistMapper.selectOne(Wrappers.query().lambda() .eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId()) .eq(DistributionReservationStocklistEntity::getStocklistId, stockupDTO.getStockListId())