|
|
@@ -4,11 +4,11 @@
|
|
|
|
|
|
<select id="queryOrderData" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.OrderDataVo">
|
|
|
|
|
|
- select a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
|
|
|
+ select b.sy_order_data_id as syOrderDataId,b.id as syOrderDataItemId ,a.order_number as orderNumber,b.item_number as itemNumber,b.small_po as smallPo,b.pk_org as pkOrg,a.order_date as orderDate,b.inventory_name as inventoryName,
|
|
|
b.colour as colour,b.size as size,b.coding_rules as codingRules,b.quantity as quantity,a.business_type_text as businessTypeText,a.customer_order_number as customerOrderNumber,
|
|
|
- a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,surplus_num as surplusNum,
|
|
|
+ a.sales_type_text as salesTypeText,a.customer_abbreviation as customerAbbreviation,a.customer_name as customerName,b.surplus_num as surplusNum,
|
|
|
a.brand_side as brandSide,a.exchange_rate as exchangeRate,b.specification_and_model as specificationAndModel,a.account as account,
|
|
|
- b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,
|
|
|
+ b.distribution_point as distributionPoint,pack_id as packId,a.supplier as supplier,b.unit_price_including_tax as unitPriceIncludingTax,
|
|
|
a.whole_order_total as wholeOrderTotal,a.sales_department as salesDepartment,a.salesman as salesman,a.currency_text as currencyText,a.third_party as thirdParty,
|
|
|
a.deposit_ratio as depositRatio,a.deposit as deposit,a.collaborative_route as collaborativeRoute,a.term_of_payment as termOfPayment,a.end_customer as endCustomer,
|
|
|
a.order_remarks as orderRemarks,a.price_remarks as priceRemarks,a.order_change_description as orderChangeDescription from sy_order_data a
|
|
|
@@ -26,13 +26,13 @@
|
|
|
sum(b.shipment_quantity) as shipmentQuantity,b.customs_declaration_unit_price as customsDeclarationUnitPrice,b.order_quantity as orderQuantity,
|
|
|
b.is_tc as isTc,a.hs_code as hsCode,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.pur_or_sub_order as purOrSubOrder,b.order_type as orderType,b.factory_unit_price as factoryUnitPrice,b.third_party as thirdParty,b.customer_order as customerOrder,
|
|
|
+ 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.end_customer as endCustomer,
|
|
|
b.order_remarks as orderRemarks,b.price_remarks as priceRemarks,b.order_change_description as orderChangeDescription,a.pre_completion_date as preCompletionDate,
|
|
|
- b.sales_type_text as salesTypeText,b.customer_name as customerName,b.exchange_rate as exchangeRate,b.whole_order_total as wholeOrderTotal,
|
|
|
- b.declaration_elements as declarationElements,b.number_of_sets as numberOfSets,b.chinese_name as chineseName,b.ac_set_no as acSetNo,
|
|
|
- b.english_name as englishName,b.garment_factory as garmentFactory from sy_shipping_details a
|
|
|
+ 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,
|
|
|
+ a.english_product_name as englishProductName,a.garment_factory as garmentFactory from sy_shipping_details a
|
|
|
left join sy_shipping_details_item b
|
|
|
on a.id = b.shipping_details_id and b.del_flag = 0
|
|
|
where a.del_flag = 0 group by a.id order by a.document_no desc) as t
|
|
|
@@ -49,10 +49,18 @@ ${ew.customSqlSegment}
|
|
|
|
|
|
<select id="pushSyShipping" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingVO">
|
|
|
|
|
|
- select '103' as tenantId,id as accessoriesHeaderId,'ACCESSORIES0609-2' as packingHeaderNum,
|
|
|
- 'ACCESSORIES' as packingType,'NEW' as packingStatus,'PO36202206070001' as poNo,'JAZS001' as containerNumm,
|
|
|
- '2022-06-07' as loadingDate,'01000229' as supplierNumber,
|
|
|
- '' as invoiceNum,'蒋岗峰' as preparer,'2022-06-02 08:26:24' as preparationTime
|
|
|
+ select account as tenantId,
|
|
|
+ id as accessoriesHeaderId,
|
|
|
+ document_no as packingHeaderNum,--'ACCESSORIES0609-2'
|
|
|
+ 'ACCESSORIES' as packingType,
|
|
|
+ 'NEW' as packingStatus,
|
|
|
+ --'PO36202206070001' as poNo,
|
|
|
+ --'JAZS001' as containerNumm,
|
|
|
+ -- '2022-06-07' as loadingDate,
|
|
|
+ '01000229' as supplierNumber,
|
|
|
+ --'' as invoiceNum,
|
|
|
+ create_by as preparer,
|
|
|
+ create_time as preparationTime
|
|
|
from sy_shipping_details
|
|
|
where del_flag = 0 and id = #{id}
|
|
|
|
|
|
@@ -61,13 +69,43 @@ ${ew.customSqlSegment}
|
|
|
<select id="pushSyShippingDeial" resultType="org.jeecg.modules.documents.shippingDetails.entity.VO.PushShippingDeialVo">
|
|
|
|
|
|
select '103' as tenantId,
|
|
|
- id as accessoriesLineId,id as accessoriesHeaderIdD,'1' as packingLineNum,'T0036' as merchandiser,'PO36202206070001' as poNo,
|
|
|
- '' as moDetailId,'' as poId, 'W21-W20-MSP-SPW0001' as styleNo, 'C156St2' as batchNo,'藏青' as color,'N0201002139' as itemCode,'' as itemId,
|
|
|
- '全涤绒布' as itemDesc,'针织布' as declarationName,'全涤' as composition,'190' as width,'' as rolls, '43' as planPackingQty,
|
|
|
- '21' as actualPackingQty,'33' as grossWeight,'21' as netWeight,'32' as length,'' as clothWeight,'12' as cartons,
|
|
|
- '6.32' as unitPrice,'45.21' as totalPrice,'' as gramWeight,'01000229' as supplierNumber,'' as supplierId,'' as supplierTenantId,
|
|
|
- '打卷' as packingMethod,'染色' as treatmentMethod,'1' as manualYarnFlag,'0' as manualYarnUnitPrice,'0' as manualYarnProportion,
|
|
|
- '无' as remark,'111' as cabinetNum
|
|
|
+ id as accessoriesLineId,
|
|
|
+ id as accessoriesHeaderIdD,
|
|
|
+ sort as packingLineNum,
|
|
|
+ 'T0036' as merchandiser,
|
|
|
+ order_number as poNo,--'PO36202206070001'
|
|
|
+ sy_order_data_item_id as moDetailId,
|
|
|
+ sy_order_data_id as poId,
|
|
|
+ item_number as styleNo, --'W21-W20-MSP-SPW0001'
|
|
|
+ 'C156St2' as batchNo,
|
|
|
+ '藏青' as color,
|
|
|
+ 'N0201002139' as itemCode,
|
|
|
+ '' as itemId,
|
|
|
+ '全涤绒布' as itemDesc,
|
|
|
+ '针织布' as declarationName,
|
|
|
+ '全涤' as composition,
|
|
|
+ '190' as width,
|
|
|
+ '' as rolls,
|
|
|
+ '43' as planPackingQty,
|
|
|
+ '21' as actualPackingQty,
|
|
|
+ '33' as grossWeight,
|
|
|
+ '21' as netWeight,
|
|
|
+ '32' as length,
|
|
|
+ '' as clothWeight,
|
|
|
+ '12' as cartons,
|
|
|
+ '6.32' as unitPrice,
|
|
|
+ '45.21' as totalPrice,
|
|
|
+ '' as gramWeight,
|
|
|
+ '01000229' as supplierNumber,
|
|
|
+ '' as supplierId,
|
|
|
+ '' as supplierTenantId,
|
|
|
+ '打卷' as packingMethod,
|
|
|
+ '染色' as treatmentMethod,
|
|
|
+ '1' as manualYarnFlag,
|
|
|
+ '0' as manualYarnUnitPrice,
|
|
|
+ '0' as manualYarnProportion,
|
|
|
+ '无' as remark,
|
|
|
+ '111' as cabinetNum
|
|
|
from sy_shipping_details_item
|
|
|
where del_flag = 0 and shipping_details_id = #{shippingDetailsId}
|
|
|
</select>
|
zengtx