| 
					
				 | 
			
			
				@@ -1022,7 +1022,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					 List<DictModel> test = sysDictService.queryDictItemsByCode("company_title"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 					 if (oConvertUtils.isNotEmpty(list.get(0).getPkOrg())) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						 if (list.get(0).getPkOrg().equals("901")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						 if (list.get(0).getPkOrg().equals("101")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 String split[] = test.get(0).getValue().split("\\+"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 for (int i = 0; i < split.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								 Map<String, Object> maiTou = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1030,7 +1030,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								 taitouList.add(maiTou); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 entity.setClientAbbreviation(split[0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						 } else if (list.get(0).getPkOrg().equals("902")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						 } else if (list.get(0).getPkOrg().equals("102")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 String split[] = test.get(1).getValue().split("\\+"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 for (int i = 0; i < split.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								 Map<String, Object> maiTou = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1038,7 +1038,7 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								 taitouList.add(maiTou); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 entity.setClientAbbreviation(split[0]); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-						 }if (list.get(0).getPkOrg().equals("903")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+						 }if (list.get(0).getPkOrg().equals("103")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 String split[] = test.get(1).getValue().split("\\+"); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 							 for (int i = 0; i < split.length; i++) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 								 Map<String, Object> maiTou = new HashMap<>(); 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1538,11 +1538,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 map.put("rateDate",rateDate); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 int i = 0; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			 if (itemList.get(0).getPkOrg().equals("901")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			 if (itemList.get(0).getPkOrg().equals("101")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				 i = syShippingOrderService.saveSalePayVouchOne(map, listmap, rmbmap, usdmap); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			 } else if (itemList.get(0).getPkOrg().equals("902")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			 } else if (itemList.get(0).getPkOrg().equals("102")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				 i = syShippingOrderService.saveSalePayVouchTwo(map, listmap, rmbmap, usdmap); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-			 } else if (itemList.get(0).getPkOrg().equals("903")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+			 } else if (itemList.get(0).getPkOrg().equals("103")) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 				 i = syShippingOrderService.saveSalePayVouchThree(map, listmap, rmbmap, usdmap); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -1583,11 +1583,11 @@ public class SyShippingOrderController extends JeecgController<SyShippingOrder, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 Result<List<SyShippingOrder>> result = new Result<List<SyShippingOrder>>(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 List<SyShippingOrder> list = null; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		 if(pkorg.equals("903")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 if(pkorg.equals("103")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			list = syShippingOrderService.queryU8ventoryThree(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		 }else if(pkorg.equals("902")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 }else if(pkorg.equals("102")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 list = syShippingOrderService.queryU8ventoryTwo(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		 }else if(pkorg.equals("901")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		 }else if(pkorg.equals("101")){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 			 list = syShippingOrderService.queryU8ventoryOne(); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 |