068 bugfix
This commit is contained in:
+1
-1
@@ -87,7 +87,7 @@
|
||||
<!--- global settings --->
|
||||
|
||||
<cfset request.RECORDS_PER_PAGE=500/>
|
||||
<cfset request.APP_VERSION="0.00.067"/>
|
||||
<cfset request.APP_VERSION="0.00.068"/>
|
||||
<cfset request.STAND=getStand()/>
|
||||
|
||||
<cflock scope="application" type="readonly" timeout=3>
|
||||
|
||||
@@ -142,6 +142,9 @@ AS (
|
||||
,round(sum(c.cnt * o.cnt)) AS quantity
|
||||
,count(*) AS lines
|
||||
,STRING_AGG(DISTINCT c.code, ', ' ORDER BY c.code) AS codes
|
||||
,e.end_customer_wz
|
||||
,e.end_customer_uid
|
||||
,e.end_customer_name
|
||||
FROM stair o
|
||||
JOIN elma.companies z ON o._companies = z.__id
|
||||
--LEFT JOIN component c on (c.__id = ANY (o.params))
|
||||
@@ -156,6 +159,9 @@ AS (
|
||||
GROUP BY z.id_klienta
|
||||
,z.__id
|
||||
,z.__name
|
||||
,e.end_customer_wz
|
||||
,e.end_customer_uid
|
||||
,e.end_customer_name
|
||||
)
|
||||
------------------------------
|
||||
,sold_cpu AS (
|
||||
@@ -279,6 +285,8 @@ select
|
||||
<d:field title="WZ Elma">r.wz as wz_sold</d:field>
|
||||
<d:field title="Клиент">r.client as client_sold</d:field>
|
||||
<d:field title="Конечник">r.end_customer_wz</d:field>
|
||||
<d:field title="Конечник">r.end_customer_uid</d:field>
|
||||
<d:field title="Конечник">r.end_customer_name</d:field>
|
||||
<d:field>r.company_uid</d:field>
|
||||
<d:field title="WZ Cloud">a.wz as wz_alloc</d:field>
|
||||
<d:field title="Manager">u.manager</d:field>
|
||||
|
||||
Reference in New Issue
Block a user