|
|
@@ -5,12 +5,19 @@
|
|
|
<select id="syShippingOrderPageList" resultType="org.jeecg.modules.documents.syShippingOrder.entity.SyShippingOrder">
|
|
|
|
|
|
select t.id, t.shippingOrderNumber, t.garmentFactory,t.clientAbbreviation,t.theFinalShippingDate,t.theDocumentsState,
|
|
|
-round(sum(t.totalPrice),2) as money,round(sum(t.grossWeight),2) as totalGrossWeight,sum(t.boxNumber) as boxNumber,t.syStuta,
|
|
|
+<!--round(sum(t.totalPrice),2) as money,-->
|
|
|
+ t.totalPrice as money,
|
|
|
+round(sum(t.grossWeight),2) as totalGrossWeight,
|
|
|
+<!--sum(t.boxNumber) as boxNumber,-->
|
|
|
+ t.boxNumber,
|
|
|
+t.syStuta,
|
|
|
t.exportInvoiceNo,t.orderNumber,t.shippingOrderDate,t.smailPo,t.readyFabric,t.pkOrg,t.delFlag,t.distributionPoint,t.isAhaa,
|
|
|
-round(sum(t.volume),3) as totalVolume,t.unitInOperation,t.timeStuta,t.timeMesage,t.failMesage from (
|
|
|
+t.volume as totalVolume,t.unitInOperation,t.timeStuta,t.timeMesage,t.failMesage from (
|
|
|
select a.time_stuta as timeStuta,a.time_mesage as timeMesage,a.fail_mesage as failMesage,a.id as id,a.shipping_order_number as shippingOrderNumber,b.garment_factory as garmentFactory,
|
|
|
-b.client_abbreviation as clientAbbreviation,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,
|
|
|
-b.gross_weight as grossWeight,b.volume as volume,round(sum(b.number*b.unit_price),2) as totalPrice,
|
|
|
+b.client_abbreviation as clientAbbreviation,a.unit_in_operation as unitInOperation,a.box_number as boxNumber,
|
|
|
+sum(b.gross_weight) as grossWeight,a.total_volume as volume,
|
|
|
+<!--round(sum(b.number*b.unit_price),2) as totalPrice,-->
|
|
|
+a.money as totalPrice,
|
|
|
a.the_final_shipping_date as theFinalShippingDate,a.export_invoice_no as exportInvoiceNo,
|
|
|
b.order_number as orderNumber,a.shipping_order_date as shippingOrderDate,b.smail_po as smailPo,b.ready_fabric as readyFabric,
|
|
|
b.pk_org as pkOrg,a.del_flag as delFlag,b.distribution_point as distributionPoint, a.the_documents_state as theDocumentsState,
|
