Merge remote-tracking branch 'origin/dev' into dev

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

@@ -5509,7 +5509,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 
 	@Override
 	public void maintainBillStockUpEntity(Long stockupId) {
-//查询此备货任务所关联的包件信息
+		//查询此备货任务所关联的包件信息
 		List<DistributionParcelListEntity> packageEntityList= baseMapper.selectBillStockupPackageEntityList(stockupId);
 		List<DisStockListDetailEntity> inventoryList = baseMapper.selectBillStockupInventoryEntityList(stockupId);
 		List<DistributionReservationZeroPackageEntity> zeroEntityList = baseMapper.selectBillStockupZeroEntityList(stockupId);

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

@@ -333,7 +333,7 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 				}
 				if ("1".equals(i.getStockStatus())) {
 					DistributionStockListEntity stockEntity = new DistributionStockListEntity();
-					distributionStockListMapper.deductionQuantityStock(i.getStockListId(),i.getQuantity());
+					distributionStockListMapper.decreaseStockListQuantityOccupied(i.getStockListId(),i.getQuantity());
 					dd.add(i.getId());
 				} else {
 					throw new ServiceException("包含已备货的库存品，无法取消！！！");
@@ -355,6 +355,8 @@ public class DistrilbutionBillLadingServiceImpl extends BaseServiceImpl<Distrilb
 						updateWrapper.setId(i.getId());
 						updateWrapper.setQuantityStock(i.getQuantityStock());
 						distributionStockListService.updateById(updateWrapper);
+//											distributionStockListMapper.deductionQuantityStock(i.getStockListId(),i.getQuantity());
+
 					});
 				}
 			} catch (Exception e) {