|
|
@@ -9,7 +9,7 @@ select a.id as id,GROUP_CONCAT(b.id) as itemId,a.item_number as itemNumber,a.pre
|
|
|
a.memo,a.customer,b.colour,sum(b.box_number) as boxNumber,b.ac_set_no as acSetNo,sum(b.total) as total,a.customer_abbreviation as customerAbbreviation,
|
|
|
sum(b.total_net_weight) as totalNetWeight,a.order_type as orderType,b.total_quantity as totalQuantity,b.small_Po as smallPo,b.unit_price as unitPrice,
|
|
|
sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,sum(b.total_price) as totalPrice,b.factory_unit_price as factoryUnitPrice,
|
|
|
-a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,
|
|
|
+a.depositary_receipt_no as depositaryReceiptNo,b.spur_or_sub_order as spurOrSubOrder,sum(b.pieces_box) as piecesBox,b.size,a.order_number as orderNumber,
|
|
|
b.starting_box_number as startingBoxNumber,b.end_case_number as endCaseNumber,b.outer_box_length as outerBoxLength,b.outer_box_width as outerBoxWidth,b.outer_box_height as outerBoxHeight,
|
|
|
b.garment_factory as garmentFactory,b.hod as hod,b.style_no as styleNo,b.prepack_sku as prepackSku,a.salesman as salesman,a.sales_department
|
|
|
from sy_pre_assembled_packing_list_item b
|
|
|
@@ -78,15 +78,27 @@ on a.id = b.sy_pre_assembled_packing_list_id
|
|
|
<!-- </select>-->
|
|
|
|
|
|
<select id="querySyLetterDeposit" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDeposit">
|
|
|
-select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,a.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
|
|
|
+select a.id as id,a.depositary_receipt_no as depositaryReceiptNo,b.order_number as orderNumber,a.export_invoice_no as exportInvoiceNo,
|
|
|
a.client_abbreviation as clientAbbreviation,
|
|
|
-a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,b.box_number as boxNumber,b.total_gross_weight as totalGrossWeight,b.total_volume as totalVolume,
|
|
|
-a.money as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
|
|
|
+a.the_distribution as theDistribution,a.unit_in_operation as unitInOperation,sum(b.box_number) as boxNumber,sum(b.total_gross_weight) as totalGrossWeight,sum(b.total_volume) as totalVolume,
|
|
|
+sum(a.money) as money,a.the_actual_shipping_date as theActualShippingDate,a.exchange_earnings_text as exchangeEarningsText,a.consignee as consignee,a.bill_of_lading_or_carriage_receipt as billOfLadingOrCarriageReceipt,
|
|
|
a.addressee as addressee,a.trade_country as tradeCountry,a.arrive_in_country as arriveInCountry,a.export_port as exportPort,a.notifier as notifier,a.nottfy as nottfy,a.destination_port as destinationPort,
|
|
|
a.the_documents_state as theDocumentsState from sy_letter_deposit a
|
|
|
left join sy_letter_deposit_item b
|
|
|
on a.id = b.sy_letter_deposit_id
|
|
|
${ew.customSqlSegment}
|
|
|
|
|
|
+ </select>
|
|
|
+
|
|
|
+ <select id="queryItem" resultType="org.jeecg.modules.documents.letterDeposit.entity.SyLetterDepositItem">
|
|
|
+
|
|
|
+ select item_number as itemNumber,small_po as smallPo,total,box_number as boxNumber,
|
|
|
+total_gross_weight as totalGrossWeight,total_net_weight as totalNetWeight,total_volume as totalVolume,distribution_point as distributionPoint,
|
|
|
+container_code as containerCode,container_number as containerNumber,unit_price as unitPrice,total_price as totalPrice,
|
|
|
+hod
|
|
|
+ from sy_letter_deposit_item
|
|
|
+ where del_flag = 0 group by letter_groupid
|
|
|
+
|
|
|
+
|
|
|
</select>
|
|
|
</mapper>
|
zengtx