From 12ec49170b977ff789b7632e0081153f92ecca95 Mon Sep 17 00:00:00 2001
From: lazhen <17772815105@139.com>
Date: 星期三, 27 十一月 2024 12:06:57 +0800
Subject: [PATCH] 装配上线计划Sap同步传参修改

---
 _Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl |    3 +
 _Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_Publish.qbl      |   35 +++++++++++++++++
 _Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl |    6 +-
 _Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl  |    2 
 _Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GetWerk.qbl       |    4 +-
 _Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_Publish.qbl       |   35 +++++++++++++++++
 6 files changed, 78 insertions(+), 7 deletions(-)

diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
index e1a117f..c17c3d5 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_GenerateData.qbl
@@ -49,6 +49,7 @@
       
     }
     loginfo.TotalRow( ms64.MS64Data( relsize ) );
-    InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
+    AOnlineAndMOfflinePlanMS64::Publish( owner, loginfo );
+    //InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
   *]
 }
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_Publish.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_Publish.qbl
new file mode 100644
index 0000000..a7d5ca8
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanMS64/StaticMethod_Publish.qbl
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Publish (
+  InterfaceDataset owner,
+  InterfaceLoginfo loginfo
+)
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Nov-27-2024 (created)
+    jsondata           := JSON::Object();
+    
+    traverse( loginfo, AOnlineAndMOfflinePlanMS64, pir ){
+      jsonarray        := JSON::Array();//.Add( "dto", JSON::Object().Add( "dday", date.Format( "Y-M2-D2" ) ).Add( "fac", "" ) ).Build();
+      traverse( pir, MS64Data, pirdata ){
+        pirjson        := JSON::Object().Add( "product", pirdata.Product() )
+                                        .Add( "factory", pirdata.Werk() ).Build();/*"2024-10-01 12:00:00" )*/
+        jsonarray.Add( pirjson );
+      }
+      jsondata.Add( 'ZPPPSCode', pir.ZPPPSCode() )
+      .Add( 'BERID', '' ).Add( 'BEDAE', '' )
+      .Add( 'DATEV', pir.StartDate().Format( 'YM2D2' ) )
+      .Add( 'DATEB', pir.EndDate().Format( 'YM2D2' ) )
+      .Add( 'VERSBF', pir.VersionFrom() )
+      .Add( 'VERSBT', pir.VersionTo() )
+      .Add( 'VERVS', ifexpr( pir.IsActive(), "X", "" ) )
+      .Add( 'dataList', jsonarray );
+    }
+    
+    loginfo.RequestBody( jsondata.Build().AsString() );
+    info( loginfo.RequestBody() );
+    data              := InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
+    info( '----------------', data.Size() );
+  *]
+}
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
index e6fab67..028aa86 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GenerateData.qbl
@@ -80,6 +80,6 @@
       }
     }
     loginfo.TotalRow( pir.PIRData( relsize ) );
-    InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
+    AOnlineAndMOfflinePlanPIR::Publish( owner, loginfo );
   *]
 }
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GetWerk.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GetWerk.qbl
index 340b845..d8b12e8 100644
--- a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GetWerk.qbl
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_GetWerk.qbl
@@ -9,9 +9,9 @@
     // 鐢勫叞楦� Oct-30-2024 (created)
     value      := '8201;8200';
     if( werk = FinancialProductionReport::GetDefaultCCUnit() ){
-      value    := '8200';
-    }else if( werk = FinancialProductionReport::GetDefaultDLUnit() ){
       value    := '8201';
+    }else if( werk = FinancialProductionReport::GetDefaultDLUnit() ){
+      value    := '8200';
     }
     return value;
   *]
diff --git a/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_Publish.qbl b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_Publish.qbl
new file mode 100644
index 0000000..652cc37
--- /dev/null
+++ b/_Main/BL/Type_AOnlineAndMOfflinePlanPIR/StaticMethod_Publish.qbl
@@ -0,0 +1,35 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod Publish (
+  InterfaceDataset owner,
+  InterfaceLoginfo loginfo
+)
+{
+  TextBody:
+  [*
+    // 鐢勫叞楦� Nov-27-2024 (created)
+    jsondata           := JSON::Object();
+    
+    traverse( loginfo, AOnlineAndMOfflinePlanPIR, pir ){
+      jsonarray        := JSON::Array();//.Add( "dto", JSON::Object().Add( "dday", date.Format( "Y-M2-D2" ) ).Add( "fac", "" ) ).Build();
+      traverse( pir, PIRData, pirdata ){
+        pirjson        := JSON::Object().Add( "product", pirdata.Product() )
+                                        .Add( "planningDate", pirdata.PlanningDate().Format( 'YM2D2' ) )//"2024-10-01" )
+                                        .Add( "planningQty", pirdata.PlanningQty() )
+                                        .Add( "factory", pirdata.Werk() ).Build();/*"2024-10-01 12:00:00" )*/
+        jsonarray.Add( pirjson );
+      }
+      jsondata.Add( 'ZPPPSCode', pir.ZPPPSCode() )
+      .Add( 'werk', pir.Werk() )
+      .Add( 'VERSB', pir.Version() )
+      .Add( 'startDate', pir.StartDate().Format( 'YM2D2' ) )
+      .Add( 'endDate', pir.EndDate().Format( 'YM2D2' ) )
+      .Add( 'dataList', jsonarray );
+    }
+    
+    loginfo.RequestBody( jsondata.Build().AsString() );
+    info( loginfo.RequestBody() );
+    data              := InterfaceLoginfo::CallInterfaceForSAPGet( owner, loginfo );
+    info( '----------------', data.Size() );
+  *]
+}
diff --git a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
index 284443c..abf4b39 100644
--- a/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
+++ b/_Main/BL/Type_InterfaceLoginfo/StaticMethod_CallInterfaceForSAPGet.qbl
@@ -10,8 +10,8 @@
   [*
     // 鐢勫叞楦� Jul-22-2024 (created)
     address           := Translations::InterfaceDataset_SAP_Address(); 
-    httpinterface     := HTTPInterface::Create( address,8080);
-    httpinterface.PostMethod( false ); 
+    httpinterface     := HTTPInterface::Create( address,80);
+    httpinterface.PostMethod( true ); ; 
     httpinterface.MediaType( Translations::InterfaceDataset_ContentType() );
     try{
       if( loginfo.Name() = Translations::InterfaceDataset_AOnlineAndMOfflinePlanPIR_Name() ){//瑁呴厤涓婄嚎璁″垝PIR
@@ -20,7 +20,7 @@
       if( loginfo.Name() = Translations::InterfaceDataset_AOnlineAndMOfflinePlanMS64_Name() ){//瑁呴厤涓婄嚎璁″垝MS64
         httpinterface.URL( Translations::InterfaceDataset_AOnlineAndMOfflinePlanMS64_URL() );
       } 
-      httpinterface.Call();
+      httpinterface.Call( loginfo.RequestBody() );
       result         := httpinterface.Result();
       loginfo.Response( result );
       loginfo.Success( true );

--
Gitblit v1.9.3