From 1503b9d7ed1d71b98bd5715c23d236ef3c019ead Mon Sep 17 00:00:00 2001
From: hzj <1831054011@qq.com>
Date: 星期一, 13 十月 2025 15:40:20 +0800
Subject: [PATCH] Merge branch 'main' of http://8.134.184.104:10801/r/came
---
inc/function.gds | 33 +++++++++++++++++++++++++++++++++
1 files changed, 33 insertions(+), 0 deletions(-)
diff --git a/inc/function.gds b/inc/function.gds
index 1f3deef..1ee9893 100644
--- a/inc/function.gds
+++ b/inc/function.gds
@@ -2885,6 +2885,36 @@
Function Get_UnitOrd(ServiceOrdUnitID,ServiceOrdID,ServiceOrdState,DispatchOrdState)
If ServiceOrdID<>"" Then
sysUnix=ToUnixTime(now(),+8)
+
+ ' 鏂板鑾峰彇鐘舵�佸啓鍏ュ簱锛屼緵骞夸氦闆嗗洟鐨勬帴鍙ｄ娇鐢ㄣ��
+ sql = "select ServiceOrdTraTxnPrice from ServiceOrder where ServiceOrdID=" & ServiceOrdID
+ rs.open sql, objConn, 1, 1
+
+ If Not rs.Eof Then
+ ServiceOrdTraTxnPrice = rs("ServiceOrdTraTxnPrice")
+
+ If ServiceOrdState = "4" Or ServiceOrdState = "5" Then
+ msg = "鏃犳晥鍙栨秷"
+ ElseIf ServiceOrdTraTxnPrice > 0 And ServiceOrdState <> "4" And ServiceOrdState <> "5" Then
+ ' msg = "宸叉姤浠� " & ServiceOrdTraTxnPrice
+ msg = "宸叉姤浠�"
+ Else
+ msg = "鏈姤浠�"
+ End If
+
+ If DispatchOrdState <> "" Then
+ msg = DispatchOrdStateA(DispatchOrdState)
+ End If
+
+ ' 鎻掑叆鏁版嵁鍒� A_OrderStatus 琛�
+ sql = "INSERT INTO [came].[dbo].[A_OrderStatus] ([serviceOrdID], [msg], [updateTime], [flag]) " & _
+ "VALUES (" & ServiceOrdID & ", '" & msg & "', GETDATE(), 0)"
+ objConn.Execute sql
+ End If
+
+ rs.close()
+
+
If ServiceOrdUnitID="2" Then '鍖绘姢閫氬钩鍙�
url="http://www.emtsos.com/emtApi.do" '//瀹氫箟瑕佽幏鍙栨簮浠ｇ爜鐨勭綉鍧�锛屼竴鑸槸閫氳繃鍙橀噺浼犻�掕繃鏉�
sql="select ServiceOrdTraTxnPrice from ServiceOrder where ServiceOrdID="&ServiceOrdID
@@ -3337,6 +3367,9 @@
'閲戦鍘绘帀灏忔暟鐐�
function MoneyCheck(v,t)
+ If IsNull(v) Or v="" Then
+ v = 0
+ End If
If InStr(CStr(v),".")>0 Then
If t=1 then
MoneyCheck=FormatCurrency(v,2,-1)
--
Gitblit v1.9.1