From 6e706c10adb5b97deeeddd41765135a8bee9246a Mon Sep 17 00:00:00 2001
From: liyf <liyf@connor.net.cn>
Date: Wed, 22 Apr 2020 11:18:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86SAP=E4=BC=A0?=
 =?UTF-8?q?=E9=80=92=20http://plmserver.cn:3000/jd/plm/issues/69?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 HEZON_ITK/HEZON_ITK.vcxproj    |  5 ++---
 HEZON_ITK/bs_sap.cpp           | 11 +++++++++--
 HEZON_ITK/jd_batch_process.cpp |  1 -
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/HEZON_ITK/HEZON_ITK.vcxproj b/HEZON_ITK/HEZON_ITK.vcxproj
index 77ad7c2..58dcedc 100644
--- a/HEZON_ITK/HEZON_ITK.vcxproj
+++ b/HEZON_ITK/HEZON_ITK.vcxproj
@@ -129,7 +129,7 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;IPLIB=none;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>E:\work\boost_1_72_0;E:\work\include12_2;E:\work\include_cpp12_2;C:\Java\jdk1.8.0_231\include\win32;C:\Java\jdk1.8.0_231\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>C:\Users\lyf\Documents\tclib\include;C:\Users\lyf\Documents\tclib\include_cpp;C:\Program Files\Java\jdk1.8.0_212\include\win32;C:\Program Files\Java\jdk1.8.0_212\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <CallingConvention>Cdecl</CallingConvention>
     </ClCompile>
     <Link>
@@ -137,8 +137,7 @@
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
       <OptimizeReferences>true</OptimizeReferences>
-      <AdditionalLibraryDirectories>E:\work\boost_1_72_0\vc14\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <AdditionalDependencies>E:\work\lib12_2\*.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>C:\Users\lyf\Documents\tclib\tc12\lib\*.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <IgnoreSpecificDefaultLibraries>libuser_exits.ar.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <OutputFile>$(OutDir)\bs.dll</OutputFile>
       <AdditionalOptions>/FORCE %(AdditionalOptions)</AdditionalOptions>
diff --git a/HEZON_ITK/bs_sap.cpp b/HEZON_ITK/bs_sap.cpp
index a1a3b5d..c2990a5 100644
--- a/HEZON_ITK/bs_sap.cpp
+++ b/HEZON_ITK/bs_sap.cpp
@@ -207,8 +207,9 @@ void get_bom(System::Collections::Generic::List<System::Collections::Generic::Di
 		char *val;
 		// AOM_UIF_ask_value(lines[j], "bl_sequence_no", &val);
 		// dic["POSNR"] = convert_to_cstring(val);
-		AOM_UIF_ask_value(lines[j], "bl_child_id", &val);
-		dic["IDNRK"] = convert_to_cstring(val);
+		char *child_id;
+		AOM_UIF_ask_value(lines[j], "bl_child_id", &child_id);
+		dic["IDNRK"] = convert_to_cstring(child_id);
 
 		AOM_UIF_ask_value(lines[j], "bl_quantity", &val);
 		dic["MENGE"] = convert_to_cstring(val);
@@ -220,6 +221,12 @@ void get_bom(System::Collections::Generic::List<System::Collections::Generic::Di
 		int rel_cnt;
 		AOM_ask_value_tag(lines[j], "bl_line_object", &tag);
 		GRM_list_secondary_objects_only(tag, relation_type, &rel_cnt, &rels);
+		if(tc_strlen(child_id)>1&&child_id[0]=='9'&&child_id[1]=='9')
+		{
+			a_list->Add(dic);
+			get_bom(a_list, lines[j], werks, stlan, "", relation_type);
+			continue;
+		}
 		if(rel_cnt)
 		{
 			AOM_ask_value_string(rels[0], "jd2_cglx", &val1);
diff --git a/HEZON_ITK/jd_batch_process.cpp b/HEZON_ITK/jd_batch_process.cpp
index bcca31a..46451ad 100644
--- a/HEZON_ITK/jd_batch_process.cpp
+++ b/HEZON_ITK/jd_batch_process.cpp
@@ -53,7 +53,6 @@
 #include <iostream>  
 #include <string>  
 #include <fstream>
-#include <boost/thread/thread.hpp>
 
 using namespace std;