From 1ce68427c1d414c39261a26bca710fbf4fd9a6e5 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期四, 14 八月 2025 09:56:11 +0800
Subject: [PATCH] feat:新增旧单据编号搜索单据和修改福祉车价格计算
---
ServiceOrder_List.gds | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 deletions(-)
diff --git a/ServiceOrder_List.gds b/ServiceOrder_List.gds
index 692ec29..13bd567 100644
--- a/ServiceOrder_List.gds
+++ b/ServiceOrder_List.gds
@@ -759,9 +759,11 @@
searchSql=" CONVERT(VARCHAR(10),ServiceOrd_CC_Time,120)=CONVERT(VARCHAR(10),'"&Year(now())&"-"&Right("0"&Month(now()),2)&"-"&Mid(searchTXT,1,2)&"',120) and Right('00'+convert(varchar(3),ServiceOrdNo),3)='"&Right(searchTXT,3)&"' "
ElseIf Len(searchTXT)=14 And Not IsNumeric(Left(searchTXT,2)) And IsNumeric(Mid(searchTXT,3,8)) And IsNumeric(Right(searchTXT,3)) And Mid(searchTXT,11,1)="-" Then
searchSql=" ServiceOrdClass='"&Left(searchTXT,2)&"' and CONVERT(VARCHAR(10),ServiceOrd_CC_Time,120)=CONVERT(VARCHAR(10),'"&Mid(searchTXT,3,4)&"-"&Mid(searchTXT,7,2)&"-"&Mid(searchTXT,9,2)&"',120) and Right('00'+convert(varchar(3),ServiceOrdNo),3)='"&Right(searchTXT,3)&"' "
- ElseIf Len(searchTXT)=10 And IsNumeric(searchTXT) Then
- searchSql=" ServiceOrdID="&Right(searchTXT,10)&" "
- ElseIf Mid(searchTXT,1,4)="out|" Then ' and DispatchOrdState in (8)
+ ElseIf Len(searchTXT)=14 And Mid(searchTXT,11,1)="-" Then
+ searchSql=" Old_ServiceOrdID_TXT='"&searchTXT&"' "
+ ElseIf Len(searchTXT)=10 And IsNumeric(searchTXT) Then
+ searchSql=" ServiceOrdID="&Right(searchTXT,10)&" "
+ ElseIf Mid(searchTXT,1,4)="out|" Then ' and DispatchOrdState in (8)
searchSql=" (ServiceOrdPtOutHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,5)&"')) and ServiceOrd_CC_Time "&SqlOrdDateType
ElseIf Mid(searchTXT,1,3)="in|" Then
searchSql=" (ServiceOrdPtInHosp in (select vid from dictionary where vType=1 and vtitle='HospName' and vtext='"&Mid(searchTXT,4)&"')) and ServiceOrd_CC_Time "&SqlOrdDateType
@@ -872,7 +874,7 @@
'缁勬垚璁＄畻鎬婚〉鏁癝QL
total_sql = "select ServiceOrdID "&sqlWhere
'缁勬垚鏄剧ず缁撴灉SQL
- Result_sql = "select ServiceOrdID,ServiceOrdNo,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdPtAge,ServiceOrdPtSex,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraEnd,ServiceOrdTraVia,ServiceOrdTraDistance,ServiceOrdTraSDTime,ServiceOrdTraTxnPrice,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrd_NS_ID,ServiceOrd_NS_Time,ServiceOrd_AP_Check,ServiceOrd_AP_ID,ServiceOrd_AP_Time,ServiceOrdVIP,ServiceOrdUnitID,ServiceOrdUnitRemarks,ServiceOrdIntroducer,ServiceOrdOperationRemarks,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdCancelReasonTXT,ServiceOrdCancelReason,FromHQ_is,ServiceOrd_Sale_ID,ServiceOrdPoints,row_number() over (order by ServiceOrdID desc) n "&sqlWhere
+ Result_sql = "select ServiceOrdID,ServiceOrdNo,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdPtAge,ServiceOrdPtSex,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraEnd,ServiceOrdTraVia,ServiceOrdTraDistance,ServiceOrdTraSDTime,ServiceOrdTraTxnPrice,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrd_NS_ID,ServiceOrd_NS_Time,ServiceOrd_AP_Check,ServiceOrd_AP_ID,ServiceOrd_AP_Time,ServiceOrdVIP,ServiceOrdUnitID,ServiceOrdUnitRemarks,ServiceOrdIntroducer,ServiceOrdOperationRemarks,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdCancelReasonTXT,ServiceOrdCancelReason,FromHQ_is,ServiceOrd_Sale_ID,ServiceOrdPoints,Old_ServiceOrdID_TXT,row_number() over (order by ServiceOrdID desc) n "&sqlWhere
'闄勫姞缁撴灉SQL
Additional_sql = ",StretcherMoney=isnull((select sum(StretcherMoney) from DispatchOrd where ServiceOrdIDDt=ServiceOrdID),0),ContractMode_is=isnull((select COUNT(id) from ServiceOrd_TransferMode where ServiceOrdTMID=ServiceOrdID and TransferModeID=7),0),UserPointsCost=isnull((select sum(Points_Score) from UserPoints where Points_State<>4 and Points_Type=1 and ServiceOrdIDDt=ServiceOrdID),0)"
@@ -989,11 +991,12 @@
ServiceOrdCancelReason= rs("ServiceOrdCancelReason")
FromHQ_is = rs("FromHQ_is") '鏄惁鏈夎浆鍐呴儴杞彂
ContractMode_is = rs("ContractMode_is") '鏄惁鎵垮寘缁勪换鍔�
- If isDepartment("010401")=0 Then
- ServiceOrdNo = ServiceOrdClass& year(rs("ServiceOrd_CC_Time"))&Right("0"&month(rs("ServiceOrd_CC_Time")),2)&Right("0"&day(rs("ServiceOrd_CC_Time")),2) & "-"&Right("00"&rs("ServiceOrdNo"),3)
- Else
- ServiceOrdNo = ServiceOrdClass&ServiceOrdID
- End If
+ Old_ServiceOrdID_TXT = rs("Old_ServiceOrdID_TXT") '鏃ф湇鍔″崟鍙�
+ If isDepartment("010401")=0 Then
+ ServiceOrdNo = ServiceOrdClass& year(rs("ServiceOrd_CC_Time"))&Right("0"&month(rs("ServiceOrd_CC_Time")),2)&Right("0"&day(rs("ServiceOrd_CC_Time")),2) & "-"&Right("00"&rs("ServiceOrdNo"),3)
+ Else
+ ServiceOrdNo = ServiceOrdClass&ServiceOrdID
+ End If
i=i+1
--
Gitblit v1.9.1