029 reconciliation

2026-03-25 14:08:34 +03:00
parent 6d06a68ad8
commit 8187db1ea3
11 changed files with 789 additions and 40 deletions
@@ -183,13 +183,10 @@
 					<td><a href="additional_agreement.cfm?__id=#base_by_uid#&#tr.fwx#">#base_by_uid#</a></td>
 					<td><a href="additional_agreement.cfm?__id=#base_by_uid#&#tr.fwx#">#base_by_name#</a></td> 				
 			
-<!--- 					<td class="c">
-						#dateFormat(dt_contract,'YYYY-MM-DD')#
-					</td>	 --->
 				</tr>
 			</cfoutput>
 		</table>
-	</cfif>  
+	
 	<br/>
 	Мы не показываем тут сделки, поскольку связь со сделкой у договора не прямая и не обязательная. Сделки относятся к контрагенту, а не к договору. Сделка может быть связана с договором через дополнительное соглашение (включая нулевое соглашение, по умолчанию)
 <!--- 	<cfquery name="qDeal">
@@ -206,5 +203,152 @@
 		from elma.deals d limit 10
 	</cfquery> --->
 	
+	<!--- ----------------------------------------------------- --->
+	<!--- ----------------------------------------------------- --->
+	<!--- ----------------------------------------------------- --->
+	
+	<cfquery name="qService">
+		with 
+		status(status, status_id, probability_pc) as (VALUES
+			('Закрыта неуспешно',7,0),('Закрыта успешно',6,100),('Договор подписан',5,100),('Договор на подписании',15,90),('Договор на согласовании',12,70),
+			('Тестирование',8,50),('Отправлено ТКП',10,20),('Внутреннее согласование',37,10),('Проработка решения',4,10),('Сбор потребностей',1,0)
+		)
+		select 
+		 siv.__id
+		,siv.__name
+		,siv.user_description
+		,siv.discount
+		,siv.cnt
+		,siv.modifier_code
+		,siv.abstractive_service_code
+		,siv.is_actual
+		,siv.type
+		,siv.hash
+		,siv.version
+		,siv.name_version
+		,siv.date_accept
+		,siv.__index
+		,siv.date_nop
+		,siv.date_end
+		,siv.is_easy
+		,siv.params::text
+		,a.__id::text as additional_agreement_uid
+		,a.__name as additional_agreement
+		,p.price
+		,p.cnt as p_cnt
+		,p.ed_izm
+		,p.code
+		,p.discount as p_discount
+		,p.__id as p_uid
+		,p.name
+		/*,(select 
+			sum(siv.cnt*(100-COALESCE(siv.discount,0))/100*p.price*p.cnt*(100-COALESCE(p.discount,0))/100) 			
+			from elma.service_parametrs p 
+			where p.__id = ANY (siv.params)
+			AND p."__deletedAt" IS NULL
+		) as line_cost			
+		,(select count(*)			
+			from elma.service_parametrs p 
+			where p.__id = ANY (siv.params)
+			AND p."__deletedAt" IS NULL
+		) as param_cnt*/
+		,s.probability_pc
+		,d.__index
+		,d.__id as deal_uid
+		from elma.deals_services siv
+		join elma.deals d on d.__id=ANY(siv.deal)
+		join status s on (d.__status_status=s.status_id)
+		join elma.service_parametrs p ON (p.__id = ANY (siv.params) AND p."__deletedAt" IS NULL)
+		left outer join elma.additional_agreements a on (a.__id=ANY(siv.additional_agreement))
+		where a.contract_uid=<cfqueryparam cfsqltype="cf_sql_other" value="#d.__id#" null=#!isValid('guid',d.__id)#/>
+		and siv.is_actual
+		and a.is_actual
+		order by siv.version::int
+	</cfquery>
+	
+	<cfoutput>
+		<h4>Услуги (версии строк спецификации, только актуальные) (#qService.recordCount#) </h4> 
+	</cfoutput>			
+		
+	<!--- <layout:render_query query=#qService#/> --->
+	 <table class="worktable">	
+		<thead>	
+			<tr>
+				<th>__index</th>
+				<th>Код</th>
+				<th width="20%">user_description</th>
+				<th width="25%">Компоненты</th>
+				<th>Кол-во</th>
+				<th>Скидка</th>
+				<th width="5%">Сумма</th>
+				
+				<th>type</th>									
+				<th>is_actual</th>					
+				<th>hash</th>
+				<th>version</th>
+				<th>name_version</th>
+				<th>date_accept</th>
+				<th>__index</th>
+				<th width="5%">date_nop</th>
+				<th width="5%">date_end</th>
+				<th>is_easy</th>
+				
+				<th width="7%">additional_agreement</th>
+			</tr>
+		</thead>
+		
+		<cfoutput query="qService" group="__index">
+			<tr>
+				<td class="c"><a href="deal_service.cfm?__id=#__id#&#tr.fwx#" title="__id">#__index#</a></td>
+				<!--- <td class="c">#__name#</td> --->
+				<td class="l">
+					#abstractive_service_code#.#modifier_code#<!--- <cfswitch expression=#type#>
+						<cfcase value=1>-i</cfcase>
+						<cfcase value=2>-f</cfcase>
+						<cfcase value=3>-m</cfcase>						
+					</cfswitch> --->
+				</td>
+				<td class="l">#user_description#</td>
+				<td>
+					<table>
+						<cfset cost=0/>
+						<cfoutput group="p_uid">						
+							<cfif p_cnt NEQ 0>
+								<tr>
+									<td class="nw">#code#</td>
+									<td>#name#</td>
+									<td>#p_cnt#</td>
+									<td>#ed_izm#</td>
+									<td class="r nw">#nFmt(price,3)#</td>
+									<td class="r">#p_discount#%</td>
+								</tr>							
+								<cfset cost+=price*p_cnt*(100-(isNumeric(p_discount)?p_discount:0))/100 />
+							</cfif>
+						</cfoutput>
+					</table>
+				</td>
+				<td class="c">#cnt#</td>
+				<td class="c">#discount#%</td>
+				<td class="r">#nFmt(cost*cnt*(100-(isNumeric(discount)?discount:0))/100)#</td>
+				
+				<td class="c">#type#</td>	
+				<td class="c">#is_actual#</td>					
+				<td class="c">#hash#</td>
+				<td class="c">#version#</td>
+				<td class="c">#name_version#</td>
+				<td class="c">#date_accept#</td>
+				<td class="c">#__index#</td>
+				<td class="c">#dateFormat(date_nop,'YYYY-MM-DD')#</td>
+				<td class="c">#dateFormat(date_end,'YYYY-MM-DD')#</td>
+				<td class="c">#is_easy#</td>
+	
+				<!--- <td class="c">#additional_agreement_uid#</td> --->
+				<td><a href="additional_agreement.cfm?__id=#additional_agreement_uid#&#tr.fwx#">#additional_agreement#</a></td>
+			</tr>
+		</cfoutput>		
+	</table>
+	
+</cfif><!--- len(d.__id) --->
+	
 	
 <layout:page section="footer"/>