Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
+1
-1
@@ -115,7 +115,7 @@
|
|||||||
a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
|
a.audit_status, a.audit_remark, a.audit_by, a.audit_by_name, a.audit_time, a.warehouse_id, a.warehouse_code, a.warehouse_name, a.shipper_id, a.shipper_code,
|
||||||
a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
|
a.shipper_name, a.order_type_code, a.order_type_name, a.supplier_id, a.supplier_code, a.supplier_name, a.expect_time, a.supply_chain_number,
|
||||||
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,a.amount,
|
a.priority_level_code, a.priority_level_name, a.direct_warehouse, a.annex_url, a.material_quantity, a.quantity,a.business_order_no,a.amount,
|
||||||
a.business_price_way,a.business_charge_type,a.total_warehouse_rent,a.manpower_fee,a.fire_insure_fee,a.discount,a.is_free_manpower_fee,
|
a.business_price_way,a.business_charge_type,a.total_warehouse_rent,a.manpower_fee,a.fire_insure_fee,a.discount,a.is_free_manpower_fee,a.business_number,
|
||||||
-- 计划入库数量:入库明细表 in_material_detail 的 quantity 汇总
|
-- 计划入库数量:入库明细表 in_material_detail 的 quantity 汇总
|
||||||
<!-- (select ifnull(sum(imd.quantity), 0)-->
|
<!-- (select ifnull(sum(imd.quantity), 0)-->
|
||||||
<!-- from in_material_detail imd-->
|
<!-- from in_material_detail imd-->
|
||||||
|
|||||||
Reference in New Issue
Block a user