From aac5dad3baf6dac48066f6be05e8ae158c35e563 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期三, 22 二月 2017 10:42:34 +0800
Subject: [PATCH] 還未解決第一次上傳未歸類造成的問題
---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 6 +-
CB_IMGPSScan.res | 0
CB_IMGPSScanImp.pas | 116 +++++++++++++++++++++++++++-----------
5 files changed, 85 insertions(+), 37 deletions(-)
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index df201db..bd41982 100644
--- a/CB_IMGPSScan.dproj
+++ b/CB_IMGPSScan.dproj
@@ -94,10 +94,10 @@
<VersionInfo>
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
- <VersionInfo Name="MajorVer">1</VersionInfo>
+ <VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
- <VersionInfo Name="Build">0</VersionInfo>
+ <VersionInfo Name="Build">3</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
@@ -109,7 +109,7 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
- <VersionInfoKeys Name="FileVersion">1.0.0.0</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.0.3</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index 6d82a8e..e2c6a2a 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index fd7ab77..21fa9e3 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 2515c82..858b66b 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 78c425b..d2615cb 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -3567,8 +3567,28 @@
end;
procedure TCB_IMGPSScanX.Button4Click(Sender: TObject);
+var
+ i:integer;
+ str:String;
begin
- Showmessage(self.Doc_Inf_List.Text);
+ //Showmessage(self.Doc_Inf_List.Text);
+ //LoadImgFile;
+ //LoadImgFile1;
+ str:='';
+ for I := 1 to 11 do // �� OMRErrInfo �����e
+ begin
+ str:=str+BoolToStr(OMRErrInfo[i].Display)+','
+ +BoolToStr(OMRErrInfo[i].Ignore)+','+OMRErrInfo[i].Info+','
+ +OMRErrInfo[i].Mode+#10#13;
+ end;
+ ShowMessage('OMRErrInfo='+str);
+ ShowMessage('Doc_Inf_List='+Doc_Inf_List.Text);
+ ShowMessage('DM_FORM_INF_List='+DM_FORM_INF_List.Text) ;
+ ShowMessage('FORM_INF_List='+FORM_INF_List.Text) ;
+ ShowMessage('CHECK_RULE_INF_List='+CHECK_RULE_INF_List.Text) ;
+ ShowMessage('MEMO_INF_List='+MEMO_INF_List.Text) ;
+ ShowMessage('WORK_INF_List='+WORK_INF_List.Text) ;
+ ShowMessage('LASTEST_FORM_INF_List='+LASTEST_FORM_INF_List.Text) ;
end;
procedure TCB_IMGPSScanX.StatrTwainScan;
@@ -4296,7 +4316,7 @@
IF (ImageScrollBox1.FileName <> FileName) and (FileName <> '') then
begin
ImageScrollBox1.LoadFromFile(FileName,1);
- FindPoint(ImageScrollBox1.Graphic,UpLPoint,UpRPoint,DownLPoint,'');
+ FindPoint(ImageScrollBox1.Graphic,UpLPoint,UpRPoint,DownLPoint,'NONE');
ClearLine(ISB_BW.Graphic,bt);
ISB_BW.Redraw(True);
Application.ProcessMessages;
@@ -5428,6 +5448,7 @@
/////����////
////�W��/////
SendData:='data='+HTTPEncode(UTF8Encode(FData))+'&verify='+FVerify+'&form_id='+UpformID+'&loan_doc='+Case_loandoc+'&case_no='+TransName+'&doc_data='+HTTPEncode(UTF8Encode(Doc_Data))+'&doc_data1='+HTTPEncode(UTF8Encode(Doc_Data1))+'&attach='+AttachYN+'&in_doc1='+HTTPEncode(UTF8Encode(In_Doc1))+'&in_doc2='+HTTPEncode(UTF8Encode(In_Doc2));
+
if not upFile(HTTPSClient,FUrl,'service/imgpsc/IMGPSC02/caseupload',SendData,'file',Path+'Img.zip',FReWrite,Memo1,False) then
begin
Showmessage(Format(_Msg('�ǰe�ץ�s��(%s)�ɮ�,�����o�Ϳ��~!!'+_Msg('���~�N�X:')),[CaseID])+Inttostr(HttpError.HttpErrorCode)+' '+HttpError.HttpReason);
@@ -5471,6 +5492,7 @@
////�R��////
//_DelTree(Path); //�|�u�RTransPath
+//ShowMessage('STOP');
_DelTree(ImageSavePath+CaseID);
SetCaseList('D',-1,CaseID);
////�R��////
@@ -5685,6 +5707,7 @@
EnCodeDateTime := En_DecryptionStr_Base64('E',ServerDate+GetBalance2Time(Balance),Mpskey);
///service/slic/SLIC04/case?data=&verify=&case_no=&file=
SendData := 'data='+HTTPEncode(UTF8Encode(FData))+'&verify='+FVerify+'&case_no='+CaseID+'&file=';
+//ShowMessage(SendData);
if not dnFile_Get(HTTPSClient,Furl,'service/imgpsc/IMGPSC04/case',SendData,Path+CaseID+'.zip',FReWrite,Memo1,False,DownImgStatus) then
begin
HttpErrStr := _Msg('���~�N�X:')+Inttostr(HttpError.HttpErrorCode)+' '+HttpError.HttpReason;
@@ -8956,6 +8979,7 @@
for i := 0 to FileList.Count - 1 do
begin
Docno := FormCode2DocNo(FileName2FormCode(FileList.Strings[i]));
+ShowMessage('Docno='+Docno);
DocNoList.Add(DocNo);
Exists := False;
for n := 0 to CaseDocNoList.Count - 1 do
@@ -8969,6 +8993,7 @@
CaseDocNo_CopiesList.Add('1');
end;
end;
+ShowMessage('CreateCaseNeedData DocNoList='+DocNoList.Text);
DocNoList.SaveToFile(Path+'DocDir.dat');
CaseDocNoList.SaveToFile(Path+'CaseDocNo.dat');
CaseDocNo_CopiesList.SaveToFile(Path+'CaseDocNo_Copies.dat')
@@ -9617,13 +9642,35 @@
OldFile,NewFile:String;
DocNoList,FileList : TStringlist;
iFileList,iFile_DocDirList :TStringlist;
+ AA,AA2,AA3,AA4:Boolean;
begin
+ShowMessage('aaaaaaaa');
+ if not FileExists(SoDir+'CaseDocNo.dat') then
+ begin
+ShowMessage('1111111111');
+ end;
+ if not FileExists(SoDir+'DocDir.dat') then
+ begin
+ShowMessage('222222222');
+ end;
+
if (not FileExists(SoDir+'CaseDocNo.dat')) or (not FileExists(SoDir+'DocDir.dat')) then //�I�e���|�S�o����
+ begin
+ShowMessage('���ͥ��n����r��');
CreateCaseNeedData(SoDir); //���ͥ��n����r��
- CopyFile(PWideChar(SoDir+'CaseDocNo.dat'),PWideChar(DeDir+'CaseDocNo.dat'),False);
- CopyFile(PWideChar(SoDir+'CaseDocNo_Copies.dat'),PWideChar(DeDir+'CaseDocNo_Copies.dat'),False);
- CopyFile(PWideChar(SoDir+'CustomDocNo.ini'),PWideChar(DeDir+'CustomDocNo.ini'),False);
- CopyFile(PWideChar(SoDir+'UseCase.ini'),PWideChar(DeDir+'UseCase.ini'),False);
+ end;
+
+ AA:=CopyFile(PWideChar(SoDir+'CaseDocNo.dat'),PWideChar(DeDir+'CaseDocNo.dat'),False);
+ AA2:=CopyFile(PWideChar(SoDir+'CaseDocNo_Copies.dat'),PWideChar(DeDir+'CaseDocNo_Copies.dat'),False);
+ AA3:=CopyFile(PWideChar(SoDir+'CustomDocNo.ini'),PWideChar(DeDir+'CustomDocNo.ini'),False);
+ AA4:=CopyFile(PWideChar(SoDir+'UseCase.ini'),PWideChar(DeDir+'UseCase.ini'),False);
+//ShowMessage(BoolToStr(AA)+#10#13+BoolToStr(AA2)+#10#13+BoolToStr(AA3)+#10#13+BoolToStr(AA4));
+ if FileExists(SoDir+'DocDir.dat') then
+ begin
+ CopyFile(PWideChar(SoDir+'DocDir.dat'),PWideChar(DeDir+'DocDir.dat'),False);
+ end;
+
+
DocNoList := TStringlist.Create;
FileList := TStringlist.Create;
iFileList := TStringlist.Create;
@@ -9655,6 +9702,7 @@
DocDir := DocNoList.Strings[i];
MkDir(DeDir+DocDir);
end;}
+ShowMessage('DocNoList='+DocNoList.Text);
for i := DocNoList.Count - 1 downto 0 do
begin
@@ -9667,16 +9715,18 @@
end
else
begin
+ShowMessage('GGG');
DocNoList.Delete(i);
DocNoList.SaveToFile(DeDir+'CaseDocNo.dat');
if i <= CaseDocNo_CopiesList.Count-1 then
begin
+ShowMessage('KKKK');
CaseDocNo_CopiesList.Delete(i);
CaseDocNo_CopiesList.SaveToFile(DeDir+'CaseDocNo_Copies.dat');
end;
end;
end;
-
+ //20170221 �����Ѱ_�� �]���L�b�ɥR���ˮɦn���|����ܪ����D
for i := 0 to iFileList.Count - 1 do
begin
@@ -10825,7 +10875,7 @@
begin
Result := True; // http://192.168.0.101:8080/fbnp/servlet/CWC01?act=getservertime
//dnFile(HTTPSClient,FUrl+'Language.Lng','','',LngPath+'Language.Lng',FReWrite.Text,Memo1,False,DownImgStatus)
- If not dnFile(HTTPSClient,FUrl+'Language.Lng','','',LngPath+'Language.Lng',FReWrite,Memo1,False,'') Then
+ If not dnFile_Get(HTTPSClient,FUrl+'Language.Lng','','',LngPath+'Language.Lng',FReWrite,Memo1,False,'') Then
begin
HttpErrStr := _Msg('���~�N�X:')+inttostr(HttpError.HttpErrorCode)+','+HttpError.HttpReason;
Result := False;
@@ -10842,11 +10892,8 @@
HttpErrStr := _Msg('���~��]:')+_Msg('���m�L�[�γQ�n�X,�Э��s�n�J');
Result := False;
Exit;
- end
- Else {if Trim(memo1.Lines.Strings[0]) = SBUtils.StrToUTF8('MultiLanguage') Then}
- begin
- memo1.Lines.SaveToFile(LngPath+'Language.lng',TEncoding.UTF8);
end;
+
end;
procedure TCB_IMGPSScanX.view_image_FormCode(Path,FormCode:String;stpage,stview:integer); //��FormCode�ӧ�v��
@@ -12330,7 +12377,7 @@
var
SendData : String;
begin
- SendData := 'data='+FData+'&verify='+FVerify+'&case_no='+CaseID;
+ SendData := 'data='+HTTPEncode(UTF8Encode(FData))+'&verify='+FVerify+'&case_no='+CaseID+'&work_no='+FWork_no;
if (FMode = 'NSCAN') then
begin
If not ProcessServlet_Get(HTTPSClient,FURL+'service/imgpsc/IMGPSC05/isnew',SendData,FReWrite,Memo1,False) Then
@@ -12340,6 +12387,7 @@
Exit;
end;
end;
+
IF memo1.Lines.Strings[0] <> '0' Then
begin
HttpErrStr := _Msg('���~��]:')+memo1.Lines.Strings[1];
@@ -12708,7 +12756,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetServerDate '+ServerDate+' , '+ServerTime);
+//ShowMessage('GetServerDate '+ServerDate+' , '+ServerTime);
////�U���t�θ�T////
IF not GetSetInf1 Then //��DOC_INF ����T
begin
@@ -12716,7 +12764,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf1');
+//ShowMessage('GetSetInf1');
//showmessage(self.Doc_Inf_List.Text);
IF not GetSetInf2 Then //��DM_FORM_INF �̤ۨ�����T
begin
@@ -12724,7 +12772,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf2');
+//ShowMessage('GetSetInf2');
//Showmessage(self.Doc_Inf_List.Text);
IF not GetSetInf3 Then //��FORM_INF ����T
begin
@@ -12732,7 +12780,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf3');
+//ShowMessage('GetSetInf3');
IF not GetSetInf4 Then //��CHECK_RULE_INF �ˮֳW�h��T
begin
Showmessage(_Msg('���ˮֳW�h��T��,�����o�Ϳ��~!!')+HttpErrStr);
@@ -12740,14 +12788,14 @@
Exit;
end;
//showmessage(self.CHECK_RULE_INF_List.Text);
-ShowMessage('GetSetInf4');
+//ShowMessage('GetSetInf4');
IF not GetSetInf5 Then //��MEMO_INF �`���y��T
begin
Showmessage(_Msg('���`�Τ��y��T��,�����o�Ϳ��~!!')+HttpErrStr);
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf5');
+//ShowMessage('GetSetInf5');
//showmessage(self.MEMO_INF_List.Text);
IF not GetSetInf6 Then //��WORK_INF �t�ΰѼƸ�T
begin
@@ -12755,7 +12803,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf6');
+//ShowMessage('GetSetInf6');
//showmessage(FORM_INF_List.Text);
IF not GetSetInf7 Then //��LASTES_FORM_INF �t�ΰѼƸ�T
begin
@@ -12763,7 +12811,7 @@
DataLoading(False,False);
Exit;
end;
-ShowMessage('GetSetInf7');
+//ShowMessage('GetSetInf7');
//Showmessage(LASTEST_FORM_INF_List.Text);
SetFormID_DocNo; //�NFormID��Docno��X��JList�� 20130403�W�[
SetIn_WH_DocNo; //�N�n�J�w��DocNo��X�ӥt�s�Jlist��
@@ -12811,14 +12859,14 @@
DataLoading(True,True);
////�U���y����///// 20170218 �����եH�K����
-// If not DownLanguage Then
-// begin
-// Showmessage('Language File error!!'+HttpErrStr);
-// DataLoading(False,False);
-// Exit;
-// end;
+ If not DownLanguage Then
+ begin
+ Showmessage('Language File error!!'+HttpErrStr);
+ DataLoading(False,False);
+ Exit;
+ end;
- //InitialLanguage(Self); //���J�h��y��
+ InitialLanguage(Self); //���J�h��y��
////�U���y����/////
if (FMode = 'RSCAN') or (FMode = 'ESCAN') or (FMode = 'FSCAN') then //������β��ʥ�n�u�౽���w�s������
begin
@@ -12839,9 +12887,9 @@
DataLoading(False,False);
Exit;
end;
-
+//Showmessage(ImageSavePath+FCaseID+'\Download\'+#10#13+ImageSavePath+FCaseID+'\');
Download2Case(ImageSavePath+FCaseID+'\Download\',ImageSavePath+FCaseID+'\');
- //Showmessage('aaa');
+//Showmessage('aaa');
//Download2Case('C:\Users\Hong\Downloads\�S���A��\',ImageSavePath+FCaseID+'\');
if (FIs_OldCase = 'Y') then
begin
@@ -12863,7 +12911,7 @@
Create_Cust_DocDir(FCaseID); //���ͥ~���ǤJ�����
end;
end;
-ShowMessage('GetOMRCheckSet�e');
+//ShowMessage('GetOMRCheckSet�e');
////�U���ˮ�XML//////
IF not GetOMRCheckSet Then
begin
@@ -12872,7 +12920,7 @@
Exit;
end;
////�U���ˮ�XML/////
-ShowMessage('GetOMRCheckSet���');
+//ShowMessage('GetOMRCheckSet���');
////�U���n���]�w/////
IF not GetKeyinSet Then
begin
@@ -12881,7 +12929,7 @@
Exit;
end;
////�U���n���]�w/////
-ShowMessage('GetKeyinSet');
+//ShowMessage('GetKeyinSet');
if ScanDenialHint <> '' then //���]�w���ܦr��N�q�b�k�W��
begin
DenialTimeLb.Visible := True;
@@ -12908,7 +12956,7 @@
Splitter2.Visible := False; }
DataLoading(False,False);
-ShowMessage('��l�ܰ��槹��');
+//ShowMessage('��l�ܰ��槹��');
end;
procedure TCB_IMGPSScanX.Timer2Timer(Sender: TObject);
--
Gitblit v1.8.0