From 82954f31a43d8f6c2c76b24bf09fd45502c24638 Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:34:18 +0800
Subject: [PATCH] 解决合并冲突
---
admin_save.gds | 94 ++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 89 insertions(+), 5 deletions(-)
diff --git a/admin_save.gds b/admin_save.gds
index df210d3..2a2eb16 100644
--- a/admin_save.gds
+++ b/admin_save.gds
@@ -20,6 +20,66 @@
<title>璁板綍涓�..</title>
</head>
<%End If%>
+
+<%
+Function delFollower(ServiceOrderID)
+ sql = "DELETE FROM ServiceOrderCommissionDetails WHERE ServiceOrderID = " & ServiceOrderID & " AND PersonType = 'Follower'"
+ objConn.Execute sql
+End Function
+
+Function SaveFollower(ServiceOrderID,userId,userName,userRatio)
+ if userId<>"" and userName<>"" and userRatio<>"" then
+ ' 濡傛灉涓嶅瓨鍦紝鍒欐彃鍏ユ柊璁板綍
+ sql = "INSERT INTO ServiceOrderCommissionDetails (ServiceOrderID, PersonID, PersonName, CommissionRatio, PersonType) VALUES (" & ServiceOrderID & ", " & userId & ", '" & userName & "', " & userRatio & ", 'Follower')"
+ objConn.Execute sql
+ End if
+End Function
+
+Function SaveFollowers(ServiceOrderID)
+ ' 鍏堝垹闄ゆ墍鏈夎窡鍗曚汉璁板綍
+ followerCount = SafeRequest(Request.form("FollowersCount"))
+ If Trim(followerCount)<>"" and IsNumeric(followerCount) then
+ numericFollowerCount = CInt(Trim(followerCount))
+
+ if numericFollowerCount>0 then
+ delFollower ServiceOrderID
+ for i=1 to numericFollowerCount
+ userId = SafeRequest(Request.form("FollowerId_" & i ))
+ userName = SafeRequest(Request.form("FollowerName_" & i))
+ userRatio = SafeRequest(Request.form("FollowerRatio_" & i))
+ SaveFollower ServiceOrderID, userId, userName, userRatio
+ next
+ end if
+ end if
+End Function
+
+
+' 淇濆瓨寮�鍗曚汉鍙婃彁鎴愭瘮渚嬬殑鍑芥暟
+Function SaveOpenerCommission(ServiceOrderID)
+ OpenerID = SafeRequest(Request.form("OpenUserID")) '寮�鍗曚汉ID
+ OpenerName = SafeRequest(Request.form("OpenUserName")) '寮�鍗曚汉鍚嶇О
+ OpenerRatio = SafeRequest(Request.form("OpenUserRatio")) '寮�鍗曚汉鎻愭垚姣斾緥
+ if OpenerID<>"" and OpenerName<>"" and OpenerRatio<>"" then
+
+ ' 鍏堟鏌ユ槸鍚﹀凡缁忓瓨鍦ㄨ鏈嶅姟鍗曠殑寮�鍗曚汉璁板綍
+ sql = "SELECT ID FROM ServiceOrderCommissionDetails WHERE ServiceOrderID = " & ServiceOrderID & " AND PersonType = 'Opener'"
+
+ rs.Open sql, objConn, 1, 1
+
+ If rs.EOF Then
+ ' 濡傛灉涓嶅瓨鍦紝鍒欐彃鍏ユ柊璁板綍
+ sql = "INSERT INTO ServiceOrderCommissionDetails (ServiceOrderID, PersonID, PersonName, CommissionRatio, PersonType) VALUES (" & ServiceOrderID & ", " & OpenerID & ", '" & OpenerName & "', " & OpenerRatio & ", 'Opener')"
+ Else
+ ' 濡傛灉瀛樺湪锛屽垯鏇存柊璁板綍
+ sql = "UPDATE ServiceOrderCommissionDetails SET PersonID = " & OpenerID & ", PersonName = '" & OpenerName & "', " &"CommissionRatio = " & OpenerRatio & " WHERE ID = " & rs("ID")
+ End If
+ 'response.write sql
+ rs.Close
+ objConn.Execute sql
+ End if
+End Function
+%>
+
<%
if cint(session("admin_execLevel"))<1 and admin_save<>"1" and admin_save<>"47" and admin_save<>"48" and admin_save<>"49" then%>
@@ -748,6 +808,7 @@
ServiceOrdTraOfferPrice = SafeRequest(Request.form("ServiceOrdTraOfferPrice")) '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = SafeRequest(Request.form("ServiceOrdTraTxnPrice")) '鎴愪氦浠�
ServiceOrdTraPrePayment = SafeRequest(Request.form("ServiceOrdTraPrePayment")) '闇�棰勪粯娆�
+ServiceOrdStairClimberPrice = SafeRequest(Request.form("ServiceOrdStairClimberPrice")) '鐖ゼ鏈轰环鏍�
SettlementPrice = SafeRequest(Request.form("SettlementPrice")) '缁撶畻浠�
ServiceOrdTraPriceReason= SafeRequest(Request.form("ServiceOrdTraPriceReason")) '宸环鍘熷洜
TEL_Phone = SafeRequest(Request.form("Phone")) '鏉ョ數鐢佃瘽
@@ -773,6 +834,9 @@
FromHQ2_is = SafeRequest(Request.form("FromHQ2_is")) '骞垮窞鎬婚儴鎺ㄩ�佷换鍔℃爣璁�
OrderPrice_Auto = SafeRequest(Request.form("OrderPrice_Auto")) '璁㈠崟鑷姩鎶ヤ环鍙傝�冨��
+
+
+
Call RequestForm(Origin)
session("Origin")=Origin
'response.write Origin
@@ -781,10 +845,12 @@
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0
If SettlementPrice="" Then SettlementPrice=0
If InStr(ServiceOrdTraTxnPrice,",")>0 Then ServiceOrdTraTxnPrice=Replace(ServiceOrdTraTxnPrice,",","")
If InStr(ServiceOrdTraOfferPrice,",")>0 Then ServiceOrdTraOfferPrice=Replace(ServiceOrdTraOfferPrice,",","")
If InStr(ServiceOrdTraPrePayment,",")>0 Then ServiceOrdTraPrePayment=Replace(ServiceOrdTraPrePayment,",","")
+If InStr(ServiceOrdStairClimberPrice,",")>0 Then ServiceOrdStairClimberPrice=Replace(ServiceOrdStairClimberPrice,",","")
If InStr(SettlementPrice,",")>0 Then SettlementPrice=Replace(SettlementPrice,",","")
If ServiceOrdState="" Then ServiceOrdState=1
'If InStr(ServiceOrdTraDistance,"鍏噷")>0 Then ServiceOrdTraDistance=Replace(ServiceOrdTraDistance,"鍏噷","")
@@ -978,7 +1044,7 @@
rs.close()
'鍐欏叆鏂版湇鍔″崟
-sql="insert into ServiceOrder (ServiceOrdUserID,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdCoTies,ServiceOrdPtName,ServiceOrdPtAge,ServiceOrdPtKG,ServiceOrdPtSex,ServiceOrdPtNat,ServiceOrdPtIDCard,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdPtServices,ServiceOrdPtServicesID,ServiceOrdPtInServices,ServiceOrdPtInServicesID,ServiceOrdPtDiagnosis,ServiceOrdPtCondition,ServiceOrdTaskRemarks,ServiceOrdPtDoctor,ServiceOrdPtDoctorPhone,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraStreetCoo,ServiceOrdTraEnd,ServiceOrdTraEndCoo,ServiceOrdTraVia,ServiceOrdViaDistance,ServiceOrdTraDistance,ServiceOrdTraDuration,ServiceOrdTraUnitPrice,ServiceOrdTraOfferPrice,ServiceOrdTraTxnPrice,ServiceOrdTraPrePayment,SettlementPrice,ServiceOrdTraPriceReason,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrdNo,ServiceOrd_Sale_ID,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdIntroducer,ServiceOrdUnitID,ServiceOrdVIP,ServiceOrdOperationRemarks,ServiceOrdEstimatedOrderDate,ServiceOrdSource,OrderLevel,ServiceOrdDepartureType,ConditionLevel,DirectionType,FromHQ2_is,OrderPrice_Auto) values ("&UserID&",'"&ServiceOrdClass&"',"&ServiceOrdAreaType&","&ServiceOrdType&","&ServiceOrdState&",'"&ServiceOrdStartDate&"','"&ServiceOrdApptDate&"','"&ServiceOrdCoName&"','"&ServiceOrdCoPhone&"','"&ServiceOrdCoTies&"','"&ServiceOrdPtName&"','"&ServiceOrdPtAge&"','"&ServiceOrdPtKG&"','"&ServiceOrdPtSex&"','"&ServiceOrdPtNat&"','"&ServiceOrdPtIDCard&"',"&ServiceOrdPtOutHospID_New&","&ServiceOrdPtOutHospID&","&ServiceOrdPtInHospID_New&","&ServiceOrdPtInHospID&",'"&ServiceOrdPtServices&"',"&ServiceOrdPtServicesID&",'"&ServiceOrdPtInServices&"',"&ServiceOrdPtInServicesID&",'"&ServiceOrdPtDiagnosis&"','"&ServiceOrdPtCondition&"','"&ServiceOrdTaskRemarks&"','"&ServiceOrdPtDoctor&"','"&ServiceOrdPtDoctorPhone&"','"&ServiceOrdTraProvince&"','"&ServiceOrdTraCity&"','"&ServiceOrdTraStreet&"','"&ServiceOrdTraStreetCoo&"','"&ServiceOrdTraEnd&"','"&ServiceOrdTraEndCoo&"','"&ServiceOrdTraVia&"','"&ServiceOrdViaDistance&"','"&ServiceOrdTraDistance&"','"&ServiceOrdTraDuration&"',"&ServiceOrdTraUnitPrice&","&ServiceOrdTraOfferPrice&","&ServiceOrdTraTxnPrice&","&ServiceOrdTraPrePayment&","&SettlementPrice&",'"&ServiceOrdTraPriceReason&"',"&ServiceOrd_CC_ID&",getdate(),"&ServiceOrdNo&","&ServiceOrd_Sale_ID&","&ServiceOrd_work_ID&",'"&ServiceOrd_work_IDs&"',"&ServiceOrd_work_is&","&CommissionScenarioID&",'"&ServiceOrdIntroducer&"',"&ServiceOrdUnitID&","&ServiceOrdVIP&",'"&ServiceOrdOperationRemarks&"','"&ServiceOrdEstimatedOrderDate&"',"&ServiceOrdSource&","&OrderLevel&","&ServiceOrdDepartureType&","&ConditionLevel&","&DirectionType&","&FromHQ2_is&","&OrderPrice_Auto&")"
+sql="insert into ServiceOrder (ServiceOrdUserID,ServiceOrdClass,ServiceOrdAreaType,ServiceOrdType,ServiceOrdState,ServiceOrdStartDate,ServiceOrdApptDate,ServiceOrdCoName,ServiceOrdCoPhone,ServiceOrdCoTies,ServiceOrdPtName,ServiceOrdPtAge,ServiceOrdPtKG,ServiceOrdPtSex,ServiceOrdPtNat,ServiceOrdPtIDCard,ServiceOrdPtOutHospID,ServiceOrdPtOutHosp,ServiceOrdPtInHospID,ServiceOrdPtInHosp,ServiceOrdPtServices,ServiceOrdPtServicesID,ServiceOrdPtInServices,ServiceOrdPtInServicesID,ServiceOrdPtDiagnosis,ServiceOrdPtCondition,ServiceOrdTaskRemarks,ServiceOrdPtDoctor,ServiceOrdPtDoctorPhone,ServiceOrdTraProvince,ServiceOrdTraCity,ServiceOrdTraStreet,ServiceOrdTraStreetCoo,ServiceOrdTraEnd,ServiceOrdTraEndCoo,ServiceOrdTraVia,ServiceOrdViaDistance,ServiceOrdTraDistance,ServiceOrdTraDuration,ServiceOrdTraUnitPrice,ServiceOrdTraOfferPrice,ServiceOrdTraTxnPrice,ServiceOrdTraPrePayment,ServiceOrdStairClimberPrice,SettlementPrice,ServiceOrdTraPriceReason,ServiceOrd_CC_ID,ServiceOrd_CC_Time,ServiceOrdNo,ServiceOrd_Sale_ID,ServiceOrd_work_ID,ServiceOrd_work_IDs,ServiceOrd_work_is,CommissionScenarioID,ServiceOrdIntroducer,ServiceOrdUnitID,ServiceOrdVIP,ServiceOrdOperationRemarks,ServiceOrdEstimatedOrderDate,ServiceOrdSource,OrderLevel,ServiceOrdDepartureType,ConditionLevel,DirectionType,FromHQ2_is,OrderPrice_Auto) values ("&UserID&",'"&ServiceOrdClass&"',"&ServiceOrdAreaType&","&ServiceOrdType&","&ServiceOrdState&",'"&ServiceOrdStartDate&"','"&ServiceOrdApptDate&"','"&ServiceOrdCoName&"','"&ServiceOrdCoPhone&"','"&ServiceOrdCoTies&"','"&ServiceOrdPtName&"','"&ServiceOrdPtAge&"','"&ServiceOrdPtKG&"','"&ServiceOrdPtSex&"','"&ServiceOrdPtNat&"','"&ServiceOrdPtIDCard&"',"&ServiceOrdPtOutHospID_New&","&ServiceOrdPtOutHospID&","&ServiceOrdPtInHospID_New&","&ServiceOrdPtInHospID&",'"&ServiceOrdPtServices&"',"&ServiceOrdPtServicesID&",'"&ServiceOrdPtInServices&"',"&ServiceOrdPtInServicesID&",'"&ServiceOrdPtDiagnosis&"','"&ServiceOrdPtCondition&"','"&ServiceOrdTaskRemarks&"','"&ServiceOrdPtDoctor&"','"&ServiceOrdPtDoctorPhone&"','"&ServiceOrdTraProvince&"','"&ServiceOrdTraCity&"','"&ServiceOrdTraStreet&"','"&ServiceOrdTraStreetCoo&"','"&ServiceOrdTraEnd&"','"&ServiceOrdTraEndCoo&"','"&ServiceOrdTraVia&"','"&ServiceOrdViaDistance&"','"&ServiceOrdTraDistance&"','"&ServiceOrdTraDuration&"',"&ServiceOrdTraUnitPrice&","&ServiceOrdTraOfferPrice&","&ServiceOrdTraTxnPrice&","&ServiceOrdTraPrePayment&","&ServiceOrdStairClimberPrice&","&SettlementPrice&",'"&ServiceOrdTraPriceReason&"',"&ServiceOrd_CC_ID&",getdate(),"&ServiceOrdNo&","&ServiceOrd_Sale_ID&","&ServiceOrd_work_ID&",'"&ServiceOrd_work_IDs&"',"&ServiceOrd_work_is&","&CommissionScenarioID&",'"&ServiceOrdIntroducer&"',"&ServiceOrdUnitID&","&ServiceOrdVIP&",'"&ServiceOrdOperationRemarks&"','"&ServiceOrdEstimatedOrderDate&"',"&ServiceOrdSource&","&OrderLevel&","&ServiceOrdDepartureType&","&ConditionLevel&","&DirectionType&","&FromHQ2_is&","&OrderPrice_Auto&")"
'Response.write sql&"<BR>"
objConn.Execute sql
sql="select top 1 ServiceOrdID from ServiceOrder where ServiceOrdCoPhone='"&ServiceOrdCoPhone&"' order by ServiceOrdID desc"
@@ -986,6 +1052,14 @@
ServiceOrdID = rs(0)
rs.close()
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
@@ -1216,6 +1290,7 @@
ServiceOrdTraOfferPrice = SafeRequest(Request.form("ServiceOrdTraOfferPrice")) '鏍囧噯鎶ヤ环
ServiceOrdTraTxnPrice = SafeRequest(Request.form("ServiceOrdTraTxnPrice")) '鎴愪氦浠�
ServiceOrdTraPrePayment = SafeRequest(Request.form("ServiceOrdTraPrePayment")) '闇�棰勪粯娆�
+ServiceOrdStairClimberPrice = SafeRequest(Request.form("ServiceOrdStairClimberPrice")) '鐖ゼ鏈轰环鏍�
SettlementPrice = SafeRequest(Request.form("SettlementPrice")) '缁撶畻浠�
ServiceOrdTraPriceReason= SafeRequest(Request.form("ServiceOrdTraPriceReason")) '宸环鍘熷洜
TEL_Phone = SafeRequest(Request.form("Phone")) '鏉ョ數鐢佃瘽
@@ -1250,6 +1325,9 @@
ServiceOrd_Check = SafeRequest(Request.form("ServiceOrd_Check")) '褰撳墠瀹℃牳鎿嶄綔
EditDataForm = SafeRequest(Request.form("EditDataForm")) '褰撳墠淇敼椤圭洰
+SaveOpenerCommission ServiceOrdID
+SaveFollowers ServiceOrdID
+
Call RequestForm(Origin)
session("Origin")=Origin
'response.write Origin
@@ -1258,6 +1336,7 @@
If ServiceOrdTraOfferPrice="" Then ServiceOrdTraOfferPrice=0
If ServiceOrdTraTxnPrice="" Then ServiceOrdTraTxnPrice=0
If ServiceOrdTraPrePayment="" Then ServiceOrdTraPrePayment=0
+If ServiceOrdStairClimberPrice="" Then ServiceOrdStairClimberPrice=0
If SettlementPrice="" Then SettlementPrice=0
If ServiceOrdState="" Then ServiceOrdState=1
If ServiceOrd_Sale_ID="" Then ServiceOrd_Sale_ID="null"
@@ -1276,7 +1355,7 @@
If ServiceOrdPtOutHospID_New="" Then ServiceOrdPtOutHospID_New=0
If ServiceOrdPtInHospID_New="" Then ServiceOrdPtInHospID_New=0
If ServiceOrdVIP="" Then ServiceOrdVIP=0
-If ServiceOrdOperationRemarks<>"" Then ServiceOrdOperationRemarks=replace(ServiceOrdOperationRemarks,"[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]","")
+If ServiceOrdOperationRemarks<>"" Then ServiceOrdOperationRemarks=replace(replace(ServiceOrdOperationRemarks,"[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]",""),"[瀹㈡埛鏈寮忔彁浜ら渶姹俔","")
If ServiceOrdVisit<>"" And ServiceOrdVisit_old<>ServiceOrdVisit Then
RV_Point=0
sql="select id from DispatchOrd_Entourage,DispatchOrd where EntourageState<>4 and DispatchOrdIDDt=DispatchOrdID and ServiceOrdIDDt="&ServiceOrdID
@@ -1309,6 +1388,7 @@
SMT=3
ServiceOrdTraPrePayment=Replace(ServiceOrdTraPrePayment,",","")
+If InStr(ServiceOrdStairClimberPrice,",")>0 Then ServiceOrdStairClimberPrice=Replace(ServiceOrdStairClimberPrice,",","")
SettlementPrice=Replace(SettlementPrice,",","")
ServiceOrdTraOfferPrice=Replace(ServiceOrdTraOfferPrice,",","")
ServiceOrdTraTxnPrice=Replace(ServiceOrdTraTxnPrice,",","")
@@ -1578,7 +1658,7 @@
If ServiceOrdPtInServices<>"銆愰殣銆�" Then CoSql=CoSql&",ServiceOrdPtInServices='"&ServiceOrdPtInServices&"'"
'淇敼鏈嶅姟鍗�(鑷姩瀹℃牳)
-sql="update ServiceOrder set ServiceOrdClass='"&ServiceOrdClass&"',ServiceOrdAreaType="&ServiceOrdAreaType&",ServiceOrdType="&ServiceOrdType&",ServiceOrdApptDate='"&ServiceOrdApptDate&"',ServiceOrdEstimatedOrderDate='"&ServiceOrdEstimatedOrderDate&"',ServiceOrdCoTies='"&ServiceOrdCoTies&"',ServiceOrdPtSex='"&ServiceOrdPtSex&"',ServiceOrdPtNat='"&ServiceOrdPtNat&"',ServiceOrdPtIDCard='"&ServiceOrdPtIDCard&"',ServiceOrdPtOutHospID="&ServiceOrdPtOutHospID_New&",ServiceOrdPtOutHosp="&ServiceOrdPtOutHospID&",ServiceOrdPtInHospID="&ServiceOrdPtInHospID_New&",ServiceOrdPtInHosp="&ServiceOrdPtInHospID&",ServiceOrdPtDiagnosis='"&ServiceOrdPtDiagnosis&"',ServiceOrdPtCondition='"&ServiceOrdPtCondition&"',ServiceOrdTaskRemarks='"&ServiceOrdTaskRemarks&"',ServiceOrdPtDoctor='"&ServiceOrdPtDoctor&"',ServiceOrdPtDoctorPhone='"&ServiceOrdPtDoctorPhone&"',ServiceOrdTraProvince='"&ServiceOrdTraProvince&"',ServiceOrdTraCity='"&ServiceOrdTraCity&"',ServiceOrdTraStreet='"&ServiceOrdTraStreet&"',ServiceOrdTraStreetCoo='"&ServiceOrdTraStreetCoo&"',ServiceOrdTraEnd='"&ServiceOrdTraEnd&"',ServiceOrdTraEndCoo='"&ServiceOrdTraEndCoo&"',ServiceOrdTraVia='"&ServiceOrdTraVia&"',ServiceOrdViaDistance='"&ServiceOrdViaDistance&"',ServiceOrdTraDistance='"&ServiceOrdTraDistance&"',ServiceOrdTraDuration='"&ServiceOrdTraDuration&"',ServiceOrdTraUnitPrice="&ServiceOrdTraUnitPrice&",ServiceOrdTraOfferPrice="&ServiceOrdTraOfferPrice&",ServiceOrdTraTxnPrice="&ServiceOrdTraTxnPrice&",ServiceOrdTraPrePayment="&ServiceOrdTraPrePayment&",SettlementPrice="&SettlementPrice&",ServiceOrdTraPriceReason='"&ServiceOrdTraPriceReason&"',ServiceOrd_CC_ID="&ServiceOrd_CC_ID&",ServiceOrd_Sale_ID="&ServiceOrd_Sale_ID&",ServiceOrdIntroducer='"&ServiceOrdIntroducer&"',ServiceOrd_work_ID="&ServiceOrd_work_ID&",ServiceOrd_work_IDs='"&ServiceOrd_work_IDs&"',ServiceOrd_work_is="&ServiceOrd_work_is&",CommissionScenarioID="&CommissionScenarioID&",ServiceOrdUnitID="&ServiceOrdUnitID&""&ServiceOrdSql&",ServiceOrdVIP="&ServiceOrdVIP&SqlVisit&",ServiceOrdOperationRemarks='"&ServiceOrdOperationRemarks&"',ServiceOrdSource="&ServiceOrdSource&",OrderLevel="&OrderLevel&",ServiceOrdDepartureType="&ServiceOrdDepartureType&",ConditionLevel="&ConditionLevel&",DirectionType="&DirectionType&",ServiceOrdPtKG='"&ServiceOrdPtKG&"',FromHQ2_is="&FromHQ2_is&CoSql&ServiceOrdNo_UPSql&" where ServiceOrdID="&ServiceOrdID
+sql="update ServiceOrder set ServiceOrdClass='"&ServiceOrdClass&"',ServiceOrdAreaType="&ServiceOrdAreaType&",ServiceOrdType="&ServiceOrdType&",ServiceOrdApptDate='"&ServiceOrdApptDate&"',ServiceOrdEstimatedOrderDate='"&ServiceOrdEstimatedOrderDate&"',ServiceOrdCoTies='"&ServiceOrdCoTies&"',ServiceOrdPtSex='"&ServiceOrdPtSex&"',ServiceOrdPtNat='"&ServiceOrdPtNat&"',ServiceOrdPtIDCard='"&ServiceOrdPtIDCard&"',ServiceOrdPtOutHospID="&ServiceOrdPtOutHospID_New&",ServiceOrdPtOutHosp="&ServiceOrdPtOutHospID&",ServiceOrdPtInHospID="&ServiceOrdPtInHospID_New&",ServiceOrdPtInHosp="&ServiceOrdPtInHospID&",ServiceOrdPtDiagnosis='"&ServiceOrdPtDiagnosis&"',ServiceOrdPtCondition='"&ServiceOrdPtCondition&"',ServiceOrdTaskRemarks='"&ServiceOrdTaskRemarks&"',ServiceOrdPtDoctor='"&ServiceOrdPtDoctor&"',ServiceOrdPtDoctorPhone='"&ServiceOrdPtDoctorPhone&"',ServiceOrdTraProvince='"&ServiceOrdTraProvince&"',ServiceOrdTraCity='"&ServiceOrdTraCity&"',ServiceOrdTraStreet='"&ServiceOrdTraStreet&"',ServiceOrdTraStreetCoo='"&ServiceOrdTraStreetCoo&"',ServiceOrdTraEnd='"&ServiceOrdTraEnd&"',ServiceOrdTraEndCoo='"&ServiceOrdTraEndCoo&"',ServiceOrdTraVia='"&ServiceOrdTraVia&"',ServiceOrdViaDistance='"&ServiceOrdViaDistance&"',ServiceOrdTraDistance='"&ServiceOrdTraDistance&"',ServiceOrdTraDuration='"&ServiceOrdTraDuration&"',ServiceOrdTraUnitPrice="&ServiceOrdTraUnitPrice&",ServiceOrdTraOfferPrice="&ServiceOrdTraOfferPrice&",ServiceOrdTraTxnPrice="&ServiceOrdTraTxnPrice&",ServiceOrdTraPrePayment="&ServiceOrdTraPrePayment&",ServiceOrdStairClimberPrice="&ServiceOrdStairClimberPrice&",SettlementPrice="&SettlementPrice&",ServiceOrdTraPriceReason='"&ServiceOrdTraPriceReason&"',ServiceOrd_CC_ID="&ServiceOrd_CC_ID&",ServiceOrd_Sale_ID="&ServiceOrd_Sale_ID&",ServiceOrdIntroducer='"&ServiceOrdIntroducer&"',ServiceOrd_work_ID="&ServiceOrd_work_ID&",ServiceOrd_work_IDs='"&ServiceOrd_work_IDs&"',ServiceOrd_work_is="&ServiceOrd_work_is&",CommissionScenarioID="&CommissionScenarioID&",ServiceOrdUnitID="&ServiceOrdUnitID&""&ServiceOrdSql&",ServiceOrdVIP="&ServiceOrdVIP&SqlVisit&",ServiceOrdOperationRemarks='"&ServiceOrdOperationRemarks&"',ServiceOrdSource="&ServiceOrdSource&",OrderLevel="&OrderLevel&",ServiceOrdDepartureType="&ServiceOrdDepartureType&",ConditionLevel="&ConditionLevel&",DirectionType="&DirectionType&",ServiceOrdPtKG='"&ServiceOrdPtKG&"',FromHQ2_is="&FromHQ2_is&CoSql&ServiceOrdNo_UPSql&" where ServiceOrdID="&ServiceOrdID
'&",ServiceOrd_AP_Check=1,ServiceOrd_AP_Time=getdate(),ServiceOrd_AP_ID="&session("adminID")
'Response.Write sql
objConn.Execute sql
@@ -1769,6 +1849,7 @@
End If
End If
End If
+
Response.Redirect ReturnURL&"&SystemMessageType=3&SMT="&SMT
Response.End%>
@@ -2340,6 +2421,9 @@
ServiceOrdTraVia = SafeRequest(Request.form("ServiceOrdTraVia")) '杞嚭鍦板潃
ServiceOrdTraEnd = SafeRequest(Request.form("ServiceOrdTraEnd")) '杞叆鍦板潃
EditDataForm = SafeRequest(Request.form("EditDataForm")) '褰撳墠淇敼椤圭洰
+
+
+
If ServiceOrdTraStreet<>"" Then DispatchOrdTraStreet=ServiceOrdTraStreet
If ServiceOrdTraVia<>"" Then DispatchOrdTraVia=ServiceOrdTraVia
If ServiceOrdTraEnd<>"" Then DispatchOrdTraEnd=ServiceOrdTraEnd
@@ -3228,7 +3312,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%>"
@@ -3420,7 +3504,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