|  | @@ -108,7 +108,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 | 
											
												
													
														|  |              sum(t.boxNumber) as boxNumber,t.pkOrg,
 |  |              sum(t.boxNumber) as boxNumber,t.pkOrg,
 | 
											
												
													
														|  |              sum(t.grossWeight) as grossWeight,
 |  |              sum(t.grossWeight) as grossWeight,
 | 
											
												
													
														|  |              sum(t.netWeight) as netWeight,
 |  |              sum(t.netWeight) as netWeight,
 | 
											
												
													
														|  | -            sum(t.totalPrice) as totalPrice,
 |  | 
 | 
											
												
													
														|  | 
 |  | +            round(sum(t.totalPrice),2) as totalPrice,
 | 
											
												
													
														|  |              sum(t.volume) as volume,
 |  |              sum(t.volume) as volume,
 | 
											
												
													
														|  |              t.distributionPoint, t.containerCode, t.containerNumber, t.unitPrice, t.preShipmentDate,
 |  |              t.distributionPoint, t.containerCode, t.containerNumber, t.unitPrice, t.preShipmentDate,
 | 
											
												
													
														|  |              t.salesman, t.operatingDepartment, t.purOrSubOrder,
 |  |              t.salesman, t.operatingDepartment, t.purOrSubOrder,
 | 
											
										
											
												
													
														|  | @@ -122,7 +122,7 @@ d.terms_of_deliveryvalue as termsOfDeliveryvalue
 | 
											
												
													
														|  |              case when a.ready_fabric != '成衣' then sum(a.box_number) else a.box_number end as boxNumber,a.pk_org as pkOrg,
 |  |              case when a.ready_fabric != '成衣' then sum(a.box_number) else a.box_number end as boxNumber,a.pk_org as pkOrg,
 | 
											
												
													
														|  |              case when a.ready_fabric != '成衣' then sum(a.gross_weight) else a.gross_weight end as grossWeight,
 |  |              case when a.ready_fabric != '成衣' then sum(a.gross_weight) else a.gross_weight end as grossWeight,
 | 
											
												
													
														|  |              case when a.ready_fabric != '成衣' then sum(a.net_weight) else a.net_weight end as netWeight,
 |  |              case when a.ready_fabric != '成衣' then sum(a.net_weight) else a.net_weight end as netWeight,
 | 
											
												
													
														|  | -            case when a.ready_fabric != '成衣' then a.volume else a.volume end as volume,round(sum(a.total_price),2) as
 |  | 
 | 
											
												
													
														|  | 
 |  | +            case when a.ready_fabric != '成衣' then a.volume else a.volume end as volume,sum(a.number*a.unit_price) as
 | 
											
												
													
														|  |              totalPrice,
 |  |              totalPrice,
 | 
											
												
													
														|  |              a.distribution_point as distributionPoint, a.container_code as containerCode, a.container_number as
 |  |              a.distribution_point as distributionPoint, a.container_code as containerCode, a.container_number as
 | 
											
												
													
														|  |              containerNumber, a.unit_price as unitPrice, a.pre_shipment_date as preShipmentDate,
 |  |              containerNumber, a.unit_price as unitPrice, a.pre_shipment_date as preShipmentDate,
 |