|
|
@@ -71,21 +71,21 @@ a.end_customer) as endCustomer,
|
|
|
b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,b.order_date as orderDate,b.inventory_ccode as inventoryCcode,
|
|
|
sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,sum(b.order_quantity) as orderQuantity,
|
|
|
b.is_tc as isTc,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
|
|
|
- b.arrival_date as arrivalDate,b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
|
|
|
+ b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
|
|
|
b.pur_or_sub_order as purOrSubOrder,a.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,
|
|
|
b.material_composition as materialComposition,b.currency_text as currencyText,b.brand_side as brandSide,b.deposit_ratio as depositRatio,
|
|
|
- b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,
|
|
|
+ b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,b.type_of_shipping as typeOfShipping,
|
|
|
if(left(b.inventory_ccode,2)='19',
|
|
|
case customer_abbreviation
|
|
|
when 'International Apparel Group' then end_customer
|
|
|
when '宁波森语' then end_customer
|
|
|
else customer_abbreviation end ,
|
|
|
- end_customer) as endCustomer,
|
|
|
+ end_customer) as endCustomer,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
|
|
|
b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
|
|
|
b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
|
|
|
b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,b.supplier as supplier,
|
|
|
b.garment_factory as garmentFactory,b.elements_id as elementsId,b.coding_rules as codingRules,b.colour as colour,b.group_id as groupId,
|
|
|
- c.declaration_name as declarationName,c.hs_code as hsCode,c.english_product_name as englishProductName,b.d_arrive_date as dArriveDate
|
|
|
+ c.declaration_name as declarationName,c.hs_code as hsCode,c.english_product_name as englishProductName,FROM_UNIXTIME(left(b.d_arrive_date,10),'%Y-%m-%d') as arrivalDate
|
|
|
from sy_shipping_details a
|
|
|
left join sy_shipping_details_item b
|
|
|
on a.id = b.shipping_details_id and b.del_flag = 0
|
|
|
@@ -104,21 +104,21 @@ ${ew.customSqlSegment} and t.inventoryCcode LIKE '19%' order by t.itemNumber,t.
|
|
|
b.small_po as smallPo,b.pack_id as packId,b.pre_delivery_date as preDeliveryDate,b.order_date as orderDate,b.inventory_ccode as inventoryCcode,
|
|
|
sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,sum(b.order_quantity) as orderQuantity,
|
|
|
b.is_tc as isTc,b.distribution_point as distributionPoint,b.item_number as itemNumber,b.business_type_text as businessTypeText,
|
|
|
- b.arrival_date as arrivalDate,b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
|
|
|
+ b.inventory_name as inventoryName,b.sales_unit_price as salesUnitPrice,b.order_remaining_quantity as orderRemainingQuantity,
|
|
|
b.pur_or_sub_order as purOrSubOrder,a.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,
|
|
|
b.material_composition as materialComposition,b.currency_text as currencyText,b.brand_side as brandSide,b.deposit_ratio as depositRatio,
|
|
|
- b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,
|
|
|
+ b.deposit as deposit,b.collaborative_route as collaborativeRoute,b.term_of_payment as termOfPayment,b.type_of_shipping as typeOfShipping,
|
|
|
if(left(b.inventory_ccode,2)='19',
|
|
|
case customer_abbreviation
|
|
|
when 'International Apparel Group' then end_customer
|
|
|
when '宁波森语' then end_customer
|
|
|
else customer_abbreviation end ,
|
|
|
- end_customer) as endCustomer,
|
|
|
+ end_customer) as endCustomer,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
|
|
|
b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,b.pre_completion_date as preCompletionDate,
|
|
|
b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,a.whole_order_total as wholeOrderTotal,
|
|
|
b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,a.chinese_name as chineseName,b.account as account,b.supplier as supplier,
|
|
|
b.garment_factory as garmentFactory,b.elements_id as elementsId,b.coding_rules as codingRules,b.colour as colour,b.group_id as groupId,
|
|
|
- c.declaration_name as declarationName,c.hs_code as hsCode,c.english_product_name as englishProductName,b.d_arrive_date as dArriveDate
|
|
|
+ c.declaration_name as declarationName,c.hs_code as hsCode,c.english_product_name as englishProductName,FROM_UNIXTIME(left(b.d_arrive_date,10),'%Y-%m-%d') as arrivalDate
|
|
|
from sy_shipping_details a
|
|
|
left join sy_shipping_details_item b
|
|
|
on a.id = b.shipping_details_id and b.del_flag = 0
|
|
|
@@ -184,7 +184,7 @@ ${ew.customSqlSegment} and t.inventoryCcode not LIKE '19%'
|
|
|
when '宁波森语' then a.end_customer
|
|
|
else a.customer_abbreviation end ,
|
|
|
a.end_customer) as endCustomer,
|
|
|
- b.is_tc as isTc,
|
|
|
+ b.is_tc as isTc,b.inventory_currency_name as inventoryCurrencyName,b.inventory_english_name as inventoryEnglishName,
|
|
|
a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription,b.supplier as supplier,b.i_tax_price as iTaxPrice,
|
|
|
case when b.ymoney is null then '0' else b.ymoney end as ymoney,b.ompo_id as ompoId,b.inventory_ccode as inventoryCcode,b.d_arrive_date as dArriveDate,b.master_metering as masterMetering,
|
|
|
b.ompo_id_item as ompoIdItem,b.ompo_account as ompoAccount,b.ompo_code as purOrSubOrder,b.r_supplier_code as rSupplierCode,b.r_supplier as rSupplier
|
zengtx