From 1ce68427c1d414c39261a26bca710fbf4fd9a6e5 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期四, 14 八月 2025 09:56:11 +0800
Subject: [PATCH] feat:新增旧单据编号搜索单据和修改福祉车价格计算

---
 admin_save.gds |   18 ++++++++++++------
 1 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/admin_save.gds b/admin_save.gds
index 0c14d20..cf5812d 100644
--- a/admin_save.gds
+++ b/admin_save.gds
@@ -1051,6 +1051,12 @@
 ServiceOrdNo	= ServiceOrdClass& year(now())&Right("0"&month(now()),2)&Right("0"&day(now()),2) & "-"&Right("00"&ServiceOrdNo,3)
 
 
+SaveOpenerCommission ServiceOrdID
+SaveFollowers ServiceOrdID
+' 鏂板鏉′欢鏇存柊璇彞
+sql = "UPDATE ServiceOrder SET Old_ServiceOrdID_TXT = '" & Replace(ServiceOrdNo, "'", "''") & "' " & _
+      "WHERE ServiceOrdID = " & ServiceOrdID & " AND (Old_ServiceOrdID_TXT IS NULL OR Old_ServiceOrdID_TXT = '[鏈叧鑱擼')"
+objConn.Execute sql
 
 '鍜ㄨ鍗曡浆涓烘湇鍔″崟('鑷姩瀹℃牳)
 If ServiceOrdState="2" then
@@ -1315,6 +1321,8 @@
 ServiceOrd_Check		= SafeRequest(Request.form("ServiceOrd_Check"))		'褰撳墠瀹℃牳鎿嶄綔
 EditDataForm			= SafeRequest(Request.form("EditDataForm"))			'褰撳墠淇敼椤圭洰
 
+SaveOpenerCommission ServiceOrdID
+SaveFollowers ServiceOrdID
 
 Call RequestForm(Origin)
 session("Origin")=Origin
@@ -1836,6 +1844,7 @@
 	End If
 End If
 
+
 Response.Redirect ReturnURL&"&SystemMessageType=3&SMT="&SMT
 Response.End%>
 
@@ -2063,8 +2072,6 @@
 sql="update DispatchOrd set DispatchOrdTraSDTime='"&DispatchOrdTraSDTime&"' where DispatchOrdID="&DispatchOrdID
 objConn.Execute sql
 End If
-SaveOpenerCommission DispatchOrdID
-SaveFollowers DispatchOrdID
 
 '鍐欏叆闄勫姞椤圭洰璐圭敤
 If AddMoneyType<>"" And AddMoneyType<>"0" And AddMoney>0 And StretcherMoney>0 Then
@@ -2409,8 +2416,7 @@
 ServiceOrdTraEnd		= SafeRequest(Request.form("ServiceOrdTraEnd"))		'杞叆鍦板潃
 EditDataForm			= SafeRequest(Request.form("EditDataForm"))			'褰撳墠淇敼椤圭洰
 
-SaveOpenerCommission DispatchOrdID
-SaveFollowers DispatchOrdID
+
 
 If ServiceOrdTraStreet<>"" Then DispatchOrdTraStreet=ServiceOrdTraStreet
 If ServiceOrdTraVia<>"" Then DispatchOrdTraVia=ServiceOrdTraVia
@@ -3300,7 +3306,7 @@
 		</script><%
 		Response.End
 	End If
-	If DispatchOrdClass="SA" And CInt(old_TraTxnPrice)>CInt(TraPaidPrice) And (DispatchOrdState="8") Then
+	If DispatchOrdClass="SA" And CLng(old_TraTxnPrice)>CLng(TraPaidPrice) And (DispatchOrdState="8") Then
 		%><script language=javascript>
 		alert('杩斿洖鍓嶏紝璇风‘璁ゆ敹娆炬祦姘村拰鎴愪氦浠蜂竴鑷�');
 		window.location.href="/m_DispatchOrder.gds?DispatchOrdID=<%=DispatchOrdID%>&EndMileage=<%=EndMileage%>"
@@ -3492,7 +3498,7 @@
 	End If
 	rs.close()
 End If
-'Call Get_UnitOrd(ServiceOrdUnitID,ServiceOrdID,ServiceOrdState,DispatchOrdState)
+Call Get_UnitOrd(ServiceOrdUnitID,ServiceOrdID,ServiceOrdState,DispatchOrdState)
 
 '鏇存柊鎻愭垚鏁版嵁
 Call EntourageDKP_Money_C2(DispatchOrdID)

--
Gitblit v1.9.1