From a2d1a029bb51e76e0136adafd475aba99a2c9a5c Mon Sep 17 00:00:00 2001
From: Hong <chlin1022@gmail.com>
Date: 星期四, 11 十月 2018 15:45:04 +0800
Subject: [PATCH] 67版

---
 CB_IMGPSScanImp.pas |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

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;

--
Gitblit v1.8.0