From 4418374d26a16ec759e06059c2b1fedabe1827e6 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期三, 09 七月 2025 22:06:56 +0800
Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came
---
admin_save.gds | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/admin_save.gds b/admin_save.gds
index 0c14d20..e821f28 100644
--- a/admin_save.gds
+++ b/admin_save.gds
@@ -1051,7 +1051,8 @@
ServiceOrdNo = ServiceOrdClass& year(now())&Right("0"&month(now()),2)&Right("0"&day(now()),2) & "-"&Right("00"&ServiceOrdNo,3)
-
+SaveOpenerCommission ServiceOrdID
+SaveFollowers ServiceOrdID
'鍜ㄨ鍗曡浆涓烘湇鍔″崟('鑷姩瀹℃牳)
If ServiceOrdState="2" then
sql="update ServiceOrder set ServiceOrd_NS_ID="&session("adminID")&",ServiceOrd_NS_Time=getdate(),ServiceOrd_AP_Check=1,ServiceOrd_AP_Time=getdate(),ServiceOrd_AP_ID="&session("adminID")&" where ServiceOrdID="&ServiceOrdID
@@ -1315,6 +1316,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 +1839,7 @@
End If
End If
+
Response.Redirect ReturnURL&"&SystemMessageType=3&SMT="&SMT
Response.End%>
@@ -2063,8 +2067,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 +2411,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 +3301,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 +3493,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