From ba3d1955b0019dcccef06a889ebce33035ed44ba Mon Sep 17 00:00:00 2001
From: doom4ster <doom4ster@gmail.com>
Date: 星期三, 16 八月 2017 14:10:58 +0800
Subject: [PATCH] CB_IMGPSScan.cab ver2.0.1.33 修改刪除功能
---
CB_IMGPSScanImp.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 4 ++--
CB_IMGPSScan.res | 0
CB_IMGPSScanImp.pas | 38 +++++++++++---------------------------
5 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 0b7265d..12fe0c7 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">32</VersionInfo>
+ <VersionInfo Name="Build">33</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.32</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.1.33</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index 6f65e91..79d6795 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 238d7b9..9d6eda9 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index 3d7497d..cd63378 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index fe778b7..dd1bda9 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -2188,14 +2188,14 @@
iISB := TImageScrollBox(FindComponent(iISBName));
//ShowMessage('iISB.FileName='+iISB.FileName);
//ShowMessage(ExtractFilePath(iISB.FileName)+','+ExtractFileName(iISB.FileName)+','+NowCaseNo);
- if (FMode = 'ESCAN') and (FModeName<>'異動件') then
- begin
- if ISExistImg(iISB.FileName) then
- begin
- ShowMessage(_Msg('此圖為非當次掃瞄，不可刪除'));
- Exit;
- end;
- end;
+// if (FMode = 'ESCAN') and (FModeName<>'異動件') then
+// begin
+// if ISExistImg(iISB.FileName) then
+// begin
+// ShowMessage(_Msg('此圖為非當次掃瞄，不可刪除'));
+// Exit;
+// end;
+// end;
DeleteImageFile(ExtractFilePath(iISB.FileName),ExtractFileName(iISB.FileName),NowCaseNo);
end;
@@ -2424,17 +2424,12 @@
begin
if TreeView1.Selected = NewTreeNode then //全刪 //新掃描件
begin
- if (FMode = 'ESCAN') then
- begin
- ShowMessage(_Msg('補件不可刪除全案影像'));
- Exit;
- end;
If Messagedlg(_Msg('是否刪除所有案件?'),mtconfirmation,[mbyes,mbcancel],0) = mrcancel then Exit;
clearView(1);
Application.ProcessMessages;
_DelTree(ImageSavePath);
- if (FMode = 'ESCAN') and (FModeName<>'異動件') then
+ if (FMode = 'ESCAN') then
begin
MkDir(ImageSavePath+FCaseID);
CreateEmptyCase(ImageSavePath,FCaseID);
@@ -2444,11 +2439,7 @@
end
Else if TreeView1.Selected = MyTreeNode1 then //案件編號
begin
- if (FMode = 'ESCAN') and (FModeName<>'異動件') then
- begin
- ShowMessage(_Msg('補件不可刪除全案影像'));
- Exit;
- end;
+
If Messagedlg(Format(_Msg('編號(%s)是否刪除?'),[NowCaseno]),mtconfirmation,[mbyes,mbcancel],0) = mrcancel then Exit;
clearView(1);
Application.ProcessMessages;
@@ -2493,14 +2484,6 @@
If Messagedlg(Format(_Msg('文件(%s)是否刪除?'),[DocNo2DocName(NowCaseno,NowDocNo)]),mtconfirmation,[mbyes,mbcancel],0) = mrcancel then Exit;
ClearView(1);
Application.ProcessMessages;
- if (FMode = 'ESCAN') and (FModeName<>'異動件') then
- begin
- if not DocNoIsExistImg(ImageSavePath+NowCaseno+'\'+NowDocDir+'\') then
- begin
- ShowMessage(_Msg('有圖為非當次掃瞄，不可刪除'));
- Exit;
- end;
- end;
_DelTree(ImageSavePath+NowCaseno+'\'+NowDocDir);
SetUseCase('D',ImageSavePath+NowCaseno+'\',NowDocDir,'','');
@@ -13369,6 +13352,7 @@
i: Integer;
begin
Timer1.Enabled := False;
+ //FIs_In_Wh:='Y';
//Showmessage('a');
//self.FIs_OldCase := 'Y';
--
Gitblit v1.8.0