|
@@ -60,7 +60,7 @@
|
|
w.goods_source as goodsSource,
|
|
w.goods_source as goodsSource,
|
|
w.warehouse_name as warehouseName,
|
|
w.warehouse_name as warehouseName,
|
|
wbi.warehouse_type as warehouseType,
|
|
wbi.warehouse_type as warehouseType,
|
|
- w.avg_cost as avgCost,
|
|
|
|
|
|
+ wor.average_purchase_price as avgCost,
|
|
w.workflow_id as workflowId,
|
|
w.workflow_id as workflowId,
|
|
w.amount_not_payable as amountNotPayable,
|
|
w.amount_not_payable as amountNotPayable,
|
|
w.contract_no as contractNo,
|
|
w.contract_no as contractNo,
|
|
@@ -86,6 +86,7 @@
|
|
w.issuing_time as issuingTime,
|
|
w.issuing_time as issuingTime,
|
|
cmi.joint_venture_parties as jointVentureParties
|
|
cmi.joint_venture_parties as jointVentureParties
|
|
FROM warehousing_order w
|
|
FROM warehousing_order w
|
|
|
|
+ LEFT JOIN warehousing_order_record wor on wor.order_id = w.id and wor.delete_flag = '0'
|
|
LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
|
|
LEFT JOIN warehouse_base_info wbi on wbi.id=w.base_id and wbi.delete_flag = '0'
|
|
LEFT JOIN contract_management_info cmi on cmi.contract_no = w.contract_no and cmi.delete_flag = '0'
|
|
LEFT JOIN contract_management_info cmi on cmi.contract_no = w.contract_no and cmi.delete_flag = '0'
|
|
WHERE 1=1
|
|
WHERE 1=1
|