From 11b179f35b54d33f8414ccaa815b5fa8313b7746 Mon Sep 17 00:00:00 2001
From: xiaoding721 <33130084+xiaoding721@users.noreply.github.com>
Date: 星期二, 29 十月 2024 17:41:45 +0800
Subject: [PATCH] 修复一些bug
---
_Main/BL/Type_LocalTool/StaticMethod_WriteStringToFile.qbl | 15 +++++++
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchCC.qbl | 15 ++++---
_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchDL.qbl | 41 +++++++++++++-------
3 files changed, 50 insertions(+), 21 deletions(-)
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchCC.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchCC.qbl
index b516ba0..108d268 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchCC.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchCC.qbl
@@ -13,28 +13,29 @@
datas := selectset( recycleBin,DispatchShiftSchedulingLine.DispatchShiftSchedulingProduct,object,object.DispatchShiftSchedulingLine().Fac() = "CC" );
datas_Json := JSON::Array();
-
- traverse( datas,Elements,product ){
+ traverse( datas,Elements,product ,product.DispatchShiftSchedulingDetail( relsize ) <> 0 ){
line := product.DispatchShiftSchedulingLine();
data_Json := JSON::Object();
- datas_Json.Add( data_Json );
-
data_Json.Add( "LineName" , line.LineName() );
data_Json.Add( "ProductionDate",line.ShiftDate().Format( "Y-M2-D2" ));
data_Json.Add( "shiftCode" , line.ShiftName() );
+
details_Json := JSON::Array();
- data_Json.Add( "planItems",details_Json );
traverse( product,DispatchShiftSchedulingDetail,detail ){
detail_Json := JSON::Object();
- details_Json.Add( detail_Json );
detail_Json.Add( "ShiftName",detail.SingleShiftName() );
detail_Json.Add( "Quantity",detail.ShiftVolume() );
detail_Json.Add( "ProductNo",detail.DispatchShiftSchedulingProduct().ProductID() );
+
+ details_Json.Add( detail_Json );
}
+
+ data_Json.Add( "planItems",details_Json );
+ datas_Json.Add( data_Json );
}
- info( datas_Json.AsString() );
+ info( datas_Json.Build().AsString() );
i := HTTPInterface::Create( url, 80 );
i.URL( url );
diff --git a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchDL.qbl b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchDL.qbl
index cca981f..67b1d11 100644
--- a/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchDL.qbl
+++ b/_Main/BL/Type_DispatchShiftSchedulingInformation/StaticMethod_DispatchDL.qbl
@@ -8,46 +8,59 @@
[*
// Akari Oct-28-2024 (created)
// 鎺ュ彛鍦板潃锛�172.30.9.10/PPPS/AddPlan鈥斿ぇ杩炲湴鍧�
- url := "http://172.30.9.10/PPPS/AddPlan"
+ address := "172.30.9.10"
+ url := "/PPPS/AddPlan";
datas := selectset( recycleBin,DispatchShiftSchedulingLine.DispatchShiftSchedulingProduct,object,object.DispatchShiftSchedulingLine().Fac() = "DL" );
datas_Json := JSON::Array();
-
- traverse( datas,Elements,product ){
+ traverse( datas,Elements,product ,product.DispatchShiftSchedulingDetail( relsize ) <> 0 ){
line := product.DispatchShiftSchedulingLine();
data_Json := JSON::Object();
- datas_Json.Add( data_Json );
-
data_Json.Add( "LineName" , line.LineName() );
data_Json.Add( "ProductionDate",line.ShiftDate().Format( "Y-M2-D2" ));
data_Json.Add( "shiftCode" , line.ShiftName() );
+
details_Json := JSON::Array();
- data_Json.Add( "planItems",details_Json );
traverse( product,DispatchShiftSchedulingDetail,detail ){
detail_Json := JSON::Object();
- details_Json.Add( detail_Json );
detail_Json.Add( "ShiftName",detail.SingleShiftName() );
detail_Json.Add( "Quantity",detail.ShiftVolume() );
detail_Json.Add( "ProductNo",detail.DispatchShiftSchedulingProduct().ProductID() );
+
+ details_Json.Add( detail_Json );
}
+
+ data_Json.Add( "planItems",details_Json );
+ datas_Json.Add( data_Json );
}
- info( datas_Json.AsString() );
-
- i := HTTPInterface::Create( url, 80 );
+ i := HTTPInterface::Create( address, 80 );
i.URL( url );
i.PostMethod( true );
i.MediaType( "application/json" );
i.TimeOut( Duration::Minutes( 5 ) );
- i.Call( datas_Json.AsString() );
-
+ resultJson := JSON::Object();
+ resultJson.Add( "jsonStr", datas_Json.Build().AsString() );
+
+ json := resultJson.Build().AsString();
+
+ LocalTool::WriteStringToFile( json );
+
+ i.Call( json );
+
htmlresult := i.Result();
-
+
respJSON := JSON::Parse( htmlresult );
- return respJSON.Get( "Message" ).AsString();
+ result := respJSON.Get( "State" ).AsString();
+ message := respJSON.Get( "Message" ).AsString();
+ if( result = "Error" ){
+ error( "杩滅▼鏈嶅姟鍣ㄨ繑鍥炰簡涓�涓敊璇細" + message );
+ }
+
+ return message;
*]
}
diff --git a/_Main/BL/Type_LocalTool/StaticMethod_WriteStringToFile.qbl b/_Main/BL/Type_LocalTool/StaticMethod_WriteStringToFile.qbl
new file mode 100644
index 0000000..8fc4e77
--- /dev/null
+++ b/_Main/BL/Type_LocalTool/StaticMethod_WriteStringToFile.qbl
@@ -0,0 +1,15 @@
+Quintiq file version 2.0
+#parent: #root
+StaticMethod WriteStringToFile (
+ String str
+) const
+{
+ TextBody:
+ [*
+ // Akari Oct-29-2024 (created)
+ file := OSFile::Construct();
+ file.Open( 'C:/readme.txt', "Write", true );
+ file.WriteTextLine( str );
+ file.Close();
+ *]
+}
--
Gitblit v1.9.3