From 14553e97825d8c112ce2c40275e0c71b79fe3121 Mon Sep 17 00:00:00 2001
From: wanglizhong <wlz>
Date: 星期一, 05 五月 2025 11:17:08 +0800
Subject: [PATCH] fix:将开单人跟单人放到服务单中

---
 API/v1/index.gds |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/API/v1/index.gds b/API/v1/index.gds
index ef43200..e715e67 100644
--- a/API/v1/index.gds
+++ b/API/v1/index.gds
@@ -1159,12 +1159,12 @@
 					objConn.Execute sql
 				End If
 				
-				'灏忕▼搴忓叆鍙g敓鎴愯鍗曡嚜鍔ㄥ娉�(娌¤仈绯讳汉濮撳悕)
+				'灏忕▼搴忓叆鍙g敓鎴愯鍗曡嚜鍔ㄥ娉�(娌¤仈绯讳汉濮撳悕)锛宻ubmitOrdValue="1" 琛ㄧず鑷姩鎶ヤ环鐨�
 				If ServiceOrdCoName="" And submitOrdValue="1" Then
 					sql="update ServiceOrder set ServiceOrdOperationRemarks='[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' where ServiceOrdID="&ServiceOrdID
 					objConn.Execute sql
 				Elseif ServiceOrdCoName="" Then
-					sql="update ServiceOrder set ServiceOrdOperationRemarks='[瀹㈡埛鏈寮忔彁浜ら渶姹傦紝鍙笉鑱旂郴]' where ServiceOrdID="&ServiceOrdID
+					sql="update ServiceOrder set ServiceOrdOperationRemarks='[瀹㈡埛鏈寮忔彁浜ら渶姹俔' where ServiceOrdID="&ServiceOrdID
 					objConn.Execute sql
 				End If
 
@@ -1251,7 +1251,7 @@
 				End If
 				rs.close()
 				
-				If (ServiceOrdCoName<>"" Or  submitOrdValue<>"1") And 1=2 Then '鏂拌鍗曠涓�姝ヤ笉鎻愮ず(2024.8.5)
+				If (ServiceOrdCoName<>"" Or  submitOrdValue<>"1") Then
 					If NC_OAIDs<>"" Then
 						If Mid(NC_OAIDs,1,1)="," Then NC_OAIDs=Mid(NC_OAIDs,2)
 						If Right(NC_OAIDs,1)="," Then NC_OAIDs=Mid(NC_OAIDs,1,Len(NC_OAIDs)-1)
@@ -1558,7 +1558,7 @@
 				errcode=40503
 				errmsg="鏈嶅姟鍗曞凡鍙栨秷"
 			ElseIf Left(errcode,1)<>"4" Then
-				sql="update ServiceOrder set ServiceOrdState=4,ServiceOrdPoints=0,ServiceOrd_AP_ID=0,ServiceOrd_AP_Time=getdate(),ServiceOrdCancelReason=9,ServiceOrdCancelReasonTXT='"&DELRemarks&"' where ServiceOrdID="&ServiceOrdID
+				sql="update ServiceOrder set ServiceOrdState=4,ServiceOrdPoints=0,ServiceOrd_AP_ID=0,ServiceOrd_AP_Time=getdate(),ServiceOrdCancelReason=9,ServiceOrdOperationRemarks='',ServiceOrdCancelReasonTXT='"&DELRemarks&"' where ServiceOrdID="&ServiceOrdID
 				objConn.Execute sql
 				sql="delete from UserPoints where Points_Type=6 and ServiceOrdIDDt="&ServiceOrdID&" and ToUserID="&UserID
 				objConn.Execute sql

--
Gitblit v1.9.1