From a2d1a029bb51e76e0136adafd475aba99a2c9a5c Mon Sep 17 00:00:00 2001
From: Hong <chlin1022@gmail.com>
Date: 星期四, 11 十月 2018 15:45:04 +0800
Subject: [PATCH] 67版
---
ErrList.dcu | 0
CB_IMGPSScan.ocx | 0
CB_IMGPSScan.dproj | 4 ++--
CB_IMGPSScan.res | 0
CB_IMGPSScan_TLB.pas | 4 ++--
OldCaseInfo.dcu | 0
DocList.dcu | 0
CB_IMGPSScanImp.dcu | 0
DocPrt.dcu | 0
AxCtrls.dcu | 0
ScanMemo.dcu | 0
DocCopy.dcu | 0
CB_IMGPSScanImp.pas | 15 ++++++++++-----
SortMemo.dcu | 0
PatchFom.dcu | 0
CB_IMGPSScan.identcache | 0
CB_IMGPSScan_TLB.dcu | 0
InputMask.dcu | 0
18 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/AxCtrls.dcu b/AxCtrls.dcu
index 538ab13..cc36733 100644
--- a/AxCtrls.dcu
+++ b/AxCtrls.dcu
Binary files differ
diff --git a/CB_IMGPSScan.dproj b/CB_IMGPSScan.dproj
index 57200b6..15409ee 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">66</VersionInfo>
+ <VersionInfo Name="Build">67</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.66</VersionInfoKeys>
+ <VersionInfoKeys Name="FileVersion">2.0.1.67</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"/>
<VersionInfoKeys Name="LegalCopyright"/>
<VersionInfoKeys Name="LegalTrademarks"/>
diff --git a/CB_IMGPSScan.identcache b/CB_IMGPSScan.identcache
index b2ce21f..cedb155 100644
--- a/CB_IMGPSScan.identcache
+++ b/CB_IMGPSScan.identcache
Binary files differ
diff --git a/CB_IMGPSScan.ocx b/CB_IMGPSScan.ocx
index cbe22c1..5460dc0 100644
--- a/CB_IMGPSScan.ocx
+++ b/CB_IMGPSScan.ocx
Binary files differ
diff --git a/CB_IMGPSScan.res b/CB_IMGPSScan.res
index 158a503..c13d586 100644
--- a/CB_IMGPSScan.res
+++ b/CB_IMGPSScan.res
Binary files differ
diff --git a/CB_IMGPSScanImp.dcu b/CB_IMGPSScanImp.dcu
index e5e4e90..1b72016 100644
--- a/CB_IMGPSScanImp.dcu
+++ b/CB_IMGPSScanImp.dcu
Binary files differ
diff --git a/CB_IMGPSScanImp.pas b/CB_IMGPSScanImp.pas
index ca8c548..65d6fe7 100644
--- a/CB_IMGPSScanImp.pas
+++ b/CB_IMGPSScanImp.pas
@@ -7654,7 +7654,9 @@
FileList.Delete(FileList.IndexOf(ST1.Strings[n]));
end;
end;
- end;
+ end
+ Else
+ if not DocNoAppear(iDocNo) then Continue; //20180925 Hong覺得應該要加這段
end;
@@ -7851,7 +7853,7 @@
begin
Result := ''; //沒找到
iCaseID := '';
- for i := 1 to MpsBarcodeinf.Count-1 do
+ for i := 1 to MpsBarcodeinf.Count do //20180920 拿掉-1
begin
if (Length(MpsBarcodeinf.text[i]) = CaseIDLength) then
begin
@@ -8713,7 +8715,6 @@
ST1.Add(FileList.Strings[n]);
end;
end;
-
for n := 0 to ST1.Count - 1 do
begin
if (FileList.IndexOf(ST1.Strings[n])<>-1) and (not DocNoIs_In_WH(iDocNo)) then
@@ -8721,7 +8722,11 @@
FileList.Delete(FileList.IndexOf(ST1.Strings[n]));
end;
end;
- end;
+ end
+ Else
+ if not DocNoAppear(iDocNo) then Continue; //20180925 Hong覺得應該加這段
+
+
LogFile1.LogToFile(logTimeString+'WH_category='+FWH_category+',Is_In_Wh='+FIs_In_Wh+',FileList.Text='+FileList.CommaText);
if FileList.Count=0 then Continue;
@@ -9687,7 +9692,7 @@
if FIs_In_Wh <> 'Y' then //不是入庫文件
DocNo := 'YYYYY'+Add_Zoo(Ct,3);
- if (FMode='ESCAN') and (FWH_category='N') then //20170914 補件下改成非入庫的自定文件
+ if (FMode='ESCAN') and (FWH_category='N') then //20170914 補件下改成非入庫的自定文件
begin
DocNo := 'YYYYY'+Add_Zoo(Ct,3);
end;
diff --git a/CB_IMGPSScan_TLB.dcu b/CB_IMGPSScan_TLB.dcu
index ac54654..e812e74 100644
--- a/CB_IMGPSScan_TLB.dcu
+++ b/CB_IMGPSScan_TLB.dcu
Binary files differ
diff --git a/CB_IMGPSScan_TLB.pas b/CB_IMGPSScan_TLB.pas
index d953e87..aa23dbf 100644
--- a/CB_IMGPSScan_TLB.pas
+++ b/CB_IMGPSScan_TLB.pas
@@ -12,10 +12,10 @@
// ************************************************************************ //
// $Rev: 17252 $
-// File generated on 2017/8/18 �U�� 03:12:38 from Type Library described below.
+// File generated on 2018/9/20 �U�� 02:08:58 from Type Library described below.
// ************************************************************************ //
-// Type Lib: C:\Users\Hong\Desktop\Delphi2009_project\work_project\����M��\����жU\���y����CB_IMGPSScan\20170208_�]�mgit\CB_IMGPSScan (1)
+// Type Lib: D:\�u�@��\�M��\����@��\�жU\CUB_IMGPSSCAN\CUB_IMGPSSCAN\CB_IMGPSScan (1)
// LIBID: {F7D1C429-BE85-4FAD-A058-36A41C2AAA89}
// LCID: 0
// Helpfile:
diff --git a/DocCopy.dcu b/DocCopy.dcu
index d3afd5e..197abbe 100644
--- a/DocCopy.dcu
+++ b/DocCopy.dcu
Binary files differ
diff --git a/DocList.dcu b/DocList.dcu
index e086885..a66c942 100644
--- a/DocList.dcu
+++ b/DocList.dcu
Binary files differ
diff --git a/DocPrt.dcu b/DocPrt.dcu
index 2cd2b9e..331d6d7 100644
--- a/DocPrt.dcu
+++ b/DocPrt.dcu
Binary files differ
diff --git a/ErrList.dcu b/ErrList.dcu
index e84e480..14c5f18 100644
--- a/ErrList.dcu
+++ b/ErrList.dcu
Binary files differ
diff --git a/InputMask.dcu b/InputMask.dcu
index 2565ee9..483fd56 100644
--- a/InputMask.dcu
+++ b/InputMask.dcu
Binary files differ
diff --git a/OldCaseInfo.dcu b/OldCaseInfo.dcu
index 82393eb..130f2c1 100644
--- a/OldCaseInfo.dcu
+++ b/OldCaseInfo.dcu
Binary files differ
diff --git a/PatchFom.dcu b/PatchFom.dcu
index 95d772d..9202a3a 100644
--- a/PatchFom.dcu
+++ b/PatchFom.dcu
Binary files differ
diff --git a/ScanMemo.dcu b/ScanMemo.dcu
index 32c39a4..0004411 100644
--- a/ScanMemo.dcu
+++ b/ScanMemo.dcu
Binary files differ
diff --git a/SortMemo.dcu b/SortMemo.dcu
index 6cd7724..3e5dbb5 100644
--- a/SortMemo.dcu
+++ b/SortMemo.dcu
Binary files differ
--
Gitblit v1.8.0