|  | @@ -5,10 +5,16 @@ import com.ruoyi.basicData.domain.TGoods;
 | 
											
												
													
														|  |  import com.ruoyi.basicData.mapper.TFeesMapper;
 |  |  import com.ruoyi.basicData.mapper.TFeesMapper;
 | 
											
												
													
														|  |  import com.ruoyi.basicData.service.ITFeesService;
 |  |  import com.ruoyi.basicData.service.ITFeesService;
 | 
											
												
													
														|  |  import com.ruoyi.common.constant.UserConstants;
 |  |  import com.ruoyi.common.constant.UserConstants;
 | 
											
												
													
														|  | 
 |  | +import com.ruoyi.common.core.domain.AjaxResult;
 | 
											
												
													
														|  |  import com.ruoyi.common.utils.DateUtils;
 |  |  import com.ruoyi.common.utils.DateUtils;
 | 
											
												
													
														|  |  import com.ruoyi.common.utils.StringUtils;
 |  |  import com.ruoyi.common.utils.StringUtils;
 | 
											
												
													
														|  | 
 |  | +import com.ruoyi.warehouseBusiness.domain.TWarehousebillsfees;
 | 
											
												
													
														|  | 
 |  | +import com.ruoyi.warehouseBusiness.domain.TWarehousebillsitems;
 | 
											
												
													
														|  | 
 |  | +import com.ruoyi.warehouseBusiness.mapper.TWarehousebillsfeesMapper;
 | 
											
												
													
														|  |  import org.springframework.beans.factory.annotation.Autowired;
 |  |  import org.springframework.beans.factory.annotation.Autowired;
 | 
											
												
													
														|  |  import org.springframework.stereotype.Service;
 |  |  import org.springframework.stereotype.Service;
 | 
											
												
													
														|  | 
 |  | +import org.springframework.transaction.annotation.Transactional;
 | 
											
												
													
														|  | 
 |  | +import org.springframework.transaction.interceptor.TransactionAspectSupport;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |  import java.util.List;
 |  |  import java.util.List;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
										
											
												
													
														|  | @@ -23,6 +29,8 @@ public class TFeesServiceImpl implements ITFeesService {
 | 
											
												
													
														|  |      @Autowired
 |  |      @Autowired
 | 
											
												
													
														|  |      private TFeesMapper tFeesMapper;
 |  |      private TFeesMapper tFeesMapper;
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  | 
 |  | +    @Autowired
 | 
											
												
													
														|  | 
 |  | +    private TWarehousebillsfeesMapper tWarehousebillsfeesMapper;
 | 
											
												
													
														|  |      /**
 |  |      /**
 | 
											
												
													
														|  |       * 查询费用信息
 |  |       * 查询费用信息
 | 
											
												
													
														|  |       *
 |  |       *
 | 
											
										
											
												
													
														|  | @@ -76,8 +84,22 @@ public class TFeesServiceImpl implements ITFeesService {
 | 
											
												
													
														|  |       * @return 结果
 |  |       * @return 结果
 | 
											
												
													
														|  |       */
 |  |       */
 | 
											
												
													
														|  |      @Override
 |  |      @Override
 | 
											
												
													
														|  | -    public int deleteTFeesByIds(Long[] fIds) {
 |  | 
 | 
											
												
													
														|  | -        return tFeesMapper.deleteTFeesByIds(fIds);
 |  | 
 | 
											
												
													
														|  | 
 |  | +    @Transactional
 | 
											
												
													
														|  | 
 |  | +    public AjaxResult deleteTFeesByIds(Long[] fIds) {
 | 
											
												
													
														|  | 
 |  | +        // return tFeesMapper.deleteTFeesByIds(fIds);
 | 
											
												
													
														|  | 
 |  | +        int i = 1;
 | 
											
												
													
														|  | 
 |  | +        for(Long id:fIds){
 | 
											
												
													
														|  | 
 |  | +            TWarehousebillsfees tWarehousebillsfees =new TWarehousebillsfees();
 | 
											
												
													
														|  | 
 |  | +            tWarehousebillsfees.setfFeeid(id);
 | 
											
												
													
														|  | 
 |  | +            List<TWarehousebillsfees> TWarehousebillsfeesList =tWarehousebillsfeesMapper.selectTWarehousebillsfeesList(tWarehousebillsfees);
 | 
											
												
													
														|  | 
 |  | +            if(TWarehousebillsfeesList!=null && !TWarehousebillsfeesList.isEmpty()){
 | 
											
												
													
														|  | 
 |  | +                TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
 | 
											
												
													
														|  | 
 |  | +                return AjaxResult.error("费用第" + i + "行不可删除");
 | 
											
												
													
														|  | 
 |  | +            }
 | 
											
												
													
														|  | 
 |  | +            tFeesMapper.deleteTFeesById(id);
 | 
											
												
													
														|  | 
 |  | +            i++;
 | 
											
												
													
														|  | 
 |  | +        }
 | 
											
												
													
														|  | 
 |  | +        return AjaxResult.success();
 | 
											
												
													
														|  |      }
 |  |      }
 | 
											
												
													
														|  |  
 |  |  
 | 
											
												
													
														|  |      /**
 |  |      /**
 |