From b9182210a3e4f472dd5f7f10ed953668d158cceb Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期五, 01 十二月 2017 14:35:14 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.56 修改訊息
---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScanImp.pas | 23 +++++++++++------------
3 files changed, 11 insertions(+), 12 deletions(-)
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index a372035..0c35097 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 784f4af..a56c9db 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index e959fcf..f821fac 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -6261,11 +6261,10 @@
//FMaxUploadSize
//ShowMessage(IntToStr(FileRec.Size));
//Result:=False;
-//exit;
+//exit; %.3f ,[FileRec.Size / 1048576]
If FileRec.Size > StrtoInt(FMaxUploadSize) * 1048576 Then // 檢查檔案大小
Begin
- ShowMessage(Format('%.3f', [FileRec.Size / 1048576]) +
- ' MB,超過上傳限制大小 '+FMaxUploadSize+' MB');
+ ShowMessage(Format('%s上傳失敗，錯誤原因：上傳檔案超過'+FMaxUploadSize+'MB，無法上傳',[caseid]) );
FindClose(FileRec);
Result := False;
Exit;
@@ -6292,19 +6291,19 @@
//ShowMessage(FData+#10#13+Doc_Data);
if not upFile(HTTPSClient,FUrl,'service/imgpsc/IMGPSC02/caseupload',SendData,'file',Path+'Img.zip',FReWrite,Memo1,False) then
begin
- Showmessage(Format(_Msg('傳送案件編號(%s)檔案時,網路發生錯誤!!'+_Msg('錯誤代碼:')),[CaseID])+Inttostr(HttpError.HttpErrorCode)+' '+HttpError.HttpReason);
+ Showmessage(Inttostr(HttpError.HttpErrorCode)+' '+HttpError.HttpReason+'.');
Result := False;
Exit;
end;
if memo1.Lines.Strings[0] = '1' then
begin
- Showmessage(Format(_Msg('傳送案件編號(%s)檔案時,網路發生錯誤!!')+_Msg('錯誤原因:'),[CaseID])+memo1.Lines.Strings[1]);
+ Showmessage(Format(_Msg('')+_Msg(''),[CaseID])+memo1.Lines.Strings[1]+'.');
Result := False;
Exit;
end
- Else if Pos('<script type="text/javascript" src="scripts/CW00/login.js"></script>',Memo1.Lines.Text) > 0 then
+ Else if Pos('<script type="text/javascript" src="scripts/IMGPS00/login.js"></script>',Memo1.Lines.Text) > 0 then
begin
- Showmessage(Format(_Msg('傳送案件編號(%s)檔案時,網路發生錯誤!!')+_Msg('錯誤原因:')+_Msg('閒置過久或被登出,請重新登入'),[CaseID]));
+ Showmessage(Format(_Msg('')+_Msg('')+_Msg('閒置過久或被登出,請重新登入'),[CaseID]));
Result := False;
Exit;
end;
@@ -14443,7 +14442,7 @@
uploadMsg:='';
if not CheckCaseID_OK then //檢查是否有未配號的案件
begin
- Showmessage(_Msg('尚有未配號案件,無法上傳'));
+ Showmessage(_Msg('尚有「無案件編號」之案件，無法上傳'));
Exit;
end;
@@ -14509,7 +14508,7 @@
end;
if CaseTrans = -1 then //失敗
begin
- Showmessage(_Msg('詢問案件可否傳送時,網路發生錯誤!!')+HttpErrStr);
+ Showmessage(_Msg('')+HttpErrStr+'.');
DataLoading(False,False);
LoadImgFile;
Exit;
@@ -14562,11 +14561,11 @@
end;
end;
DataLoading(False,False);
- TransMsg := Format(_Msg('成功件%d件'),[SuccessCount]);
+ TransMsg := Format(_Msg('成功件【%d】件'),[SuccessCount]);
if ReCasecount > 0 then
- TransMsg := TransMsg + #13#10 + Format(_Msg('無法上傳件%d件'),[ReCasecount]);
+ TransMsg := TransMsg + #13#10 + Format(_Msg('無法上傳件【%d】件'),[ReCasecount]);
if CheckErrCount > 0 then
- TransMsg := TransMsg + #13#10 + Format(_Msg('檢核失敗件%d件'),[CheckErrCount]);
+ TransMsg := TransMsg + #13#10 + Format(_Msg('檢核失敗件【%d】件，請先點選「案件編號」，再點選「問號」查看錯誤原因'),[CheckErrCount]);
if (FMode = 'DSCAN') and (SuccessCount = 1) then
--
Gitblit v1.8.0