Merge branch 'dev' into pre-production

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/controller/DistributionStockArticleController.java

@@ -247,10 +247,10 @@ public class DistributionStockArticleController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入distributionStockArticle")
 	public R<IPage<DistributionStockArticleVO>> clientList(@ApiIgnore  DistributionStockArticleVO distributionStockArticle, Query query) {
-		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
-		if (Func.isEmpty(myCurrentWarehouse)){
-			return R.fail("无仓库信息!!!");
-		}
+//		BasicdataWarehouseEntity myCurrentWarehouse = warehouseClient.getMyCurrentWarehouse();
+//		if (Func.isEmpty(myCurrentWarehouse)){
+//			return R.fail("无仓库信息!!!");
+//		}
 		//获取当前登录人仓库
 //		List<BasicdataWarehouseEntity> myWatchWarehouse = warehouseClient.getMyWatchWarehouse();
 //		List<Long> collect = myWatchWarehouse.stream()

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

@@ -56,7 +56,7 @@ public interface DisStockListDetailMapper extends BaseMapper<DisStockListDetailE
 	 * 删除该客户下指定库存品类的库存品包件信息
 	 * @param id
 	 */
-    void deleteInventoryByStockListId(@Param("reservationStockListId") Long id);
+    void deleteInventoryByStockListId(@Param("stockListId") Long id ,@Param("reservationId")Long reservationId);
 
 	/**
 	 * 删除客户下的库存品包件信息

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

@@ -30,7 +30,7 @@
         <result column="reserve5" property="reserve5"/>
     </resultMap>
     <delete id="deleteInventoryByStockListId">
-        DELETE  FROM  logpm_dis_stock_list_detail WHERE reservation_stock_list_id = #{reservationStockListId}
+        DELETE  FROM  logpm_dis_stock_list_detail WHERE stock_list_id = #{stockListId} and reservation_id = #{reservationId}
     </delete>
 
 

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

@@ -1700,12 +1700,11 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 			Integer newQuantityOccupied = distributionStockListEntity.getQuantityOccupied() - reservationNum;
 			distributionStockListEntity.setQuantityOccupied(newQuantityOccupied);
 			distributionStockListService.updateById(distributionStockListEntity);
-			disStockListDetailMapper.deleteInventoryByStockListId(distributionReservationStocklistEntity.getId());
+			disStockListDetailMapper.deleteInventoryByStockListId(distributionReservationStocklistEntity.getStocklistId(),distributionReservationStocklistEntity.getReservationId());
 			List<DisStockListDetailEntity> list = disStockListDetailService.list(Wrappers.<DisStockListDetailEntity>query().lambda()
 				.eq(DisStockListDetailEntity::getReservationId, distributionReservationStocklistEntity.getReservationId()).eq(DisStockListDetailEntity::getStockListId, distributionReservationStocklistEntity.getStocklistId()));
 			list.forEach(l -> l.setStockPackageStatus(InventoryPackageStatusConstant.quxiao.getValue()));
 			disStockListDetailService.updateBatchById(list);
-			//TODO 删除库存品包件信息
 		});
 		DistributionReservationEntity reservationEntity = this.getById(id);
 		Integer reservationNum = reservationEntity.getReservationNum();

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

@@ -47,6 +47,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.DistributionTypeConstant;
 import org.springblade.core.log.exception.ServiceException;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -368,7 +369,7 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 		List<BasicdataClientEntity> basicdataClientUserEntityListByUserIds = basicdataClientClient.getBasicdataClientUserEntityListByUserId(AuthUtil.getUserId());
 		List clientIds =null;
 		if(Func.isNotEmpty(basicdataClientUserEntityListByUserIds)){
-			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(e -> e.getId()).collect(Collectors.toList());
+			 clientIds = basicdataClientUserEntityListByUserIds.stream().map(BaseEntity::getId).collect(Collectors.toList());
 		}
 		IPage<DistributionStockListVO> page1= baseMapper.pageClinet(page,distributionStockListEntity,clientIds);
 		return  page1;