Преглед изворни кода

计量上传附件后无法立即下载。

Chenshilong пре 8 година
родитељ
комит
d6a3366e71
4 измењених фајлова са 9 додато и 7 уклоњено
  1. 4 3
      DataModules/PHPWebDm.pas
  2. 2 2
      Dprs/CSL/Measure_Cloud.dof
  3. BIN
      Dprs/CSL/Measure_Cloud.res
  4. 3 2
      Forms/UpFileFrame.pas

+ 4 - 3
DataModules/PHPWebDm.pas

@@ -90,7 +90,7 @@ type
     function UpDataFile(AUserID, ATenderID, APhaseNo: Integer; AFile, AMD5_JL: string;
       AIsSubmit: Boolean; var AResultStr: string; ACheckPassed: Boolean; ACheckerMemo: string): Boolean;
 
-    function UpAttachment(AUperID, AWebID, ABillID, APhase: Integer; AFile, ACategory, AMemo: string; var ANewFileName, AFileID: string): Boolean;
+    function UpAttachment(AUperID, AWebID, ABillID, APhase: Integer; AFile, ACategory, AMemo: string; var ANewFileName, AFileID, ADownURL: string): Boolean;
     function UpAttachmentOnLine(AWebID, ABillID, APhase: Integer; AIDAry: array of  string): Boolean;
     function DeleteAttachment(AFileID: Integer): Integer;
     function GetAttachmentList(AWebID: Integer; var vArr: TOVArr): Boolean;
@@ -613,7 +613,7 @@ begin
 end;
 
 function TPHPWeb.UpAttachment(AUperID, AWebID, ABillID, APhase: Integer; AFile,
-  ACategory, AMemo: string; var ANewFileName, AFileID: string): Boolean;
+  ACategory, AMemo: string; var ANewFileName, AFileID, ADownURL: string): Boolean;
 var
   vMPFDS: TIdMultiPartFormDataStream;
   sResult, sURL: string;
@@ -664,10 +664,11 @@ begin
     if SameText(J.Value['status'], 'true') then
     begin
       Result := True;
-      vArr := VarArrayOf(['onlinefilename', 'imnid']);
+      vArr := VarArrayOf(['onlinefilename', 'imnid', 'fileurl']);
       J.ChildValues('iteminfo', vArr);
       ANewFileName := vArr[0];
       AFileID := vArr[1];
+      ADownURL := vArr[2];
     end
     else
     begin

+ 2 - 2
Dprs/CSL/Measure_Cloud.dof

@@ -115,7 +115,7 @@ AutoIncBuild=1
 MajorVer=3
 MinorVer=1
 Release=3
-Build=1114
+Build=1115
 Debug=0
 PreRelease=0
 Special=0
@@ -126,7 +126,7 @@ CodePage=936
 [Version Info Keys]
 CompanyName=珠海纵横创新软件有限公司
 FileDescription=纵横结算决算计量一体化云版
-FileVersion=3.1.3.1114
+FileVersion=3.1.3.1115
 InternalName=
 LegalCopyright=
 LegalTrademarks=

BIN
Dprs/CSL/Measure_Cloud.res


+ 3 - 2
Forms/UpFileFrame.pas

@@ -127,7 +127,7 @@ begin
 end;
 
 procedure TUpFileView.btnUpClick(Sender: TObject);
-var sWebName, sPhase, sID: string;
+var sWebName, sPhase, sID, sDownURL: string;
 begin
   Screen.Cursor := crHourGlass;
   try
@@ -145,12 +145,13 @@ begin
     if G_IsCloud then
     begin
       if PHPWeb.UpAttachment(PHPWeb.UserID, TProjectData(FProjectData).WebID, Data.BillID, Data.Phase,
-        Data.OrgFile, Data.Category, Data.Memo, sWebName, sID) then
+        Data.OrgFile, Data.Category, Data.Memo, sWebName, sID, sDownURL) then
       begin
   //      TUpFileManageView(Owner).Rec.ValueByName('HasAttachment').AsBoolean := True;
         CopyFile(PChar(Data.OrgFile), PChar(Data.LocalFile), False);
         Data.Status := ufsNormal;
         Data.ID := StrToInt(sID);
+        Data.DownURL := sDownURL;
         FrameClick(Sender);
       end
       else