| 
					
				 | 
			
			
				@@ -49,9 +49,7 @@ import com.ruoyi.warehouseBusiness.domain.dto.CalculateStorageFeesDTO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.domain.enums.FeesTypeEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.domain.enums.WarehouseActIdEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.domain.enums.WarehouseTypeEnum; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ruoyi.warehouseBusiness.domain.vo.AppWarehouseInfoVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ruoyi.warehouseBusiness.domain.vo.CalculateStorageFeesInfoVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-import com.ruoyi.warehouseBusiness.domain.vo.StorageFeeCalculationResultVO; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+import com.ruoyi.warehouseBusiness.domain.vo.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.excel.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.mapper.*; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import com.ruoyi.warehouseBusiness.service.ITWarehouseBillsService; 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -7111,6 +7109,38 @@ public class TWarehouseBillsServiceImpl implements ITWarehouseBillsService { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 货转根据提单号查询可用客户、仓库信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @param fMblno 提单号 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     * @return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+     */ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    @Override 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    public AjaxResult corpOrWarehouseByMblno(String fMblno) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        WarehouseBillsVO billsVO = new WarehouseBillsVO(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        // 查询符合条件的库存总帐 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        TWhgenleg tWhgenleg = new TWhgenleg(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        tWhgenleg.setfMblno(fMblno); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        List<TWhgenleg> tWhgenlegs = tWhgenlegMapper.selectTWhgenlegList(tWhgenleg); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        if (CollectionUtils.isNotEmpty(tWhgenlegs)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 查询仓库信息 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Long> warehouseIds = tWhgenlegs.stream().filter(leg -> Objects.nonNull(leg.getfWarehouseid())).map(TWhgenleg::getfWarehouseid) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    .distinct().collect(toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (CollectionUtils.isNotEmpty(warehouseIds)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<TWarehouse> warehouseList = tWarehouseMapper.selectByIds(warehouseIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                billsVO.setWarehouseList(warehouseList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            // 查询客户 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            List<Long> corpIds = tWhgenlegs.stream().filter(leg -> Objects.nonNull(leg.getfCorpid())).map(TWhgenleg::getfCorpid) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    .distinct().collect(toList()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (CollectionUtils.isNotEmpty(corpIds)) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                List<TCorps> corpsList = tCorpsMapper.selectByIds(corpIds); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                billsVO.setCorpsList(corpsList); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        return AjaxResult.success(billsVO); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    /** 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 如果是入库 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				      * @param infoVO 
			 |