|  | @@ -20,7 +20,7 @@
 | 
											
												
													
														|  |      <select id="queryByCostHead" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
 |  |      <select id="queryByCostHead" resultType="org.jeecg.modules.cost.entity.SyCostAllocation">
 | 
											
												
													
														|  |           SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,
 |  |           SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'101' as pkOrg,
 | 
											
												
													
														|  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
 |  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales,
 | 
											
												
													
														|  | -            STRING_AGG(ss.cSOCode,',') as garmentContractno,max(de.cDepName) as department,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
 | 
											
												
													
														|  |              max(cc.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 |  |              max(cc.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 | 
											
												
													
														|  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 |  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 | 
											
												
													
														|  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 |  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 | 
											
										
											
												
													
														|  | @@ -51,7 +51,7 @@
 | 
											
												
													
														|  |          
 |  |          
 | 
											
												
													
														|  |          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'103' as pkOrg,
 |  |          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'103' as pkOrg,
 | 
											
												
													
														|  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
 |  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
 | 
											
												
													
														|  | -            STRING_AGG(ss.cSOCode,',') as garmentContractno,max(de.cDepName) as department,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
 | 
											
												
													
														|  |              max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 |  |              max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 | 
											
												
													
														|  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 |  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 | 
											
												
													
														|  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 |  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 | 
											
										
											
												
													
														|  | @@ -89,7 +89,7 @@
 | 
											
												
													
														|  |          
 |  |          
 | 
											
												
													
														|  |          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'103' as pkOrg,
 |  |          SELECT max(ss.iExchRate) as exchangeRate,min(s.iTaxUnitPrice) as soPrice,'103' as pkOrg,
 | 
											
												
													
														|  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
 |  |              max(o.omCode) as planNum,max(s.cdefine22) as poStyleNum,max(pe.cPersonName) as exportSales, 
 | 
											
												
													
														|  | -            STRING_AGG(ss.cSOCode,',') as garmentContractno,max(de.cDepName) as department,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            max(ss.cSOCode) as garmentContractno,max(de.cDepName) as department,
 | 
											
												
													
														|  |              max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 |  |              max(cu.cCusAbbName) as customerShortame,v.cVenAbbName as processUnit,
 | 
											
												
													
														|  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 |  |              max(ss.iTaxRate) as taxrate,max(ss.cMaker) as preparedBy,sum(s.iNatSum) as salesordersLocaltotal, 
 | 
											
												
													
														|  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 |  |              sum(s.iSum) as salesrrdersOriginaltotal,sum(o.iQuantity) as planQuantity    
 |