| 
					
				 | 
			
			
				@@ -144,7 +144,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cdefine1 as thirdParty," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cdefine3 as customerOrderNumber," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cdefine11 as endCustomer," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "s.cCusCode as supplierCode," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        "s.cCusCode as customerCode," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "v.cVenAbbName as supplier," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.fbookratio AS depositRatio," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.iMoney AS deposit," + 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -204,7 +204,7 @@ public class SyOrderDataServiceImpl extends ServiceImpl<SyOrderDataMapper, SyOrd 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cDefine28 AS smallPo," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cDefine29 AS distributionPoint," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cInvCode AS inventoryCode," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                        "s.cInvName AS inventoryName," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                        "c.cInvName AS inventoryName," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cFree1 AS colour," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cFree2 AS size," + 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                         "s.cFree3 AS codingRules," + 
			 |