From 81a3fd10ff6c3af67cf5f10ec854f584439c2ac1 Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期二, 12 九月 2017 17:14:49 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.40 修正補掃 附件 頁數與刪除問題
---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 4 ++--
CB_IMGPSScan.res | 0
CB_IMGPSScanImp.pas | 12 +++++++++---
5 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 7621c70..647d7fe 100644
--- a/CB_IMGPSScan.dproj
+++ b/CB_IMGPSScan.dproj
@@ -95,7 +95,7 @@
<VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">0</VersionInfo>
<VersionInfo Name="Release">1</VersionInfo>
- <VersionInfo Name="Build">39</VersionInfo>
+ <VersionInfo Name="Build">40</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
<VersionInfo Name="Special">False</VersionInfo>
@@ -107,7 +107,7 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"/>
<VersionInfoKeys Name="FileDescription"/>
- <VersionInfoKeys Name="FileVersion">2.0.1.39</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.1.40</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index 83c4516..105319f 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 18364b8..ba56f8f 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 015ca7e..e84e9ff 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index 6ba47b2..b2b13dd 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -5594,13 +5594,13 @@
ST1,ST2,ST3:TStringList;
begin
-
- Result := False;
+ Result := False;
+//ShowMessage(DocNo);
for i := ContextList.Count - 1 downto 0 do
begin
FName := ContextList.Strings[i];
- If DocNo = FormCode2DocNo(FileName2FormCode(FName)) then
+ If (DocNo = FormCode2DocNo(FileName2FormCode(FName))) or (DocNo=AttName) then
begin
if not ISExistImg(Path+'\'+FName) then
begin
@@ -5612,6 +5612,11 @@
end;
ContextList.SaveToFile(Path+'\Context.dat');
ContextList.LoadFromFile(Path+'\Context.dat');
+
+ if ContextList.Count=0 then
+ begin
+ _DelTree(Path);
+ end;
end;
@@ -7297,6 +7302,7 @@
ST1.LoadFromFile(ImageSavePath+NowCaseno+'\EditedDocDir.dat');
for n := 0 to ST1.Count - 1 do
begin
+ if ST1.Strings[n]=AttName then Continue;
//ShowMessage(ST1.Strings[n]+','+BoolToStr(DocNoIs_In_WH(DocNoDir2DocNo(ST1.Strings[n])),true));
if not DocNoIs_In_WH(DocNoDir2DocNo(ST1.Strings[n])) then
begin
--
Gitblit v1.8.0