From b3026a0a6994a3f8202a3aff3fa9ed79c2fd113a Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期五, 19 七月 2024 14:50:07 +0800
Subject: [PATCH] 发运实际数据接口调用

---
 _Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl                                       |   16 ++++++++
 _Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl                                              |   27 ++++++++++---
 _Main/BL/Type_ShippingActualData/StaticMethod_GetRequestBody.qbl                                           |   15 +++++++
 _Main/UI/MacroPlannerWebApp/Component_FormShippingActualData/Response_PanelButton_ButtonButton_OnClick.def |    8 ++--
 4 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl b/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl
new file mode 100644
index 0000000..21e6039
--- /dev/null
+++ b/_Main/BL/Dataset_InterfaceDataset/Daemon_ShippingActualInterface.qbl
@@ -0,0 +1,16 @@
+Quintiq file version 2.0
+#parent: #root
+Daemon ShippingActualInterface
+{
+  Frequency: P1DT0H0M0S
+  Priority: 'Default'
+  StartDate: 2024-07-19
+  StartTimeOfDay: P0DT23H30M0S
+  Text:
+  [*
+    options := DatasetFindOptions::Construct( 'InterfaceDataset' ).IncludeOffline( true ); //to load we must search offline datasets.
+    mdskey := DatasetController::FindUnique( options );
+    
+    MDSInterfaceDataset::Root( mdskey ) -> ShippingActualData::Synchronize();
+  *]
+}
diff --git a/_Main/BL/Type_ShippingActualData/StaticMethod_GetRequestBody.qbl b/_Main/BL/Type_ShippingActualData/StaticMethod_GetRequestBody.qbl
new file mode 100644
index 0000000..d122b01
--- /dev/null
+++ b/_Main/BL/Type_ShippingActualData/StaticMethod_GetRequestBody.qbl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod GetRequestBody (
+  Date date
+) as String
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Jul-19-2024 (created)
+    json := JSON::Object()
+                  .Add( "inParam", JSON::Object().Add( "dday", date.Format( "Y-M2-D2" ) ) ).Build();
+    requestbody := json.AsString();
+    return requestbody
+  *]
+}
diff --git a/_Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl b/_Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl
index 5d13359..f528ecb 100644
--- a/_Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl
+++ b/_Main/BL/Type_ShippingActualData/StaticMethod_Synchronize.qbl
@@ -6,14 +6,27 @@
 {
   TextBody:
   [*
-    // 鐢勫叞楦� Jul-17-2024 (created)
+    //// 鐢勫叞楦� Jul-17-2024 (created)
     column := owner.ShippingActualColumn( relnew, StartDate := Date::ActualDate(), Index := owner.ShippingActualColumn( relsize ) );
-    url := "http://localhost:8080/api/shippingActual" + "?date=" + column.StartDate().Format( "Y-M2-D2" );
-    i := HTTPInterface::Create( url, 80 ); 
-     
-    i.PostMethod( true );
-    i.Call(); 
-    result := i.Result();
+    // vwedadmin Jul-18-2024 (created)
+    address := "ds-yunrong-gw.dmp.vwfawedl.mobi"; 
+    
+               /// http://ds-yunrong-gw.dmp.vwfawedl.mobi/data-service/api/service/post-data/V1.101/f4f94c47c1a2440898b5e1e2c0c5cbc8 
+    httpinterface := HTTPInterface::Create( address,80);
+                    httpinterface.URL("/data-service/api/service/post-data/V1.101/f4f94c47c1a2440898b5e1e2c0c5cbc8");
+    httpinterface.MediaType("application/json");
+    //httpinterface.SSL(true);
+    //httpinterface.SSLKeystore("MyKeystore");
+    httpinterface.PostMethod(true); 
+    //str :='{
+    //    "inParam":
+    //        {
+    //            "dday" : "2024-07-11"
+    //        }
+    //}'
+    httpinterface.AddHeader("Authorization","MTlLeG94UEYyNWN5OTZLOFRMXzUyNzA4ODkwNzg1NTA2OTIxNV9wcml2YXRlS2V5XzE3MjEzMDM4Nzc0NTE=")
+    httpinterface.Call( ShippingActualData::GetRequestBody( column.StartDate() ) ); //Sends request with the header Authorization: 538baa9045a84c0e889f 鍙互浼犻�掑姩鎬乼oken 鐨勫惂
+    result := httpinterface.Result();
     
     cnv1 := StringToDateTime::StandardConverter();
     cnv1.SetCustomConversion();
diff --git a/_Main/UI/MacroPlannerWebApp/Component_FormShippingActualData/Response_PanelButton_ButtonButton_OnClick.def b/_Main/UI/MacroPlannerWebApp/Component_FormShippingActualData/Response_PanelButton_ButtonButton_OnClick.def
index ae7f5f0..fe6c193 100644
--- a/_Main/UI/MacroPlannerWebApp/Component_FormShippingActualData/Response_PanelButton_ButtonButton_OnClick.def
+++ b/_Main/UI/MacroPlannerWebApp/Component_FormShippingActualData/Response_PanelButton_ButtonButton_OnClick.def
@@ -13,11 +13,11 @@
   {
     Body:
     [*
-      //binaryValue := ShippingActualData::Export( InterfaceDataset );
-      //
-      //Application.Download( ShippingActualData::GetDefalutName() + '.xlsx', binaryValue.AsBinaryData() );
+      binaryValue := ShippingActualData::Export( InterfaceDataset );
       
-      ShippingActualData::Synchronize( InterfaceDataset );
+      Application.Download( ShippingActualData::GetDefalutName() + '.xlsx', binaryValue.AsBinaryData() );
+      
+      //ShippingActualData::Synchronize( InterfaceDataset );
     *]
     GroupServerCalls: false
   }

--
Gitblit v1.9.3