ver 2,0,1,78 版修正

Hong-Dell\Hong

2024-03-20 40bf1f9cb2685c739e7aa7a56d941f09ca512882

ver 2,0,1,78 版修正

修正內容
1.調整呼叫service/imgpsc/IMGPSC02/ftps  action=download 時,下列的回傳值為正常不下載影像件
1
nodata
2.修正前次修改後,造成上傳時沒動作的問題
3.FTP上傳後,呼叫 service/imgpsc/IMGPSC02/caseupload 加傳ftp_image_path

 CB_IMGPSScan.identcache

Binary files differ

 CB_IMGPSScan.ocx

Binary files differ

 CB_IMGPSScanImp.dcu

Binary files differ

 CB_IMGPSScanImp.dfm

@@ -5818,7 +5818,7 @@
    Left = 32
    Top = 360
    Bitmap = {
      494C01010A000D00540010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      494C01010A000D00700010001000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000400000003000000001002000000000000030
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@@ -6227,7 +6227,7 @@
    Left = 32
    Top = 225
    Bitmap = {
      494C010105000900540020002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      494C010105000900700020002000FFFFFFFFFF10FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000800000004000000001002000000000000080
      0000000000000000000000000000000000000000000000000000000000000000
      0000000000000000000000000000000000000000000000000000000000000000
@@ -7298,7 +7298,7 @@
    Left = 29
    Top = 273
    Bitmap = {
      494C010107000900540020002000FFFFFF00FF10FFFFFFFFFFFFFFFF424D3600
      494C010107000900700020002000FFFFFF00FF10FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000800000004000000001002000000000000080
      000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF
@@ -8369,7 +8369,7 @@
    Left = 37
    Top = 313
    Bitmap = {
      494C010107000900540020002000FFFFFF00FF10FFFFFFFFFFFFFFFF424D3600
      494C010107000900700020002000FFFFFF00FF10FFFFFFFFFFFFFFFF424D3600
      0000000000003600000028000000800000004000000001002000000000000080
      000000000000000000000000000000000000FFFFFF00FFFFFF00FFFFFF00FFFF
      FF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFFFF00FFFF

 CB_IMGPSScanImp.pas

@@ -1,5 +1,5 @@
unit CB_IMGPSScanImp;
//Test
//PRO
{$WARN SYMBOL_PLATFORM OFF}

interface
@@ -24,7 +24,7 @@
  Xmltool,inifiles,printers,IdHashMessageDigest, idHash, LogFile,ShellApi,
  SBSocket,IIS_Ftp, SBSimpleFTPS;
Type
  TTransMode =(tsHttp,tsFtp);
  TTransMode =(tsHttp,tsFtp,tsNone);

var
  Ch_WriteNote : Boolean;
@@ -6640,6 +6640,7 @@
      +'&must_formid='+must_formidStr  //擁有的 formid
      +'&last_add_formid='+last_add_formidstr   //當次新加的 formid
      +'&form_code='+ScanListStr      //scanlist.dat 表單代號
      +'&ftp_image_path='+FFtpPath   //加傳FTP目錄  HTTP上傳時會是空白
      +'&in_doc1='+HTTPEncode(UTF8Encode(In_Doc1))
      +'&in_doc2='+HTTPEncode(UTF8Encode(In_Doc2));

@@ -6930,7 +6931,7 @@
Function TCB_IMGPSScanX.DownLoadImage(Path,CaseID:String):Boolean;
begin
  Result := True;
  if not GetftpInfo(CaseID,'download') then   //取案件上傳方式
  if not GetftpInfo(CaseID,'download') then   //取案件下載方式
  begin
    DownFileErrStr := _Msg('取案件下載資訊失敗,')+HttpErrStr;
    Result := False;
@@ -10993,19 +10994,35 @@
    Result := False;
    Exit;
  end;
  IF (memo1.Lines.Strings[0] = '1') or (memo1.Lines.Strings[0] <> '0') Then
  IF (memo1.Lines.Strings[0] = '1') Then
  begin
    if memo1.Lines.Strings[1]='nodata' then   //nodata 為正常可繼續的判斷
    begin
      TransMode := tsNone;
      Result := True;
      Exit;
    end
    else
  begin
    HttpErrStr := _Msg('錯誤原因:')+memo1.Lines.Strings[1];
    Result := False;
    Exit;
    end;
  end
  Else if Pos('<script type="text/javascript" src="scripts/CW00/login.js"></script>',Memo1.Lines.Text) > 0 then
  begin
    HttpErrStr := _Msg('錯誤原因:')+_Msg('閒置過久或被登出,請重新登入');
    Result := False;
    Exit;
  end
  else if (memo1.Lines.Strings[0] <> '0') then//不認識的字串
  begin
    HttpErrStr := _Msg('錯誤原因:')+memo1.Lines.Strings[0];
    Result := False;
    Exit;
  end;
  TransMode := tsHttp;
  FFtpPath := '';
  if memo1.Lines.Strings[0] = '0' then
  begin
    if memo1.Lines.Strings[2] = 'Y' then

 CB_IMGPSScan_test.ocx

Binary files differ