修改pda库存扫描数量不增加

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<String, Object> map = new HashMap<>();

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

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.<DistributionReservationStocklistEntity>query().lambda()
 				.eq(DistributionReservationStocklistEntity::getReservationId, stockupDTO.getReservationId())
 				.eq(DistributionReservationStocklistEntity::getStocklistId, stockupDTO.getStockListId())