工艺工序handler修改

connor_ldy/JD_GXInfoToMediDatabase.cxx

@@ -198,6 +198,18 @@ int JD_GXInfoToMediDatabase(EPM_action_message_t msg) {
 		MEM_free(argflag);
 		MEM_free(argvalue);
 	}
+
+
+
+	vector<string>		pref_zid;
+	getPrefStrings1("Jd_MES_GX_Config", TC_preference_site, pref_zid);
+
+	if (pref_zid.size() <= 0) {
+		EMH_store_error_s1(EMH_severity_user_error, EMH_USER_error_base, "请配置首选项 Jd_MES_GX_Config\n"); //错误弹窗
+		return -1;
+	}
+
+
 	//先获取首选项Jd_Erp_Info_Connect，解析其中的用户名，密码，配置文件等信息
 	vector<string>		pref_vec1;
 	getPrefStrings1("Jd_MES_Info_Connect", TC_preference_site, pref_vec1);
@@ -297,8 +309,9 @@ int JD_GXInfoToMediDatabase(EPM_action_message_t msg) {
 						string columnValue = valueVec[j];
 						WriteLog("字段名 %s, 取值  %s\n", columnName.c_str(), columnValue.c_str());
 						WriteLog("字段名 %s, 取值  %s\n", columnName.c_str(), columnValue.c_str());
-						sqlStr = sqlStr.append(columnName);
+					
 						if (strcmp(columnName.c_str(), "TRANSNO") == 0) {
+							sqlStr = sqlStr.append(columnName);
 							//时间已经处理，直接获取即可
 							valueStr.append("'").append(columnValue).append("'");
 							if (updateWhere.length() == 0) {
@@ -316,16 +329,19 @@ int JD_GXInfoToMediDatabase(EPM_action_message_t msg) {
 							}
 						}
 						else if (strcmp(columnName.c_str(), "SESSIONID") == 0) {
+							sqlStr = sqlStr.append(columnName);
 							//固定值，直接获取即可
 							valueStr.append("'").append(columnValue).append("'");
 						}
 						else if (strcmp(columnName.c_str(), "TRANSSTATUS") == 0) {
+							sqlStr = sqlStr.append(columnName);
 							//不做任何处理，但在传递完毕后更新
 							updateStr = updateStr.append(tableName).append(" set ").append(columnName).append("='").append(columnValue).append("'  ");
 								selectAfterUpdateStr = selectAfterUpdateStr.append(columnName).append("='").append(columnValue).append("' and ");
 							valueStr.append("'").append(" ").append("'");
 						}
 						else if (strcmp(columnName.c_str(), "PUID") == 0) {
+							sqlStr = sqlStr.append(columnName);
 							//获取所有发布状态release_status_list
 							char *puid = NULL;
 							ITK__convert_tag_to_uid(attachments[i], &puid);
@@ -346,7 +362,54 @@ int JD_GXInfoToMediDatabase(EPM_action_message_t msg) {
 							}
 							DOFREE(puid);
 						}
+						else if (strcmp(columnName.c_str(), "SHEET_BASIC_STAGE_TYPE") == 0 || strcmp(columnName.c_str(), "ASS_BASIC_STAGE_TYPE") == 0) {
+							vector<string> vec;
+							if (columnValue.size() > 0) {
+								Split(columnValue, ".", vec);
+								char* tempValue = NULL;
+								char* gxlx = NULL;
+								if (vec.size() == 2) {
+									tag_t objTag = NULL;
+									if (strcmp(vec[0].c_str(), "item") == 0) {
+										objTag = partItem;
+									}
+									else if (strcmp(vec[0].c_str(), "rev") == 0) {
+										objTag = attachments[i];
+									}
+									//需要注意，如果属性不存在或者说不准确，就传空值
+									ITKCALL(ifail = AOM_UIF_ask_value(objTag, vec[1].c_str(), &tempValue));
+
+									ITKCALL(ifail = AOM_UIF_ask_value(objTag, "j6_processtype", &gxlx));
+									WriteLog("gxlx：%s\n", gxlx);
+									if (strstr(pref_zid[0].c_str(),gxlx)) {
+										sqlStr = sqlStr.append("SHEET_BASIC_STAGE_TYPE");
+									}
+									else {
+										sqlStr = sqlStr.append("ASS_BASIC_STAGE_TYPE");
+									}
+
+									removeQuotesGX(tempValue);
+
+									string tempValueString = " ";
+									if (ifail == 0) {
+
+										tempValueString = tempValue;
+									}
+									else {
+										showError = true;
+										WriteLog("属性异常：%s\n", vec[1].c_str());
+									}
+									EMH_clear_errors();
+									valueStr.append("'").append(tempValueString).append("'");
+								}
+								DOFREE(tempValue);
+							}
+							else {
+								valueStr.append("' '");
+							}
+						}
 						else {
+							sqlStr = sqlStr.append(columnName);
 							//其他情况获取属性
 							vector<string> vec;
 							if (columnValue.size() > 0) {

connor_ldy/JD_GYInfoToMediDatabase.cxx

@@ -421,6 +421,83 @@ int JD_GYInfoToMediDatabase(EPM_action_message_t msg) {
 
 							EMH_clear_errors();
 							valueStr.append("'").append(tempValueString).append("'");
+								}else if (vec.size() == 3) {
+									tag_t objTag = NULL;
+
+									int material_num = 0;
+									tag_t* material_tags = NULL;
+									ITKCALL(AOM_ask_value_tags(attachments[i], vec[0].c_str(), &material_num, &material_tags));
+
+									if (material_num > 0) {
+										char* gxType = NULL;
+										ITKCALL(ifail = AOM_ask_value_string(material_tags[0], "object_type", &gxType));
+										if (strstr(gxType,"Revision") || strstr(gxType, "revision")) {
+											attachments[i] = material_tags[0];
+											ITEM_ask_item_of_rev(attachments[i], &partItem);
+										}
+										else {
+											partItem = material_tags[0];
+											ITEM_ask_latest_rev(partItem,&attachments[i]);
+										}
+									
+									}
+
+									if (strcmp(vec[1].c_str(), "item") == 0) {
+										objTag = partItem;
+									}
+									else if (strcmp(vec[1].c_str(), "rev") == 0) {
+										objTag = attachments[i];
+									}
+									//需要注意，如果属性不存在或者说不准确，就传空值
+
+									string tempValueString = " ";
+									if (endsWith(columnName, "Date")) {
+										// 是以 "Date" 结尾
+										date_t creation_date;
+										AOM_ask_value_date(objTag, vec[2].c_str(), &creation_date);//zt2_ChangeDate
+
+
+										if (creation_date.year != 0) {
+											tempValueString.append(to_string(creation_date.year)).append("-").
+												append(to_string(creation_date.month + 1)).append("-").
+												append(to_string(creation_date.day)).append(" ").
+												append(to_string(creation_date.hour)).append(":").
+												append(to_string(creation_date.minute)).append(":").append(to_string(creation_date.second));
+
+										}
+
+
+									
+
+
+									}
+									else {
+
+										ITKCALL(ifail = AOM_UIF_ask_value(objTag, vec[2].c_str(), &tempValue));
+
+										removeQuotesGY(tempValue);
+
+
+										if (ifail == 0) {
+
+											tempValueString = tempValue;
+										}
+										else {
+											showError = true;
+											WriteLog("属性异常：%s\n", vec[1].c_str());
+										}
+
+
+									}
+
+
+
+
+
+
+
+									EMH_clear_errors();
+									valueStr.append("'").append(tempValueString).append("'");
 								}
 								DOFREE(tempValue);
 							}

connor_ldy/x64/Release/connor_ldy.log

@@ -149,6 +149,74 @@ D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_FileInfoToMed
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_FileInfoToMediDatabase.cpp(440,12): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_FileInfoToMediDatabase.cpp(542,11): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
   JD_GXInfoToMediDatabase.cxx
+<<<<<<< HEAD
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(134,50): warning C4190: “replace”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(135,45): warning C4190: “stringToUTF8”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(136,39): warning C4190: “GbkToUtf8”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(137,39): warning C4190: “Utf8ToGbk”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(78,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(81,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(89,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(99,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(51,13): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(194,6): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(228,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(230,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(240,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(241,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(242,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(243,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(486,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(488,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(508,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(509,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(510,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(162,6): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(166,96): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(190,8): warning C4996: 'stricmp': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _stricmp. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(238,19): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(244,6): warning C4996: 'access': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _access. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(380,10): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(382,10): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GXInfoToMediDatabase.cxx(427,8): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+  JD_GYInfoToMediDatabase.cxx
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(134,50): warning C4190: “replace”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(135,45): warning C4190: “stringToUTF8”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(136,39): warning C4190: “GbkToUtf8”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(137,39): warning C4190: “Utf8ToGbk”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
+C:\VS2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(96,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(99,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(107,4): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(117,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(69,13): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(212,6): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(234,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(236,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(246,2): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(247,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(248,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(249,2): warning C4996: 'strcat': This function or variable may be unsafe. Consider using strcat_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(546,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(548,5): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(568,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(569,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(570,3): warning C4996: 'strcpy': This function or variable may be unsafe. Consider using strcpy_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(180,6): warning C4996: 'localtime': This function or variable may be unsafe. Consider using localtime_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(184,96): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(208,8): warning C4996: 'stricmp': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _stricmp. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(244,19): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(250,6): warning C4996: 'access': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _access. See online help for details.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(399,11): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+D:\source\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(476,11): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+=======
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(134,50): warning C4190: “replace”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
 D:\Installation directory\Microsoft Visual Studio2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(135,45): warning C4190: “stringToUTF8”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
@@ -212,6 +280,7 @@ D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediD
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(244,19): warning C4996: 'getenv': This function or variable may be unsafe. Consider using _dupenv_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(250,6): warning C4996: 'access': The POSIX name for this item is deprecated. Instead, use the ISO C and C++ conformant name: _access. See online help for details.
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\JD_GYInfoToMediDatabase.cxx(399,11): warning C4996: 'AOM_UIF_ask_value': "AOM_UIF_ask_value" deprecated in Teamcenter "11.1"; Use "AOM_ask_displayable_values" instead.
+>>>>>>> 53ac88b65c7ad88d292d4db10f8d177fc790dc8a
   JD_ItemInfoToMediDatabase.cpp
 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\string_utils.h(134,50): warning C4190: “replace”有指定的 C 链接，但返回了与 C 不兼容的 UDT“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”
 D:\Installation directory\Microsoft Visual Studio2019\VC\Tools\MSVC\14.29.30133\include\xstring(4871): message : 参见“std::basic_string<char,std::char_traits<char>,std::allocator<char>>”的声明
@@ -341,6 +410,10 @@ D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\tc_util.cpp(63,1
     正在创建库 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\x64\Release\connor_jd.lib 和对象 D:\file store\项目代码\精雕\JINGDIAO_connor_jd\x64\Release\connor_jd.exp
   正在生成代码
   Previous IPDB not found, fall back to full compilation.
+<<<<<<< HEAD
+  All 1780 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
+=======
   All 2103 functions were compiled because no usable IPDB/IOBJ from previous compilation was found.
+>>>>>>> 53ac88b65c7ad88d292d4db10f8d177fc790dc8a
   已完成代码的生成
   connor_ldy.vcxproj -> D:\file store\项目代码\精雕\JINGDIAO_connor_jd\x64\Release\connor_jd.dll

connor_ldy/x64/Release/msado15.tlh

@@ -3,7 +3,11 @@
 // D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\x64\Release\msado15.tlh
 //
 // C++ source equivalent of type library c:\program files\common files\system\ado\msado15.dll
+<<<<<<< HEAD
+// compiler-generated file created 03/03/26 at 17:41:09 - DO NOT EDIT!
+=======
 // compiler-generated file created 03/06/26 at 15:17:52 - DO NOT EDIT!
+>>>>>>> 53ac88b65c7ad88d292d4db10f8d177fc790dc8a
 
 #pragma once
 #pragma pack(push, 8)

connor_ldy/x64/Release/msado15.tli

@@ -3,7 +3,11 @@
 // D:\file store\项目代码\精雕\JINGDIAO_connor_jd\connor_ldy\x64\Release\msado15.tli
 //
 // Wrapper implementations for type library c:\program files\common files\system\ado\msado15.dll
+<<<<<<< HEAD
+// compiler-generated file created 03/03/26 at 17:41:09 - DO NOT EDIT!
+=======
 // compiler-generated file created 03/06/26 at 15:17:52 - DO NOT EDIT!
+>>>>>>> 53ac88b65c7ad88d292d4db10f8d177fc790dc8a
 
 #pragma once