|
@@ -294,7 +294,7 @@
|
|
|
SELECT
|
|
|
m.seller as compName,
|
|
|
t.send_warehouse as warehouseName,
|
|
|
- '' as binNumber,
|
|
|
+ w.bin_number as binNumber,
|
|
|
s.delivery_date as createDate,
|
|
|
cm.cost as costPrice,
|
|
|
s.contract_no as contractNo,
|
|
@@ -337,6 +337,7 @@
|
|
|
s.status as status,
|
|
|
s.net_weight as netWeight
|
|
|
FROM stock_sale_receipt_report s
|
|
|
+ left join warehouse_in_out_info w on w.id = s.warehouse_record_id and w.delete_flag = 0
|
|
|
left join tran_process_info p on p.id = s.process_id and p.delete_flag = 0
|
|
|
left join tran_task_info t on t.id = p.info_id and t.delete_flag = 0
|
|
|
left join tran_car_info i on i.process_id = p.id and i.delete_flag = 0 and i.tran_car_no = s.tran_car_no and i.car_no = s.car_no
|