备货扫描BUG修复

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistrilbutionBillLadingMapper.xml

@@ -606,7 +606,7 @@
     </select>
 
     <select id="getInventory" resultType="com.logpm.distribution.vo.DistrilbutionBillLadingAppVO">
-        select ldbl.id ,lddd.stock_list_id stockListId,IFNULL(sum(lddd.quantity),0),,ldsl.description_goods
+        select ldbl.id ,lddd.stock_list_id stockListId,IFNULL(sum(lddd.quantity),0) AS quantity,ldsl.description_goods
         descriptionGoods,ldsl.cargo_unit cargoUnit,ldsl.sku,ldsl.cargo_number,(
         select count(1)
         from logpm_distribution_stock lds

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

@@ -333,9 +333,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 				if ("1".equals(i.getStockStatus())) {
 					DistributionStockListEntity stockEntity = new DistributionStockListEntity();
-					stockEntity.setId(i.getStockListId());
-					stockEntity.setQuantityStock(i.getQuantity());
-					stockEntityList.add(stockEntity);
+					distributionStockListMapper.deductionQuantityStock(i.getStockListId(),i.getQuantity());
 					dd.add(i.getId());
 				} else {
 					throw new ServiceException("包含已备货的库存品，无法取消！！！");
@@ -355,7 +353,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						DistributionStockListEntity byId = distributionStockListService.getById(i.getId());
 						DistributionStockListEntity updateWrapper = new DistributionStockListEntity();
 						updateWrapper.setId(i.getId());
-						updateWrapper.setQuantityStock(i.getQuantityStock() + byId.getQuantityStock());
+						updateWrapper.setQuantityStock(i.getQuantityStock());
 						distributionStockListService.updateById(updateWrapper);
 					});
 				}
@@ -3344,6 +3342,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 			List<DisStockListDetailEntity> listed = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 				.eq(DisStockListDetailEntity::getReservationId, i.getId())
 				.eq(DisStockListDetailEntity::getSku, i.getSku())
+				.eq(DisStockListDetailEntity::getStockListId, i.getStockListId())
 				.ne(DisStockListDetailEntity::getStockPackageStatus, ReservationPackageStatusConstant.quxiao.getValue())
 			);
 			if (Func.isNotEmpty(listed)) {