From 52a3210f53ab690bbf77e29bfbd88c75fe08ec18 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期三, 22 十一月 2017 14:49:30 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.56 修改上傳成功訊息
---
CB_IMGPSScanImp.pas | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 056e8ad..d26cb2e 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -8315,7 +8315,16 @@
end;
CaseHelpBtn.Visible := False;
LoadImgFile;
- Showmessage(NowCaseNo+_Msg('傳送完成'));
+ if (FMode='NSCAN') or (FMode='DSCAN') then
+ begin
+ Showmessage(NowCaseNo+_Msg('影像上傳完成。此案已進入下一流程。'));
+ end;
+
+ if FMode='ESCAN' then
+ begin
+ Showmessage(NowCaseNo+_Msg('影像已補件完成。'));
+ end;
+
DataLoading(False,False);
end
Else
@@ -11479,7 +11488,7 @@
end;
end;
//////主要非主要文件/////
-showmessage(MainFormID);
+//showmessage(MainFormID);
MainDocNo := FormCode2DocNo(MainFormID);
MainVersion := FormCode2Version(MainFormID);
if FindSQLData(DM_FORM_INF_List,'DEPE_FORM_ID,MUTEX_FORM_ID','MAIN_FORM_ID,DOC_VERSION',MainDocNo+','+MainVersion,0,FindResult) then
@@ -14377,6 +14386,7 @@
AreaStr : String;
S : TStringlist;
CheckStr : String;
+ uploadMsg:String;//20171122 新增 配合不同mode下要秀不能上傳訊息
begin
IF not InitialOk Then
begin
@@ -14388,7 +14398,7 @@
DisplayPath := '';
ClearCaseIndex;
RejectCase := False;
-
+ uploadMsg:='';
if not CheckCaseID_OK then //檢查是否有未配號的案件
begin
Showmessage(_Msg('尚有未配號案件,無法上傳'));
@@ -14516,7 +14526,24 @@
if CheckErrCount > 0 then
TransMsg := TransMsg + #13#10 + Format(_Msg('檢核失敗件%d件'),[CheckErrCount]);
- Showmessage(_Msg('傳送完成')+#13#10+TransMsg);
+
+ if (FMode = 'DSCAN') and (SuccessCount = 1) then
+ begin
+ uploadMsg:=NowCaseNo+_Msg('影像上傳完成。此案已進入下一流程。');
+ end;
+ if (FMode='ESCAN') and (FModeName='補件掃描') and (SuccessCount = 1) then
+ begin
+ uploadMsg:=NowCaseNo+_Msg('影像已補件完成。');
+ end;
+//ShowMessage('uploadMsg='+uploadMsg);
+ if uploadMsg<>'' then
+ begin
+ ShowMessage(uploadMsg);
+ end
+ else
+ begin
+ Showmessage(_Msg('傳送完成')+#13#10+TransMsg);
+ end;
LoadImgFile;
if (FMode = 'ESCAN') and (SuccessCount = 1) then
--
Gitblit v1.8.0