From 534b9b8aec1b4d573a04710600216afcd3763e81 Mon Sep 17 00:00:00 2001 From: bairubing Date: Wed, 15 Jan 2025 15:08:05 +0800 Subject: [PATCH] =?UTF-8?q?=F0=9F=98=8E=E4=BA=A7=E5=93=81=E8=AE=BE?= =?UTF-8?q?=E8=AE=A1=E5=BA=93=E6=9C=8D=E5=8A=A1=EF=BC=8C=E7=89=A9=E6=96=99?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E3=80=81Bom=E5=90=8C=E6=AD=A5=E3=80=81?= =?UTF-8?q?=E5=B7=A5=E8=89=BA=E8=B7=AF=E7=BA=BF=E6=8E=A5=E5=8F=A3=E5=90=8C?= =?UTF-8?q?=E6=AD=A5=E9=80=BB=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Dto/ProductDesignLibraryInput.cs | 386 ++-- .../Dto/ProductDesignLibraryOutput.cs | 382 ++-- .../ProductDesignLibraryService.cs | 1590 +++++++++++------ .../Vistar.Application/Util/SyncBomData.cs | 123 ++ .../Util/SyncProcessRouteData.cs | 37 + 5 files changed, 1615 insertions(+), 903 deletions(-) create mode 100644 admin.net.pro/Admin.NET/Vistar.Application/Util/SyncBomData.cs create mode 100644 admin.net.pro/Admin.NET/Vistar.Application/Util/SyncProcessRouteData.cs diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryInput.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryInput.cs index 3b5a1a4..1a45b3f 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryInput.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryInput.cs @@ -27,190 +27,190 @@ public class ProductDesignLibraryInput public bool? IsLatestVersion { get; set; } - public DateTime? CreatedDate { get; set; } + //public DateTime? CreatedDate { get; set; } - public DateTime? VersionCreatedDate { get; set; } + //public DateTime? VersionCreatedDate { get; set; } - public DateTime? dateModified { get; set; } + //public DateTime? dateModified { get; set; } - public long? UserCreatedId { get; set; } + //public long? UserCreatedId { get; set; } - public long? VersionUserCreatedId { get; set; } + //public long? VersionUserCreatedId { get; set; } - public long? UserModifiedId { get; set; } + //public long? UserModifiedId { get; set; } public string? RecordGuid { get; set; } - public bool? isVisibilityNormal { get; set; } + //public bool? isVisibilityNormal { get; set; } public bool? deleted { get; set; } - public string? SubObjectGuid { get; set; } + //public string? SubObjectGuid { get; set; } - public bool? PreviousStatus { get; set; } + //public bool? PreviousStatus { get; set; } public string? revision { get; set; } - public byte[]? Record_image160_160 { get; set; } + //public byte[]? Record_image160_160 { get; set; } - public byte[]? Record_Image320_240 { get; set; } + //public byte[]? Record_Image320_240 { get; set; } - public byte[]? Record_ImageMax { get; set; } + //public byte[]? Record_ImageMax { get; set; } public string? _System_objNBS { get; set; } public string? _System_ObjDescription { get; set; } - public DateTime? _System_Effectivity_Begin { get; set; } + //public DateTime? _System_Effectivity_Begin { get; set; } - public DateTime? _System_Effectivity_End { get; set; } + //public DateTime? _System_Effectivity_End { get; set; } - public string? CheckedOutPc { get; set; } + //public string? CheckedOutPc { get; set; } - public long? StageId { get; set; } + //public long? StageId { get; set; } - public long? ProjectManager { get; set; } + //public long? ProjectManager { get; set; } - public long? ProjectManager_Rec { get; set; } + //public long? ProjectManager_Rec { get; set; } - public bool? EnableNotifications { get; set; } + //public bool? EnableNotifications { get; set; } - public long? GroupObjId { get; set; } + //public long? GroupObjId { get; set; } - public bool? _CheckOutInProgress { get; set; } + //public bool? _CheckOutInProgress { get; set; } - public string? ParentRecordGuid { get; set; } + //public string? ParentRecordGuid { get; set; } - public string? MaterialType { get; set; } + //public string? MaterialType { get; set; } - public bool? _System_NeedSWRebuild { get; set; } + //public bool? _System_NeedSWRebuild { get; set; } - public string? _system_objConfigurationName { get; set; } + //public string? _system_objConfigurationName { get; set; } - public bool? _system_objConfigurationType { get; set; } + //public bool? _system_objConfigurationType { get; set; } - public string? _system_objConfigurationGuid { get; set; } + //public string? _system_objConfigurationGuid { get; set; } - public string ShowBomFromConfiguration { get; set; } + //public string ShowBomFromConfiguration { get; set; } - public string _System_ObjNbsAuto { get; set; } + //public string _System_ObjNbsAuto { get; set; } - public long? PreviousIdRecord { get; set; } + //public long? PreviousIdRecord { get; set; } - public string? _System_DerivedFrom { get; set; } + //public string? _System_DerivedFrom { get; set; } - public bool? _system_objLinkedCompare { get; set; } + //public bool? _system_objLinkedCompare { get; set; } - public string? _System_WebLink { get; set; } + //public string? _System_WebLink { get; set; } - public bool? isReleasedVersion { get; set; } + //public bool? isReleasedVersion { get; set; } - public string? _System_DerivedFrom_RecordGuid { get; set; } + //public string? _System_DerivedFrom_RecordGuid { get; set; } - public long? SWPDMDocumentId { get; set; } + //public long? SWPDMDocumentId { get; set; } - public long? SWPDMConfigurationID { get; set; } + //public long? SWPDMConfigurationID { get; set; } - public string? SWPDMConfigurationName { get; set; } + //public string? SWPDMConfigurationName { get; set; } - public long? SWPDMActiveConfigurationId { get; set; } + //public long? SWPDMActiveConfigurationId { get; set; } - public string? SWPDMActiveConfigurationName { get; set; } + //public string? SWPDMActiveConfigurationName { get; set; } - public string? SWPDMFileName { get; set; } + //public string? SWPDMFileName { get; set; } - public long? SWPDMConfigPersistID { get; set; } + //public long? SWPDMConfigPersistID { get; set; } - public int? SWPDMStatusId { get; set; } + //public int? SWPDMStatusId { get; set; } - public string? SWPDMStatusName { get; set; } + //public string? SWPDMStatusName { get; set; } - public bool? _SWPDM_1179__SW_Detailing_Mode_ { get; set; } + //public bool? _SWPDM_1179__SW_Detailing_Mode_ { get; set; } - public string? _SWPDM_2__SW_Last_Saved_With_ { get; set; } + //public string? _SWPDM_2__SW_Last_Saved_With_ { get; set; } - public string? _SWPDM_111_A___ { get; set; } + //public string? _SWPDM_111_A___ { get; set; } - public string? _SWPDM_1172_BOM_BOM__ { get; set; } + //public string? _SWPDM_1172_BOM_BOM__ { get; set; } - public string? _SWPDM_112_BOM___2 { get; set; } + //public string? _SWPDM_112_BOM___2 { get; set; } - public string? _SWPDM_113_BOM___ { get; set; } + //public string? _SWPDM_113_BOM___ { get; set; } - public string? _SWPDM_115_BOM___ { get; set; } + //public string? _SWPDM_115_BOM___ { get; set; } - public string? _SWPDM_116_BOM___ { get; set; } + //public string? _SWPDM_116_BOM___ { get; set; } - public string? _SWPDM_117_BOM_____ { get; set; } + //public string? _SWPDM_117_BOM_____ { get; set; } - public string? _SWPDM_51_BOM_____ { get; set; } + //public string? _SWPDM_51_BOM_____ { get; set; } - public string? _SWPDM_118_BOM_____ { get; set; } + //public string? _SWPDM_118_BOM_____ { get; set; } - public string? _SWPDM_119_BOM___ { get; set; } + //public string? _SWPDM_119_BOM___ { get; set; } - public string? _SWPDM_114_BOM_____ { get; set; } + //public string? _SWPDM_114_BOM_____ { get; set; } - public string? _SWPDM_120_BOM______ { get; set; } + //public string? _SWPDM_120_BOM______ { get; set; } - public string? _SWPDM_121_BOM___ { get; set; } + //public string? _SWPDM_121_BOM___ { get; set; } - public string? _SWPDM_122_BOW___1 { get; set; } + //public string? _SWPDM_122_BOW___1 { get; set; } - public string? _SWPDM_123_BOW___ { get; set; } + //public string? _SWPDM_123_BOW___ { get; set; } - public string? _SWPDM_84_DWG___ { get; set; } + //public string? _SWPDM_84_DWG___ { get; set; } - public string? _SWPDM_82_DWG___ { get; set; } + //public string? _SWPDM_82_DWG___ { get; set; } - public string? _SWPDM_80_DWG_____ { get; set; } + //public string? _SWPDM_80_DWG_____ { get; set; } - public string? _SWPDM_76_DWG___ { get; set; } + //public string? _SWPDM_76_DWG___ { get; set; } - public string? _SWPDM_77_DWG___ { get; set; } + //public string? _SWPDM_77_DWG___ { get; set; } - public string? _SWPDM_78_DWG___ { get; set; } + //public string? _SWPDM_78_DWG___ { get; set; } - public string? _SWPDM_79_DWG___ { get; set; } + //public string? _SWPDM_79_DWG___ { get; set; } - public string? _SWPDM_83_DWG___ { get; set; } + //public string? _SWPDM_83_DWG___ { get; set; } - public string? _SWPDM_81_DWG___ { get; set; } + //public string? _SWPDM_81_DWG___ { get; set; } - public string? _SWPDM_92_FB___ { get; set; } + //public string? _SWPDM_92_FB___ { get; set; } - public string? _SWPDM_86_FB_____ { get; set; } + //public string? _SWPDM_86_FB_____ { get; set; } - public string? _SWPDM_87_FB_____ { get; set; } + //public string? _SWPDM_87_FB_____ { get; set; } - public string? _SWPDM_88_FB_____ { get; set; } + //public string? _SWPDM_88_FB_____ { get; set; } - public string? _SWPDM_89_FB_____ { get; set; } + //public string? _SWPDM_89_FB_____ { get; set; } - public string? _SWPDM_90_FB______ { get; set; } + //public string? _SWPDM_90_FB______ { get; set; } - public string? _SWPDM_85_FB____ { get; set; } + //public string? _SWPDM_85_FB____ { get; set; } - public string? _SWPDM_91_FB_____ { get; set; } - public string? _SWPDM_94_PDF___ { get; set; } + //public string? _SWPDM_91_FB_____ { get; set; } + //public string? _SWPDM_94_PDF___ { get; set; } - public string? _SWPDM_101_PDF___ { get; set; } + //public string? _SWPDM_101_PDF___ { get; set; } - public string? _SWPDM_95_PDF_____ { get; set; } + //public string? _SWPDM_95_PDF_____ { get; set; } - public string? _SWPDM_96_PDF___ { get; set; } + //public string? _SWPDM_96_PDF___ { get; set; } - public string? _SWPDM_97_PDF___ { get; set; } + //public string? _SWPDM_97_PDF___ { get; set; } - public string? _SWPDM_98_PDF___ { get; set; } + //public string? _SWPDM_98_PDF___ { get; set; } - public string? _SWPDM_93_PDF___ { get; set; } + //public string? _SWPDM_93_PDF___ { get; set; } - public string? _SWPDM_99_PDF___ { get; set; } + //public string? _SWPDM_99_PDF___ { get; set; } - public string? _SWPDM_100_PDF___ { get; set; } + //public string? _SWPDM_100_PDF___ { get; set; } - public string? _SWPDM_1194_q { get; set; } + //public string? _SWPDM_1194_q { get; set; } public string? _SWPDM_1196_SAP_____ { get; set; } @@ -218,28 +218,28 @@ public class ProductDesignLibraryInput public string? _SWPDM_1187_SAP___ { get; set; } - public double? _SWPDM_1190_SAP___ { get; set; } + //public double? _SWPDM_1190_SAP___ { get; set; } - public string? _SWPDM_1191_SAP___ { get; set; } + //public string? _SWPDM_1191_SAP___ { get; set; } public string? _SWPDM_1188_SAP___ { get; set; } public string? _SWPDM_1197_SAP_____ { get; set; } - public string? _SWPDM_1210_SAP_____ { get; set; } + //public string? _SWPDM_1210_SAP_____ { get; set; } - public string? _SWPDM_1189_SAP___ID_____ { get; set; } + //public string? _SWPDM_1189_SAP___ID_____ { get; set; } - public string? _SWPDM_1200_SAP_____ { get; set; } + //public string? _SWPDM_1200_SAP_____ { get; set; } public string? _SWPDM_1208_SAP___BOM___ { get; set; } - public string? _SWPDM_1201_SAP_____ { get; set; } + // public string? _SWPDM_1201_SAP_____ { get; set; } public string? _SWPDM_1198_SAP_____ { get; set; } - public string? _SWPDM_1193_SAP___ { get; set; } + //public string? _SWPDM_1193_SAP___ { get; set; } - public string? _SWPDM_1195_SAP_____ { get; set; } + //public string? _SWPDM_1195_SAP_____ { get; set; } public string? _SWPDM_1186_SAP_____ { get; set; } @@ -249,27 +249,27 @@ public class ProductDesignLibraryInput public string? _SWPDM_1185_SAP___ { get; set; } - public string? _SWPDM_1192_SAP_____ { get; set; } + //public string? _SWPDM_1192_SAP_____ { get; set; } - public string? _SWPDM_1184_SIP_____ { get; set; } + //public string? _SWPDM_1184_SIP_____ { get; set; } - public string? _SWPDM_1183_SIP_____ { get; set; } + //public string? _SWPDM_1183_SIP_____ { get; set; } - public string? _SWPDM_1182_SOP_____ { get; set; } + //public string? _SWPDM_1182_SOP_____ { get; set; } - public string? _SWPDM_1181_SOP_____ { get; set; } + //public string? _SWPDM_1181_SOP_____ { get; set; } - public string? _SWPDM_46_SW___ { get; set; } + //public string? _SWPDM_46_SW___ { get; set; } - public string? _SWPDM_60_SW___ { get; set; } + //public string? _SWPDM_60_SW___ { get; set; } - public string? _SWPDM_124_SW___ { get; set; } + //public string? _SWPDM_124_SW___ { get; set; } - public string? _SWPDM_102_SW___ { get; set; } + //public string? _SWPDM_102_SW___ { get; set; } - public string? _SWPDM_56_SW____ { get; set; } + //public string? _SWPDM_56_SW____ { get; set; } - public string? _SWPDM_57_SW______ { get; set; } + //public string? _SWPDM_57_SW______ { get; set; } public string? _SWPDM_61_SW_____ { get; set; } @@ -279,181 +279,181 @@ public class ProductDesignLibraryInput public string? _SWPDM_126_SW___ { get; set; } - public string? _SWPDM_127_SW_____ { get; set; } + //public string? _SWPDM_127_SW_____ { get; set; } - public string? _SWPDM_1205_SW_______ { get; set; } + //public string? _SWPDM_1205_SW_______ { get; set; } - public string? _SWPDM_47_SW___ { get; set; } + //public string? _SWPDM_47_SW___ { get; set; } - public string? _SWPDM_48_SW_____ { get; set; } + //public string? _SWPDM_48_SW_____ { get; set; } - public string? _SWPDM_54_SW___ { get; set; } + //public string? _SWPDM_54_SW___ { get; set; } - public string? _SWPDM_55_SW_____ { get; set; } + //public string? _SWPDM_55_SW_____ { get; set; } - public string? _SWPDM_66_SW___ { get; set; } + //public string? _SWPDM_66_SW___ { get; set; } - public string? _SWPDM_154_SW_____ { get; set; } + //public string? _SWPDM_154_SW_____ { get; set; } - public string? _SWPDM_63_SW___ { get; set; } + //public string? _SWPDM_63_SW___ { get; set; } public string? _SWPDM_64_SW___ { get; set; } public string? _SWPDM_65_SW___ { get; set; } - public string? _SWPDM_128_SW_____ { get; set; } + //public string? _SWPDM_128_SW_____ { get; set; } - public string? _SWPDM_1206_SW_______ { get; set; } + //public string? _SWPDM_1206_SW_______ { get; set; } - public string? _SWPDM_52_SW___ { get; set; } + //public string? _SWPDM_52_SW___ { get; set; } - public string? _SWPDM_53_SW_____ { get; set; } + //public string? _SWPDM_53_SW_____ { get; set; } - public string? _SWPDM_58_SW___ { get; set; } + //public string? _SWPDM_58_SW___ { get; set; } - public string? _SWPDM_59_SW_____ { get; set; } + //public string? _SWPDM_59_SW_____ { get; set; } - public string? _SWPDM_1178_SW_____ { get; set; } + //public string? _SWPDM_1178_SW_____ { get; set; } - public string? _SWPDM_1202_SW_____ { get; set; } + //public string? _SWPDM_1202_SW_____ { get; set; } - public string? _SWPDM_49_SW___ { get; set; } + //public string? _SWPDM_49_SW___ { get; set; } - public string? _SWPDM_129_SW_____ { get; set; } + //public string? _SWPDM_129_SW_____ { get; set; } - public string? _SWPDM_1207_SW_______ { get; set; } + //public string? _SWPDM_1207_SW_______ { get; set; } - public string? _SWPDM_130_SW___ { get; set; } + //public string? _SWPDM_130_SW___ { get; set; } - public string? _SWPDM_50_SW_____ { get; set; } + //public string? _SWPDM_50_SW_____ { get; set; } - public string? _SWPDM_131_SW_____ { get; set; } + //public string? _SWPDM_131_SW_____ { get; set; } - public string? _SWPDM_155_SW_____ { get; set; } + //public string? _SWPDM_155_SW_____ { get; set; } - public string? _SWPDM_1175_SW_____ { get; set; } + //public string? _SWPDM_1175_SW_____ { get; set; } - public string? _SWPDM_1177_SW_____ { get; set; } + //public string? _SWPDM_1177_SW_____ { get; set; } - public string? _SWPDM_1170_SW___ { get; set; } + //public string? _SWPDM_1170_SW___ { get; set; } - public string? _SWPDM_1171_SW_____ { get; set; } + //public string? _SWPDM_1171_SW_____ { get; set; } - public string? _SWPDM_1173_SW____ { get; set; } + //public string? _SWPDM_1173_SW____ { get; set; } - public string? _SWPDM_132_SW_____ { get; set; } + //public string? _SWPDM_132_SW_____ { get; set; } - public string? _SWPDM_1204_SW_______ { get; set; } + //public string? _SWPDM_1204_SW_______ { get; set; } - public string? _SWPDM_133_SW____ { get; set; } + //public string? _SWPDM_133_SW____ { get; set; } - public string? _SWPDM_67_SW___ { get; set; } + //public string? _SWPDM_67_SW___ { get; set; } - public string? _SWPDM_1174_SW___ { get; set; } + //public string? _SWPDM_1174_SW___ { get; set; } - public string? _SWPDM_1168_TEMP_____ { get; set; } + //public string? _SWPDM_1168_TEMP_____ { get; set; } - public string? _SWPDM_1167_TEMP_____ { get; set; } + //public string? _SWPDM_1167_TEMP_____ { get; set; } - public string? _SWPDM_1166_TEMP_____ { get; set; } + //public string? _SWPDM_1166_TEMP_____ { get; set; } - public string? _SWPDM_1165_TEMP____ { get; set; } + //public string? _SWPDM_1165_TEMP____ { get; set; } - public string? _SWPDM_1164_TEMP_______ { get; set; } + //public string? _SWPDM_1164_TEMP_______ { get; set; } - public string? _SWPDM_1163_TEMP_______ { get; set; } + //public string? _SWPDM_1163_TEMP_______ { get; set; } - public string? _SWPDM_1162_TEMP_____ { get; set; } + //public string? _SWPDM_1162_TEMP_____ { get; set; } - public string? _SWPDM_1161_TEMP_____ { get; set; } + //public string? _SWPDM_1161_TEMP_____ { get; set; } - public string? _SWPDM_1160_TEMP_______ { get; set; } + //public string? _SWPDM_1160_TEMP_______ { get; set; } - public string? _SWPDM_1159_TEMP_______ { get; set; } + //public string? _SWPDM_1159_TEMP_______ { get; set; } - public string? _SWPDM_1176_TEMP_____ { get; set; } + //public string? _SWPDM_1176_TEMP_____ { get; set; } - public string? _SWPDM_1158_TEMP____ { get; set; } + //public string? _SWPDM_1158_TEMP____ { get; set; } - public string? _SWPDM_134_TY___ { get; set; } + //public string? _SWPDM_134_TY___ { get; set; } - public string? _SWPDM_135_TY______ { get; set; } + //public string? _SWPDM_135_TY______ { get; set; } - public string? _SWPDM_136_TY_____ { get; set; } + //public string? _SWPDM_136_TY_____ { get; set; } - public string? _SWPDM_137_TY_____ { get; set; } + //public string? _SWPDM_137_TY_____ { get; set; } - public string? _SWPDM_138_TY_____ { get; set; } + //public string? _SWPDM_138_TY_____ { get; set; } - public string? _SWPDM_139_WD_____ { get; set; } + //public string? _SWPDM_139_WD_____ { get; set; } - public string? _SWPDM_140_WD____ { get; set; } + //public string? _SWPDM_140_WD____ { get; set; } - public string? _SWPDM_141_WD___ { get; set; } + //public string? _SWPDM_141_WD___ { get; set; } - public string? _SWPDM_142_WJJ_____ { get; set; } + //public string? _SWPDM_142_WJJ_____ { get; set; } - public string? _SWPDM_143_WJJ____ { get; set; } + //public string? _SWPDM_143_WJJ____ { get; set; } - public string? _SWPDM_144_WJJ___ { get; set; } + //public string? _SWPDM_144_WJJ___ { get; set; } - public string? _SWPDM_68_XM___ { get; set; } + //public string? _SWPDM_68_XM___ { get; set; } - public string? _SWPDM_69_XM_____ { get; set; } + //public string? _SWPDM_69_XM_____ { get; set; } - public string? _SWPDM_70_XM_____ { get; set; } + //public string? _SWPDM_70_XM_____ { get; set; } - public string? _SWPDM_1169_XM_____ { get; set; } + //public string? _SWPDM_1169_XM_____ { get; set; } - public string? _SWPDM_145_XM_____ { get; set; } + //public string? _SWPDM_145_XM_____ { get; set; } - public string? _SWPDM_146_XM_____ { get; set; } + //public string? _SWPDM_146_XM_____ { get; set; } - public string? _SWPDM_73_XM_____ { get; set; } + //public string? _SWPDM_73_XM_____ { get; set; } - public string? _SWPDM_74_XM_____ { get; set; } + //public string? _SWPDM_74_XM_____ { get; set; } - public string? _SWPDM_71_XM______ { get; set; } + //public string? _SWPDM_71_XM______ { get; set; } - public string? _SWPDM_72_XM____ { get; set; } + //public string? _SWPDM_72_XM____ { get; set; } - public string? _SWPDM_75_XM_____ { get; set; } + //public string? _SWPDM_75_XM_____ { get; set; } - public string? _SWPDM_1155_XM_________ { get; set; } + //public string? _SWPDM_1155_XM_________ { get; set; } - public string? _SWPDM_103___ { get; set; } + //public string? _SWPDM_103___ { get; set; } - public string? _SWPDM_104___ { get; set; } + //public string? _SWPDM_104___ { get; set; } - public string? _SWPDM_147_____ { get; set; } + //public string? _SWPDM_147_____ { get; set; } - public string? _SWPDM_1211_____ { get; set; } + //public string? _SWPDM_1211_____ { get; set; } - public string? _SWPDM_1212_______ { get; set; } + //public string? _SWPDM_1212_______ { get; set; } - public string? _SWPDM_107___ { get; set; } + //public string? _SWPDM_107___ { get; set; } - public string? _SWPDM_148_____ { get; set; } + //public string? _SWPDM_148_____ { get; set; } - public string? _SWPDM_108______ { get; set; } + //public string? _SWPDM_108______ { get; set; } - public string? _SWPDM_149_______ { get; set; } + //public string? _SWPDM_149_______ { get; set; } - public string? _SWPDM_110_______ { get; set; } + //public string? _SWPDM_110_______ { get; set; } - public string? _SWPDM_150________ { get; set; } + //public string? _SWPDM_150________ { get; set; } - public string? _SWPDM_151________ { get; set; } + //public string? _SWPDM_151________ { get; set; } - public string? _SWPDM_152________ { get; set; } + //public string? _SWPDM_152________ { get; set; } - public string? _SWPDM_109______ { get; set; } + //public string? _SWPDM_109______ { get; set; } - public string? _SWPDM_105___ { get; set; } + //public string? _SWPDM_105___ { get; set; } - public string? _SWPDM_106_____ { get; set; } + //public string? _SWPDM_106_____ { get; set; } - public string? _SWPDM_153_____ { get; set; } + //public string? _SWPDM_153_____ { get; set; } public string? fld005529 { get; set; } diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryOutput.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryOutput.cs index 1ecfb56..1ae2ea1 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryOutput.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/Dto/ProductDesignLibraryOutput.cs @@ -24,186 +24,190 @@ public class ProductDesignLibraryOutput public bool? IsLatestVersion { get; set; } - public DateTime? CreatedDate { get; set; } + //public DateTime? CreatedDate { get; set; } - public DateTime? VersionCreatedDate { get; set; } + //public DateTime? VersionCreatedDate { get; set; } - public DateTime? dateModified { get; set; } + //public DateTime? dateModified { get; set; } - public long? UserCreatedId { get; set; } + //public long? UserCreatedId { get; set; } - public long? VersionUserCreatedId { get; set; } + //public long? VersionUserCreatedId { get; set; } - public long? UserModifiedId { get; set; } + //public long? UserModifiedId { get; set; } public string? RecordGuid { get; set; } - public bool? isVisibilityNormal { get; set; } + //public bool? isVisibilityNormal { get; set; } public bool? deleted { get; set; } - public string? SubObjectGuid { get; set; } + //public string? SubObjectGuid { get; set; } - public bool? PreviousStatus { get; set; } + //public bool? PreviousStatus { get; set; } public string? revision { get; set; } - public byte[]? Record_image160_160 { get; set; } + //public byte[]? Record_image160_160 { get; set; } - public byte[]? Record_Image320_240 { get; set; } + //public byte[]? Record_Image320_240 { get; set; } - public byte[]? Record_ImageMax { get; set; } + //public byte[]? Record_ImageMax { get; set; } public string? _System_objNBS { get; set; } public string? _System_ObjDescription { get; set; } - public DateTime? _System_Effectivity_Begin { get; set; } + //public DateTime? _System_Effectivity_Begin { get; set; } - public DateTime? _System_Effectivity_End { get; set; } + //public DateTime? _System_Effectivity_End { get; set; } - public string? CheckedOutPc { get; set; } + //public string? CheckedOutPc { get; set; } - public long? StageId { get; set; } + //public long? StageId { get; set; } - public long? ProjectManager { get; set; } + //public long? ProjectManager { get; set; } - public long? ProjectManager_Rec { get; set; } + //public long? ProjectManager_Rec { get; set; } - public bool? EnableNotifications { get; set; } + //public bool? EnableNotifications { get; set; } - public long? GroupObjId { get; set; } + //public long? GroupObjId { get; set; } - public bool? _CheckOutInProgress { get; set; } + //public bool? _CheckOutInProgress { get; set; } - public string? ParentRecordGuid { get; set; } + //public string? ParentRecordGuid { get; set; } - public string? MaterialType { get; set; } + //public string? MaterialType { get; set; } - public bool? _System_NeedSWRebuild { get; set; } + //public bool? _System_NeedSWRebuild { get; set; } - public string? _system_objConfigurationName { get; set; } + //public string? _system_objConfigurationName { get; set; } - public bool? _system_objConfigurationType { get; set; } + //public bool? _system_objConfigurationType { get; set; } - public string? _system_objConfigurationGuid { get; set; } + //public string? _system_objConfigurationGuid { get; set; } - public string ShowBomFromConfiguration { get; set; } + //public string ShowBomFromConfiguration { get; set; } - public string _System_ObjNbsAuto { get; set; } + //public string _System_ObjNbsAuto { get; set; } - public long? PreviousIdRecord { get; set; } + //public long? PreviousIdRecord { get; set; } - public string? _System_DerivedFrom { get; set; } + //public string? _System_DerivedFrom { get; set; } - public bool? _system_objLinkedCompare { get; set; } + //public bool? _system_objLinkedCompare { get; set; } - public string? _System_WebLink { get; set; } + //public string? _System_WebLink { get; set; } - public bool? isReleasedVersion { get; set; } + //public bool? isReleasedVersion { get; set; } - public string? _System_DerivedFrom_RecordGuid { get; set; } + //public string? _System_DerivedFrom_RecordGuid { get; set; } - public long? SWPDMDocumentId { get; set; } + //public long? SWPDMDocumentId { get; set; } - public long? SWPDMConfigurationID { get; set; } + //public long? SWPDMConfigurationID { get; set; } - public string? SWPDMConfigurationName { get; set; } + //public string? SWPDMConfigurationName { get; set; } - public long? SWPDMActiveConfigurationId { get; set; } + //public long? SWPDMActiveConfigurationId { get; set; } - public string? SWPDMActiveConfigurationName { get; set; } + //public string? SWPDMActiveConfigurationName { get; set; } - public string? SWPDMFileName { get; set; } + //public string? SWPDMFileName { get; set; } - public long? SWPDMConfigPersistID { get; set; } + //public long? SWPDMConfigPersistID { get; set; } - public int? SWPDMStatusId { get; set; } + //public int? SWPDMStatusId { get; set; } - public string? SWPDMStatusName { get; set; } + //public string? SWPDMStatusName { get; set; } - public bool? _SWPDM_1179__SW_Detailing_Mode_ { get; set; } + //public bool? _SWPDM_1179__SW_Detailing_Mode_ { get; set; } - public string? _SWPDM_2__SW_Last_Saved_With_ { get; set; } + //public string? _SWPDM_2__SW_Last_Saved_With_ { get; set; } - public string? _SWPDM_111_A___ { get; set; } + //public string? _SWPDM_111_A___ { get; set; } - public string? _SWPDM_1172_BOM_BOM__ { get; set; } + //public string? _SWPDM_1172_BOM_BOM__ { get; set; } - public string? _SWPDM_112_BOM___2 { get; set; } + //public string? _SWPDM_112_BOM___2 { get; set; } - public string? _SWPDM_113_BOM___ { get; set; } + //public string? _SWPDM_113_BOM___ { get; set; } - public string? _SWPDM_115_BOM___ { get; set; } + //public string? _SWPDM_115_BOM___ { get; set; } - public string? _SWPDM_116_BOM___ { get; set; } + //public string? _SWPDM_116_BOM___ { get; set; } - public string? _SWPDM_117_BOM_____ { get; set; } + //public string? _SWPDM_117_BOM_____ { get; set; } - public string? _SWPDM_51_BOM_____ { get; set; } + //public string? _SWPDM_51_BOM_____ { get; set; } - public string? _SWPDM_118_BOM_____ { get; set; } + //public string? _SWPDM_118_BOM_____ { get; set; } - public string? _SWPDM_119_BOM___ { get; set; } + //public string? _SWPDM_119_BOM___ { get; set; } - public string? _SWPDM_114_BOM_____ { get; set; } + //public string? _SWPDM_114_BOM_____ { get; set; } - public string? _SWPDM_120_BOM______ { get; set; } + //public string? _SWPDM_120_BOM______ { get; set; } - public string? _SWPDM_121_BOM___ { get; set; } + //public string? _SWPDM_121_BOM___ { get; set; } - public string? _SWPDM_122_BOW___1 { get; set; } + //public string? _SWPDM_122_BOW___1 { get; set; } - public string? _SWPDM_123_BOW___ { get; set; } + //public string? _SWPDM_123_BOW___ { get; set; } - public string? _SWPDM_84_DWG___ { get; set; } + //public string? _SWPDM_84_DWG___ { get; set; } - public string? _SWPDM_82_DWG___ { get; set; } + //public string? _SWPDM_82_DWG___ { get; set; } - public string? _SWPDM_80_DWG_____ { get; set; } + //public string? _SWPDM_80_DWG_____ { get; set; } - public string? _SWPDM_76_DWG___ { get; set; } + //public string? _SWPDM_76_DWG___ { get; set; } - public string? _SWPDM_77_DWG___ { get; set; } + //public string? _SWPDM_77_DWG___ { get; set; } - public string? _SWPDM_78_DWG___ { get; set; } + //public string? _SWPDM_78_DWG___ { get; set; } - public string? _SWPDM_79_DWG___ { get; set; } + //public string? _SWPDM_79_DWG___ { get; set; } - public string? _SWPDM_83_DWG___ { get; set; } + //public string? _SWPDM_83_DWG___ { get; set; } - public string? _SWPDM_81_DWG___ { get; set; } + //public string? _SWPDM_81_DWG___ { get; set; } - public string? _SWPDM_92_FB___ { get; set; } + //public string? _SWPDM_92_FB___ { get; set; } - public string? _SWPDM_86_FB_____ { get; set; } + //public string? _SWPDM_86_FB_____ { get; set; } - public string? _SWPDM_87_FB_____ { get; set; } + //public string? _SWPDM_87_FB_____ { get; set; } - public string? _SWPDM_88_FB_____ { get; set; } + //public string? _SWPDM_88_FB_____ { get; set; } - public string? _SWPDM_89_FB_____ { get; set; } + //public string? _SWPDM_89_FB_____ { get; set; } - public string? _SWPDM_90_FB______ { get; set; } + //public string? _SWPDM_90_FB______ { get; set; } - public string? _SWPDM_85_FB____ { get; set; } + //public string? _SWPDM_85_FB____ { get; set; } - public string? _SWPDM_91_FB_____ { get; set; } - public string? _SWPDM_94_PDF___ { get; set; } + //public string? _SWPDM_91_FB_____ { get; set; } + //public string? _SWPDM_94_PDF___ { get; set; } + //public string? _SWPDM_101_PDF___ { get; set; } - public string? _SWPDM_95_PDF_____ { get; set; } + //public string? _SWPDM_95_PDF_____ { get; set; } - public string? _SWPDM_96_PDF___ { get; set; } + //public string? _SWPDM_96_PDF___ { get; set; } + //public string? _SWPDM_97_PDF___ { get; set; } + //public string? _SWPDM_98_PDF___ { get; set; } - public string? _SWPDM_93_PDF___ { get; set; } + //public string? _SWPDM_93_PDF___ { get; set; } - public string? _SWPDM_99_PDF___ { get; set; } + //public string? _SWPDM_99_PDF___ { get; set; } + //public string? _SWPDM_100_PDF___ { get; set; } - public string? _SWPDM_1194_q { get; set; } + //public string? _SWPDM_1194_q { get; set; } public string? _SWPDM_1196_SAP_____ { get; set; } @@ -211,28 +215,28 @@ public class ProductDesignLibraryOutput public string? _SWPDM_1187_SAP___ { get; set; } - public double? _SWPDM_1190_SAP___ { get; set; } + //public double? _SWPDM_1190_SAP___ { get; set; } - public string? _SWPDM_1191_SAP___ { get; set; } + //public string? _SWPDM_1191_SAP___ { get; set; } public string? _SWPDM_1188_SAP___ { get; set; } public string? _SWPDM_1197_SAP_____ { get; set; } - public string? _SWPDM_1210_SAP_____ { get; set; } + //public string? _SWPDM_1210_SAP_____ { get; set; } - public string? _SWPDM_1189_SAP___ID_____ { get; set; } + //public string? _SWPDM_1189_SAP___ID_____ { get; set; } - public string? _SWPDM_1200_SAP_____ { get; set; } + //public string? _SWPDM_1200_SAP_____ { get; set; } public string? _SWPDM_1208_SAP___BOM___ { get; set; } - public string? _SWPDM_1201_SAP_____ { get; set; } + // public string? _SWPDM_1201_SAP_____ { get; set; } public string? _SWPDM_1198_SAP_____ { get; set; } - public string? _SWPDM_1193_SAP___ { get; set; } + //public string? _SWPDM_1193_SAP___ { get; set; } - public string? _SWPDM_1195_SAP_____ { get; set; } + //public string? _SWPDM_1195_SAP_____ { get; set; } public string? _SWPDM_1186_SAP_____ { get; set; } @@ -242,23 +246,27 @@ public class ProductDesignLibraryOutput public string? _SWPDM_1185_SAP___ { get; set; } - public string? _SWPDM_1192_SAP_____ { get; set; } + //public string? _SWPDM_1192_SAP_____ { get; set; } - public string? _SWPDM_1184_SIP_____ { get; set; } + //public string? _SWPDM_1184_SIP_____ { get; set; } - public string? _SWPDM_1183_SIP_____ { get; set; } + //public string? _SWPDM_1183_SIP_____ { get; set; } - public string? _SWPDM_1182_SOP_____ { get; set; } + //public string? _SWPDM_1182_SOP_____ { get; set; } - public string? _SWPDM_1181_SOP_____ { get; set; } + //public string? _SWPDM_1181_SOP_____ { get; set; } - public string? _SWPDM_46_SW___ { get; set; } + //public string? _SWPDM_46_SW___ { get; set; } - public string? _SWPDM_60_SW___ { get; set; } + //public string? _SWPDM_60_SW___ { get; set; } - public string? _SWPDM_56_SW____ { get; set; } + //public string? _SWPDM_124_SW___ { get; set; } - public string? _SWPDM_57_SW______ { get; set; } + //public string? _SWPDM_102_SW___ { get; set; } + + //public string? _SWPDM_56_SW____ { get; set; } + + //public string? _SWPDM_57_SW______ { get; set; } public string? _SWPDM_61_SW_____ { get; set; } @@ -268,180 +276,181 @@ public class ProductDesignLibraryOutput public string? _SWPDM_126_SW___ { get; set; } - public string? _SWPDM_127_SW_____ { get; set; } + //public string? _SWPDM_127_SW_____ { get; set; } - public string? _SWPDM_1205_SW_______ { get; set; } + //public string? _SWPDM_1205_SW_______ { get; set; } - public string? _SWPDM_47_SW___ { get; set; } + //public string? _SWPDM_47_SW___ { get; set; } - public string? _SWPDM_48_SW_____ { get; set; } + //public string? _SWPDM_48_SW_____ { get; set; } - public string? _SWPDM_54_SW___ { get; set; } + //public string? _SWPDM_54_SW___ { get; set; } - public string? _SWPDM_55_SW_____ { get; set; } + //public string? _SWPDM_55_SW_____ { get; set; } - public string? _SWPDM_66_SW___ { get; set; } + //public string? _SWPDM_66_SW___ { get; set; } - public string? _SWPDM_154_SW_____ { get; set; } + //public string? _SWPDM_154_SW_____ { get; set; } - public string? _SWPDM_63_SW___ { get; set; } + //public string? _SWPDM_63_SW___ { get; set; } public string? _SWPDM_64_SW___ { get; set; } public string? _SWPDM_65_SW___ { get; set; } - public string? _SWPDM_128_SW_____ { get; set; } + //public string? _SWPDM_128_SW_____ { get; set; } - public string? _SWPDM_1206_SW_______ { get; set; } + //public string? _SWPDM_1206_SW_______ { get; set; } - public string? _SWPDM_52_SW___ { get; set; } + //public string? _SWPDM_52_SW___ { get; set; } - public string? _SWPDM_53_SW_____ { get; set; } + //public string? _SWPDM_53_SW_____ { get; set; } - public string? _SWPDM_58_SW___ { get; set; } + //public string? _SWPDM_58_SW___ { get; set; } - public string? _SWPDM_59_SW_____ { get; set; } + //public string? _SWPDM_59_SW_____ { get; set; } - public string? _SWPDM_1178_SW_____ { get; set; } + //public string? _SWPDM_1178_SW_____ { get; set; } - public string? _SWPDM_1202_SW_____ { get; set; } + //public string? _SWPDM_1202_SW_____ { get; set; } + //public string? _SWPDM_49_SW___ { get; set; } - public string? _SWPDM_129_SW_____ { get; set; } + //public string? _SWPDM_129_SW_____ { get; set; } - public string? _SWPDM_1207_SW_______ { get; set; } + //public string? _SWPDM_1207_SW_______ { get; set; } - public string? _SWPDM_130_SW___ { get; set; } + //public string? _SWPDM_130_SW___ { get; set; } - public string? _SWPDM_50_SW_____ { get; set; } + //public string? _SWPDM_50_SW_____ { get; set; } - public string? _SWPDM_131_SW_____ { get; set; } + //public string? _SWPDM_131_SW_____ { get; set; } - public string? _SWPDM_155_SW_____ { get; set; } + //public string? _SWPDM_155_SW_____ { get; set; } - public string? _SWPDM_1175_SW_____ { get; set; } + //public string? _SWPDM_1175_SW_____ { get; set; } - public string? _SWPDM_1177_SW_____ { get; set; } + //public string? _SWPDM_1177_SW_____ { get; set; } - public string? _SWPDM_1170_SW___ { get; set; } + //public string? _SWPDM_1170_SW___ { get; set; } - public string? _SWPDM_1171_SW_____ { get; set; } + //public string? _SWPDM_1171_SW_____ { get; set; } - public string? _SWPDM_1173_SW____ { get; set; } + //public string? _SWPDM_1173_SW____ { get; set; } - public string? _SWPDM_132_SW_____ { get; set; } + //public string? _SWPDM_132_SW_____ { get; set; } - public string? _SWPDM_1204_SW_______ { get; set; } + //public string? _SWPDM_1204_SW_______ { get; set; } - public string? _SWPDM_133_SW____ { get; set; } + //public string? _SWPDM_133_SW____ { get; set; } - public string? _SWPDM_67_SW___ { get; set; } + //public string? _SWPDM_67_SW___ { get; set; } - public string? _SWPDM_1174_SW___ { get; set; } + //public string? _SWPDM_1174_SW___ { get; set; } - public string? _SWPDM_1168_TEMP_____ { get; set; } + //public string? _SWPDM_1168_TEMP_____ { get; set; } - public string? _SWPDM_1167_TEMP_____ { get; set; } + //public string? _SWPDM_1167_TEMP_____ { get; set; } - public string? _SWPDM_1166_TEMP_____ { get; set; } + //public string? _SWPDM_1166_TEMP_____ { get; set; } - public string? _SWPDM_1165_TEMP____ { get; set; } + //public string? _SWPDM_1165_TEMP____ { get; set; } - public string? _SWPDM_1164_TEMP_______ { get; set; } + //public string? _SWPDM_1164_TEMP_______ { get; set; } - public string? _SWPDM_1163_TEMP_______ { get; set; } + //public string? _SWPDM_1163_TEMP_______ { get; set; } - public string? _SWPDM_1162_TEMP_____ { get; set; } + //public string? _SWPDM_1162_TEMP_____ { get; set; } - public string? _SWPDM_1161_TEMP_____ { get; set; } + //public string? _SWPDM_1161_TEMP_____ { get; set; } - public string? _SWPDM_1160_TEMP_______ { get; set; } + //public string? _SWPDM_1160_TEMP_______ { get; set; } - public string? _SWPDM_1159_TEMP_______ { get; set; } + //public string? _SWPDM_1159_TEMP_______ { get; set; } - public string? _SWPDM_1176_TEMP_____ { get; set; } + //public string? _SWPDM_1176_TEMP_____ { get; set; } - public string? _SWPDM_1158_TEMP____ { get; set; } + //public string? _SWPDM_1158_TEMP____ { get; set; } - public string? _SWPDM_134_TY___ { get; set; } + //public string? _SWPDM_134_TY___ { get; set; } - public string? _SWPDM_135_TY______ { get; set; } + //public string? _SWPDM_135_TY______ { get; set; } - public string? _SWPDM_136_TY_____ { get; set; } + //public string? _SWPDM_136_TY_____ { get; set; } - public string? _SWPDM_137_TY_____ { get; set; } + //public string? _SWPDM_137_TY_____ { get; set; } - public string? _SWPDM_138_TY_____ { get; set; } + //public string? _SWPDM_138_TY_____ { get; set; } - public string? _SWPDM_139_WD_____ { get; set; } + //public string? _SWPDM_139_WD_____ { get; set; } - public string? _SWPDM_140_WD____ { get; set; } + //public string? _SWPDM_140_WD____ { get; set; } - public string? _SWPDM_141_WD___ { get; set; } + //public string? _SWPDM_141_WD___ { get; set; } - public string? _SWPDM_142_WJJ_____ { get; set; } + //public string? _SWPDM_142_WJJ_____ { get; set; } - public string? _SWPDM_143_WJJ____ { get; set; } + //public string? _SWPDM_143_WJJ____ { get; set; } - public string? _SWPDM_144_WJJ___ { get; set; } + //public string? _SWPDM_144_WJJ___ { get; set; } - public string? _SWPDM_68_XM___ { get; set; } + //public string? _SWPDM_68_XM___ { get; set; } - public string? _SWPDM_69_XM_____ { get; set; } + //public string? _SWPDM_69_XM_____ { get; set; } - public string? _SWPDM_70_XM_____ { get; set; } + //public string? _SWPDM_70_XM_____ { get; set; } - public string? _SWPDM_1169_XM_____ { get; set; } + //public string? _SWPDM_1169_XM_____ { get; set; } - public string? _SWPDM_145_XM_____ { get; set; } + //public string? _SWPDM_145_XM_____ { get; set; } - public string? _SWPDM_146_XM_____ { get; set; } + //public string? _SWPDM_146_XM_____ { get; set; } - public string? _SWPDM_73_XM_____ { get; set; } + //public string? _SWPDM_73_XM_____ { get; set; } - public string? _SWPDM_74_XM_____ { get; set; } + //public string? _SWPDM_74_XM_____ { get; set; } - public string? _SWPDM_71_XM______ { get; set; } + //public string? _SWPDM_71_XM______ { get; set; } - public string? _SWPDM_72_XM____ { get; set; } + //public string? _SWPDM_72_XM____ { get; set; } - public string? _SWPDM_75_XM_____ { get; set; } + //public string? _SWPDM_75_XM_____ { get; set; } - public string? _SWPDM_1155_XM_________ { get; set; } + //public string? _SWPDM_1155_XM_________ { get; set; } - public string? _SWPDM_103___ { get; set; } + //public string? _SWPDM_103___ { get; set; } - public string? _SWPDM_104___ { get; set; } + //public string? _SWPDM_104___ { get; set; } - public string? _SWPDM_147_____ { get; set; } + //public string? _SWPDM_147_____ { get; set; } - public string? _SWPDM_1211_____ { get; set; } + //public string? _SWPDM_1211_____ { get; set; } - public string? _SWPDM_1212_______ { get; set; } + //public string? _SWPDM_1212_______ { get; set; } - public string? _SWPDM_107___ { get; set; } + //public string? _SWPDM_107___ { get; set; } - public string? _SWPDM_148_____ { get; set; } + //public string? _SWPDM_148_____ { get; set; } - public string? _SWPDM_108______ { get; set; } + //public string? _SWPDM_108______ { get; set; } - public string? _SWPDM_149_______ { get; set; } + //public string? _SWPDM_149_______ { get; set; } - public string? _SWPDM_110_______ { get; set; } + //public string? _SWPDM_110_______ { get; set; } - public string? _SWPDM_150________ { get; set; } + //public string? _SWPDM_150________ { get; set; } - public string? _SWPDM_151________ { get; set; } + //public string? _SWPDM_151________ { get; set; } - public string? _SWPDM_152________ { get; set; } + //public string? _SWPDM_152________ { get; set; } - public string? _SWPDM_109______ { get; set; } + //public string? _SWPDM_109______ { get; set; } - public string? _SWPDM_105___ { get; set; } + //public string? _SWPDM_105___ { get; set; } - public string? _SWPDM_106_____ { get; set; } + //public string? _SWPDM_106_____ { get; set; } - public string? _SWPDM_153_____ { get; set; } + //public string? _SWPDM_153_____ { get; set; } public string? fld005529 { get; set; } @@ -466,6 +475,7 @@ public class ProductDesignLibraryOutput public DateTime? fld005539 { get; set; } public DateTime? fld005540 { get; set; } + public int? fld005678 { get; set; } public int? fld005679 { get; set; } public string? fld005679_Rec { get; set; } diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs index 1e3a929..1734838 100644 --- a/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs +++ b/admin.net.pro/Admin.NET/Vistar.Application/Service/ProductDesignLibrary/ProductDesignLibraryService.cs @@ -12,6 +12,8 @@ using Furion.DynamicApiController; using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.DependencyInjection; +using Qiniu.CDN; using SqlSugar; using System; using System.Collections.Generic; @@ -26,6 +28,7 @@ using Vistar.Application.SapService.Dto; using Vistar.Application.Service.ProductDesignLibrary.Dto; using Vistar.Application.SolidWorksManageService.Dto; using Vistar.Application.Util; +using static SKIT.FlurlHttpClient.Wechat.Api.Models.CgibinAccountGetAccountBasicInfoResponse.Types; namespace Vistar.Application.Service.ProductDesignLibrary; /// @@ -45,6 +48,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient public SqlSugarRepository _obj112Rep; public SqlSugarRepository _obj121Rep; public SolidWorksManageService.SolidWorksManageService _solidWorksManageService; + private readonly IServiceScopeFactory _scopeFactory; public ProductDesignLibraryService( SqlSugarRepository obj137Rep, @@ -57,7 +61,8 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient SqlSugarRepository obj122Rep, SqlSugarRepository obj112Rep, SqlSugarRepository obj121Rep, - SolidWorksManageService.SolidWorksManageService solidWorksManageService + SolidWorksManageService.SolidWorksManageService solidWorksManageService, + IServiceScopeFactory scopeFactory ) { _obj137Rep = obj137Rep; @@ -71,6 +76,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient _obj112Rep = obj112Rep; _obj121Rep = obj121Rep; _solidWorksManageService = solidWorksManageService; + _scopeFactory = scopeFactory; } /// @@ -87,6 +93,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient .WhereIF(!string.IsNullOrWhiteSpace(input._System_objNBS), u => u._System_objNBS.Contains(input._System_objNBS.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input._SWPDM_1188_SAP___), u => u._SWPDM_1188_SAP___.Contains(input._SWPDM_1188_SAP___.Trim())) .Select() + .OrderByDescending(it => it.idRecord) .ToPagedListAsync(input.Page, input.PageSize); return query; } @@ -202,7 +209,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient .Where(x => x.RecordGuid == input.ParentGuid && x.deleted == false && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW")) .MaxAsync(x => x.VersionIndex); var BomData = await _configurationDataRep.AsQueryable() - .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == input.ParentGuid && x.isDeleted == false && x.ParentVersion == parent && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false) + .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == input.ParentGuid && x.isDeleted == false && x.ParentVersion == parent && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false && (!(x.ParentSwFileType == 1 && x.isAddedFromSW == false))) .WhereIF(!string.IsNullOrWhiteSpace(input.Description), u => u.Description.Contains(input.Description.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.PartNumber), u => u.PartNumber.Contains(input.PartNumber.Trim())) .Select().ToPagedListAsync(input.Page, input.PageSize); @@ -218,139 +225,179 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient public async Task SyncToSAPBom(List input) { var ParentData = await _obj137Rep.AsQueryable().Where(x => x.RecordGuid == input[0].ParentGuid && x.deleted == false && x.VersionIndex == input[0].ParentVersion && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) && x.fld005530 == "N" && x.fld005529 == "成功" && (x.fld005534 == "A" || x.fld005534 == "M") && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW")).FirstAsync(); - var EcnData = await _obj118Rep.AsQueryable().Where(x => x.RecordGuid == ParentData.fld005679_Rec && x.deleted == false).OrderByDescending(x => x.VersionIndex).FirstAsync(); - var ecn = ""; - if (EcnData != null) - { - ecn = EcnData._System_objNBS; - } + //var EcnData = await _obj118Rep.AsQueryable().Where(x => x.RecordGuid == ParentData.fld005679_Rec && x.deleted == false).OrderByDescending(x => x.VersionIndex).FirstAsync(); + //var ecn = ""; + //if (EcnData != null) + //{ + // ecn = EcnData._System_objNBS; + //} - var itemDataList = new List(); - - for (int i = 0; i < input.Count; i++) + //var itemDataList = new List(); + var BomDataList = new List(); + foreach (var item in input) { - var Verification = await _dataValidationService.VerificationMaterial(input[i].ChildObjID, input[i].PartNumber, input[i].ChildGuid); - if (Verification == "不存在") + var bomData = new BomData { - continue; - } - //int sun = i + 1; - var itemData = new ItemData() - { - POSNR = "",//组件序号 sun.ToString() - IDNRK = input[i].PartNumber,//组件物料号 - MENGE = Math.Round((decimal)input[i].QtyManual, 3).ToString(),//组件数量 - SORTF = input[i].fld005541, - ITISOB = input[i].fld005542, - ALPGR = input[i].fld005543, - ALPRF = input[i].fld005544, - ZDELETE = input[i].fld005545, - POSTP = input[i].fld005546, - ZYFMK = input[i].fld005547 + PartNumber = item.PartNumber, + ParentGuid = item.ParentGuid, + ChildGuid = item.ChildGuid, + ChildObjID = item.ChildObjID, + ConfigId = item.ConfigId, + childVersion = item.childVersion, + ParentVersion = ParentData.VersionIndex, + QtyManual = item.QtyManual, + SORTF = item.fld005541, + ITISOB = item.fld005542, + ALPGR = item.fld005543, + ALPRF = item.fld005544, + ZDELETE = item.fld004940, + POSTP = item.fld005546, + ZYFMK = item.fld005547 }; - itemDataList.Add(itemData); + BomDataList.Add(bomData); } - if (!string.IsNullOrEmpty(ParentData.fld005686)) + var syncBomData = new SyncBomData { - var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "SolidWorks").FirstAsync(); - var BomData = await _configurationDataRep.AsQueryable().Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == input[0].ParentGuid && x.isDeleted == false && x.ParentVersion == Convert.ToInt32(ParentData.fld005686) && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); - for (int i = 0; i < BomData.Count; i++) - { - - var itemList = itemDataList.Where(x => x.IDNRK == BomData[i].PartNumber).ToList(); - if (itemList.Count == 0) - { - var Verification = await _dataValidationService.VerificationMaterial(BomData[i].ChildObjID, BomData[i].PartNumber, BomData[i].ChildGuid); - if (Verification == "不存在") - { - continue; - } - //int sun = i + 1; - var itemData = new ItemData() - { - POSNR = "",//组件序号 sun.ToString() - IDNRK = BomData[i].PartNumber,//组件物料号 - MENGE = Math.Round((decimal)BomData[i].QtyManual, 3).ToString(),//组件数量 - SORTF = BomData[i].fld005541, - ITISOB = BomData[i].fld005542, - ALPGR = BomData[i].fld005543, - ALPRF = BomData[i].fld005544, - ZDELETE = "X", - POSTP = BomData[i].fld005546, - ZYFMK = BomData[i].fld005547 - }; - itemDataList.Add(itemData); - } - - } - } - - //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid - string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); - var fld005678 = ParentData.fld005678 ?? 1; - var isreq = new IS_REQ() - { - ReqKeyId = "", - BusinessId = "", - MessageId = "", - SndPrn = "PLM", - RcvPrn = "SAP", - ReqUser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName), - Note1 = "", - Note2 = "", - Note3 = "", - Zwbid = millisecondTimestamp, - Matnr = ParentData._System_objNBS,//父物料编码 - Werks = ParentData._SWPDM_1187_SAP___,//工厂 - Bmeng = fld005678.ToString(), - Aennr = ecn, - Datuv = ParentData.fld005680.ToString(), - ItemList = itemDataList - }; - var apiOutput = await _sapService.SapBomApi(isreq); - string codeVal = apiOutput.code == "S" ? "成功" : "失败"; - if (codeVal == "成功") - { - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005539 = DateTime.Now, - fld005533 = codeVal, - fld005534 = "N", - fld005535 = apiOutput.msg, - fld005686 = input[0].ParentVersion.ToString() - }) - .Where(it => it.idRecord == ParentData.idRecord) - .ExecuteCommandAsync(); - } - else - { - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005539 = DateTime.Now, - fld005533 = codeVal, - fld005534 = "N", - fld005535 = apiOutput.msg - }) - .Where(it => it.idRecord == ParentData.idRecord) - .ExecuteCommandAsync(); - } - - var msg = apiOutput.msg; - if (apiOutput.msg == "") - { - msg = "同步成功"; - } - var output = new SapOutput() - { - parameter = apiOutput.parameter, - code = codeVal, - msg = msg, - result = apiOutput.result + Id = ParentData.idRecord, + MaterialCode = ParentData._System_objNBS, + RecordGuid = ParentData.RecordGuid, + SyncVersion = ParentData.fld005686, + Bmeng = ParentData.fld005678, + Werks = ParentData._SWPDM_1187_SAP___, + Datuv = ParentData.fld005680, + VersionIndex = ParentData.VersionIndex, + //Ecn = group.FirstOrDefault()?.ecn, + ecnGuid = ParentData.fld005679_Rec, + Bom = BomDataList }; + var output = await SyncBomToSap(syncBomData); return output; + + //for (int i = 0; i < input.Count; i++) + //{ + // var Verification = await _dataValidationService.VerificationMaterial(input[i].ChildObjID, input[i].PartNumber, input[i].ChildGuid); + // if (Verification == "不存在") + // { + // continue; + // } + // //int sun = i + 1; + // var itemData = new ItemData() + // { + // POSNR = "",//组件序号 sun.ToString() + // IDNRK = input[i].PartNumber,//组件物料号 + // MENGE = Math.Round((decimal)input[i].QtyManual, 3).ToString(),//组件数量 + // SORTF = input[i].fld005541, + // ITISOB = input[i].fld005542, + // ALPGR = input[i].fld005543, + // ALPRF = input[i].fld005544, + // ZDELETE = input[i].fld005545, + // POSTP = input[i].fld005546, + // ZYFMK = input[i].fld005547 + // }; + // itemDataList.Add(itemData); + //} + + //if (!string.IsNullOrEmpty(ParentData.fld005686)) + //{ + // var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "SolidWorks").FirstAsync(); + // var BomData = await _configurationDataRep.AsQueryable().Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == input[0].ParentGuid && x.isDeleted == false && x.ParentVersion == Convert.ToInt32(ParentData.fld005686) && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); + // for (int i = 0; i < BomData.Count; i++) + // { + + // var itemList = itemDataList.Where(x => x.IDNRK == BomData[i].PartNumber).ToList(); + // if (itemList.Count == 0) + // { + // var Verification = await _dataValidationService.VerificationMaterial(BomData[i].ChildObjID, BomData[i].PartNumber, BomData[i].ChildGuid); + // if (Verification == "不存在") + // { + // continue; + // } + // //int sun = i + 1; + // var itemData = new ItemData() + // { + // POSNR = "",//组件序号 sun.ToString() + // IDNRK = BomData[i].PartNumber,//组件物料号 + // MENGE = Math.Round((decimal)BomData[i].QtyManual, 3).ToString(),//组件数量 + // SORTF = BomData[i].fld005541, + // ITISOB = BomData[i].fld005542, + // ALPGR = BomData[i].fld005543, + // ALPRF = BomData[i].fld005544, + // ZDELETE = "X", + // POSTP = BomData[i].fld005546, + // ZYFMK = BomData[i].fld005547 + // }; + // itemDataList.Add(itemData); + // } + + // } + //} + + ////获取时间戳精确到毫秒，sap要求每次调用生成不重复guid + //string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + //var fld005678 = ParentData.fld005678 ?? 1; + //var isreq = new IS_REQ() + //{ + // ReqKeyId = "", + // BusinessId = "", + // MessageId = "", + // SndPrn = "PLM", + // RcvPrn = "SAP", + // ReqUser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName), + // Note1 = "", + // Note2 = "", + // Note3 = "", + // Zwbid = millisecondTimestamp, + // Matnr = ParentData._System_objNBS,//父物料编码 + // Werks = ParentData._SWPDM_1187_SAP___,//工厂 + // Bmeng = fld005678.ToString(), + // Aennr = ecn, + // Datuv = ParentData.fld005680.ToString(), + // ItemList = itemDataList + //}; + //var apiOutput = await _sapService.SapBomApi(isreq); + //string codeVal = apiOutput.code == "S" ? "成功" : "失败"; + //if (codeVal == "成功") + //{ + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005539 = DateTime.Now, + // fld005533 = codeVal, + // fld005534 = "N", + // fld005535 = apiOutput.msg, + // fld005686 = input[0].ParentVersion.ToString() + // }) + // .Where(it => it.idRecord == ParentData.idRecord) + // .ExecuteCommandAsync(); + //} + //else + //{ + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005539 = DateTime.Now, + // fld005533 = codeVal, + // fld005534 = "N", + // fld005535 = apiOutput.msg + // }) + // .Where(it => it.idRecord == ParentData.idRecord) + // .ExecuteCommandAsync(); + //} + + //var msg = apiOutput.msg; + //if (apiOutput.msg == "") + //{ + // msg = "同步成功"; + //} + //var output = new SapOutput() + //{ + // parameter = apiOutput.parameter, + // code = codeVal, + // msg = msg, + // result = apiOutput.result + //}; + //return output; } /// /// 产品设计库-批量同步到SAP @@ -361,16 +408,20 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient [DisplayName("产品设计库-批量同步到SAP")] public async Task> BatchSyncToSAP(List input) { + using var serviceScope = _scopeFactory.CreateScope(); + var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); + const string lengthError = "物料描述长度大于40，请检查！"; const string synchronized = "该物料编码已同步或已停用！"; var SapOutputList = new List(); var Requser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); - for (int i = 0; i < input.Count; i++) + + var tasks = input.Select(async item => { - // 验证物料描述长度 - if (input[i]._SWPDM_1188_SAP___.Length > 40) + if (item._SWPDM_1188_SAP___.Length > 40) { - await _obj137Rep.AsUpdateable() + db.CopyNew().Updateable() .SetColumns(it => new Obj137 { fld005532 = DateTime.Now, @@ -378,28 +429,27 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient fld005531 = lengthError, fld005529 = "失败" }) - .Where(it => it.idRecord == input[i].idRecord) - .ExecuteCommandAsync().ConfigureAwait(false); + .Where(it => it.idRecord == item.idRecord) + .ExecuteCommand(); - SapOutputList.Add(new SapOutput() + return new SapOutput { - materialCode = input[i]._System_objNBS, + materialCode = item._System_objNBS, code = "失败", msg = lengthError, result = lengthError - }); - continue; + }; } - if (input[i].fld005530 == "N" || input[i].fld005530 == "D" || input[i].fld005530 == null) + + if (item.fld005530 == "N" || item.fld005530 == "D" || item.fld005530 == null) { - SapOutputList.Add(new SapOutput() + return new SapOutput { - materialCode = input[i]._System_objNBS, + materialCode = item._System_objNBS, code = "失败", msg = synchronized, result = synchronized - }); - continue; + }; } //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); @@ -415,27 +465,27 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient Note2 = "", Note3 = "", Zwbid = millisecondTimestamp, - Matnr = input[i]._System_objNBS, - Mbrsh = input[i]._SWPDM_1185_SAP___, - Mtart = input[i]._SWPDM_1186_SAP_____, - Maktx = input[i]._SWPDM_1188_SAP___, - Meins = input[i]._SWPDM_126_SW___, - Matkl = input[i]._SWPDM_1203_SAP____, - Bismt = input[i]._SWPDM_64_SW___, - Groes = input[i]._SWPDM_125_SW___, - Normt = input[i]._SWPDM_65_SW___, - Ferth = input[i]._SWPDM_62_SW___, - Zeinr = input[i]._SWPDM_61_SW_____, - Mstae = input[i]._SWPDM_1209_SAP_____, + Matnr = item._System_objNBS, + Mbrsh = item._SWPDM_1185_SAP___, + Mtart = item._SWPDM_1186_SAP_____, + Maktx = item._SWPDM_1188_SAP___, + Meins = item._SWPDM_126_SW___, + Matkl = item._SWPDM_1203_SAP____, + Bismt = item._SWPDM_64_SW___, + Groes = item._SWPDM_125_SW___, + Normt = item._SWPDM_65_SW___, + Ferth = item._SWPDM_62_SW___, + Zeinr = item._SWPDM_61_SW_____, + Mstae = item._SWPDM_1209_SAP_____, Raube = "", Mhdrz = "", Mhdhb = "", - Werks = input[i]._SWPDM_1187_SAP___, - Beskz = input[i]._SWPDM_1196_SAP_____, - Sobsl = input[i]._SWPDM_1198_SAP_____, - Schgt = input[i]._SWPDM_1197_SAP_____, - Rgekz = input[i]._SWPDM_1199_SAP___, - Zbom = input[i]._SWPDM_1208_SAP___BOM___ + Werks = item._SWPDM_1187_SAP___, + Beskz = item._SWPDM_1196_SAP_____, + Sobsl = item._SWPDM_1198_SAP_____, + Schgt = item._SWPDM_1197_SAP_____, + Rgekz = item._SWPDM_1199_SAP___, + Zbom = item._SWPDM_1208_SAP___BOM___ }; var sapOutput = await _sapService.SapMaterialApi(sapMaterialInput); string codeVal = sapOutput.code == "S" ? "成功" : "失败"; @@ -445,7 +495,8 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient { msg = "同步成功"; } - await _obj137Rep.AsUpdateable() + + db.CopyNew().Updateable() .SetColumns(it => new Obj137 { fld005532 = DateTime.Now, @@ -453,20 +504,122 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient fld005530 = "N", fld005531 = msg }) - .Where(it => it.idRecord == input[i].idRecord) - .ExecuteCommandAsync(); - var output = new SapOutput() + .Where(it => it.idRecord == item.idRecord) + .ExecuteCommand(); + + return new SapOutput() { parameter = sapOutput.parameter, - materialCode = input[0]._System_objNBS, + materialCode = item._System_objNBS, code = codeVal, msg = msg, result = sapOutput.result }; - SapOutputList.Add(output); - } - return SapOutputList; + }); + var materialOutput = await Task.WhenAll(tasks); + return materialOutput.ToList(); + //for (int i = 0; i < input.Count; i++) + //{ + // // 验证物料描述长度 + // if (input[i]._SWPDM_1188_SAP___.Length > 40) + // { + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005532 = DateTime.Now, + // fld005530 = "N", + // fld005531 = lengthError, + // fld005529 = "失败" + // }) + // .Where(it => it.idRecord == input[i].idRecord) + // .ExecuteCommandAsync().ConfigureAwait(false); + + // SapOutputList.Add(new SapOutput() + // { + // materialCode = input[i]._System_objNBS, + // code = "失败", + // msg = lengthError, + // result = lengthError + // }); + // continue; + // } + // if (input[i].fld005530 == "N" || input[i].fld005530 == "D" || input[i].fld005530 == null) + // { + // SapOutputList.Add(new SapOutput() + // { + // materialCode = input[i]._System_objNBS, + // code = "失败", + // msg = synchronized, + // result = synchronized + // }); + // continue; + // } + // //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid + // string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + // var sapMaterialInput = new SapMaterialInput() + // { + // Reqkeyid = "", + // Businessid = "", + // Messageid = "", + // Sndprn = "PLM", + // Rcvprn = "SAP", + // Requser = Requser, + // Note1 = "", + // Note2 = "", + // Note3 = "", + // Zwbid = millisecondTimestamp, + // Matnr = input[i]._System_objNBS, + // Mbrsh = input[i]._SWPDM_1185_SAP___, + // Mtart = input[i]._SWPDM_1186_SAP_____, + // Maktx = input[i]._SWPDM_1188_SAP___, + // Meins = input[i]._SWPDM_126_SW___, + // Matkl = input[i]._SWPDM_1203_SAP____, + // Bismt = input[i]._SWPDM_64_SW___, + // Groes = input[i]._SWPDM_125_SW___, + // Normt = input[i]._SWPDM_65_SW___, + // Ferth = input[i]._SWPDM_62_SW___, + // Zeinr = input[i]._SWPDM_61_SW_____, + // Mstae = input[i]._SWPDM_1209_SAP_____, + // Raube = "", + // Mhdrz = "", + // Mhdhb = "", + // Werks = input[i]._SWPDM_1187_SAP___, + // Beskz = input[i]._SWPDM_1196_SAP_____, + // Sobsl = input[i]._SWPDM_1198_SAP_____, + // Schgt = input[i]._SWPDM_1197_SAP_____, + // Rgekz = input[i]._SWPDM_1199_SAP___, + // Zbom = input[i]._SWPDM_1208_SAP___BOM___ + // }; + // var sapOutput = await _sapService.SapMaterialApi(sapMaterialInput); + // string codeVal = sapOutput.code == "S" ? "成功" : "失败"; + // string msg = sapOutput.msg; + + // if (sapOutput.msg == "") + // { + // msg = "同步成功"; + // } + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005532 = DateTime.Now, + // fld005529 = codeVal, + // fld005530 = "N", + // fld005531 = msg + // }) + // .Where(it => it.idRecord == input[i].idRecord) + // .ExecuteCommandAsync(); + // var output = new SapOutput() + // { + // parameter = sapOutput.parameter, + // materialCode = input[0]._System_objNBS, + // code = codeVal, + // msg = msg, + // result = sapOutput.result + // }; + // SapOutputList.Add(output); + //} + } /// /// 产品设计库-定时同步到SAP @@ -477,41 +630,38 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient [AllowAnonymous] public async Task> TimingSyncToSAP() { - var input = await _obj137Rep.AsQueryable() + using var serviceScope = _scopeFactory.CreateScope(); + var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); + var input = db.CopyNew().Queryable() .Where(x => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && (x.fld005530 == "A" || x.fld005530 == "M") && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW")) - .ToListAsync(); + .ToList(); const string lengthError = "物料描述长度大于40，请检查！"; var SapOutputList = new List(); var Requser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); - for (int i = 0; i < input.Count; i++) + var tasks = input.Select(async item => { - if (!string.IsNullOrEmpty(input[i]._SWPDM_1188_SAP___)) + if (item._SWPDM_1188_SAP___.Length > 40) { - // 验证物料描述长度 - if (input[i]._SWPDM_1188_SAP___.Length > 40) - { - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005532 = DateTime.Now, - fld005530 = "N", - fld005531 = lengthError, - fld005529 = "失败" - }) - .Where(it => it.idRecord == input[i].idRecord) - .ExecuteCommandAsync().ConfigureAwait(false); - - SapOutputList.Add(new SapOutput() + db.CopyNew().Updateable() + .SetColumns(it => new Obj137 { - materialCode = input[i]._System_objNBS, - code = "失败", - msg = lengthError, - result = lengthError - }); - continue; - } - } + fld005532 = DateTime.Now, + fld005530 = "N", + fld005531 = lengthError, + fld005529 = "失败" + }) + .Where(it => it.idRecord == item.idRecord) + .ExecuteCommand(); + return new SapOutput + { + materialCode = item._System_objNBS, + code = "失败", + msg = lengthError, + result = lengthError + }; + } //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); @@ -527,27 +677,27 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient Note2 = "", Note3 = "", Zwbid = millisecondTimestamp, - Matnr = input[i]._System_objNBS, - Mbrsh = input[i]._SWPDM_1185_SAP___, - Mtart = input[i]._SWPDM_1186_SAP_____, - Maktx = input[i]._SWPDM_1188_SAP___, - Meins = input[i]._SWPDM_126_SW___, - Matkl = input[i]._SWPDM_1203_SAP____, - Bismt = input[i]._SWPDM_64_SW___, - Groes = input[i]._SWPDM_125_SW___, - Normt = input[i]._SWPDM_65_SW___, - Ferth = input[i]._SWPDM_62_SW___, - Zeinr = input[i]._SWPDM_61_SW_____, - Mstae = input[i]._SWPDM_1209_SAP_____, + Matnr = item._System_objNBS, + Mbrsh = item._SWPDM_1185_SAP___, + Mtart = item._SWPDM_1186_SAP_____, + Maktx = item._SWPDM_1188_SAP___, + Meins = item._SWPDM_126_SW___, + Matkl = item._SWPDM_1203_SAP____, + Bismt = item._SWPDM_64_SW___, + Groes = item._SWPDM_125_SW___, + Normt = item._SWPDM_65_SW___, + Ferth = item._SWPDM_62_SW___, + Zeinr = item._SWPDM_61_SW_____, + Mstae = item._SWPDM_1209_SAP_____, Raube = "", Mhdrz = "", Mhdhb = "", - Werks = input[i]._SWPDM_1187_SAP___, - Beskz = input[i]._SWPDM_1196_SAP_____, - Sobsl = input[i]._SWPDM_1198_SAP_____, - Schgt = input[i]._SWPDM_1197_SAP_____, - Rgekz = input[i]._SWPDM_1199_SAP___, - Zbom = input[i]._SWPDM_1208_SAP___BOM___ + Werks = item._SWPDM_1187_SAP___, + Beskz = item._SWPDM_1196_SAP_____, + Sobsl = item._SWPDM_1198_SAP_____, + Schgt = item._SWPDM_1197_SAP_____, + Rgekz = item._SWPDM_1199_SAP___, + Zbom = item._SWPDM_1208_SAP___BOM___ }; var sapOutput = await _sapService.SapMaterialApi(sapMaterialInput); string codeVal = sapOutput.code == "S" ? "成功" : "失败"; @@ -557,7 +707,8 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient { msg = "同步成功"; } - await _obj137Rep.AsUpdateable() + + db.CopyNew().Updateable() .SetColumns(it => new Obj137 { fld005532 = DateTime.Now, @@ -565,20 +716,117 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient fld005530 = "N", fld005531 = msg }) - .Where(it => it.idRecord == input[i].idRecord) - .ExecuteCommandAsync(); - var output = new SapOutput() + .Where(it => it.idRecord == item.idRecord) + .ExecuteCommand(); + + return new SapOutput() { parameter = sapOutput.parameter, - materialCode = input[0]._System_objNBS, + materialCode = item._System_objNBS, code = codeVal, msg = msg, result = sapOutput.result }; - SapOutputList.Add(output); - } - return SapOutputList; + }); + var materialOutput = await Task.WhenAll(tasks); + return materialOutput.ToList(); + //for (int i = 0; i < input.Count; i++) + //{ + // if (!string.IsNullOrEmpty(input[i]._SWPDM_1188_SAP___)) + // { + // // 验证物料描述长度 + // if (input[i]._SWPDM_1188_SAP___.Length > 40) + // { + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005532 = DateTime.Now, + // fld005530 = "N", + // fld005531 = lengthError, + // fld005529 = "失败" + // }) + // .Where(it => it.idRecord == input[i].idRecord) + // .ExecuteCommandAsync().ConfigureAwait(false); + + // SapOutputList.Add(new SapOutput() + // { + // materialCode = input[i]._System_objNBS, + // code = "失败", + // msg = lengthError, + // result = lengthError + // }); + // continue; + // } + // } + + + // //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid + // string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + // var sapMaterialInput = new SapMaterialInput() + // { + // Reqkeyid = "", + // Businessid = "", + // Messageid = "", + // Sndprn = "PLM", + // Rcvprn = "SAP", + // Requser = Requser, + // Note1 = "", + // Note2 = "", + // Note3 = "", + // Zwbid = millisecondTimestamp, + // Matnr = input[i]._System_objNBS, + // Mbrsh = input[i]._SWPDM_1185_SAP___, + // Mtart = input[i]._SWPDM_1186_SAP_____, + // Maktx = input[i]._SWPDM_1188_SAP___, + // Meins = input[i]._SWPDM_126_SW___, + // Matkl = input[i]._SWPDM_1203_SAP____, + // Bismt = input[i]._SWPDM_64_SW___, + // Groes = input[i]._SWPDM_125_SW___, + // Normt = input[i]._SWPDM_65_SW___, + // Ferth = input[i]._SWPDM_62_SW___, + // Zeinr = input[i]._SWPDM_61_SW_____, + // Mstae = input[i]._SWPDM_1209_SAP_____, + // Raube = "", + // Mhdrz = "", + // Mhdhb = "", + // Werks = input[i]._SWPDM_1187_SAP___, + // Beskz = input[i]._SWPDM_1196_SAP_____, + // Sobsl = input[i]._SWPDM_1198_SAP_____, + // Schgt = input[i]._SWPDM_1197_SAP_____, + // Rgekz = input[i]._SWPDM_1199_SAP___, + // Zbom = input[i]._SWPDM_1208_SAP___BOM___ + // }; + // var sapOutput = await _sapService.SapMaterialApi(sapMaterialInput); + // string codeVal = sapOutput.code == "S" ? "成功" : "失败"; + // string msg = sapOutput.msg; + + // if (sapOutput.msg == "") + // { + // msg = "同步成功"; + // } + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005532 = DateTime.Now, + // fld005529 = codeVal, + // fld005530 = "N", + // fld005531 = msg + // }) + // .Where(it => it.idRecord == input[i].idRecord) + // .ExecuteCommandAsync(); + // var output = new SapOutput() + // { + // parameter = sapOutput.parameter, + // materialCode = input[0]._System_objNBS, + // code = codeVal, + // msg = msg, + // result = sapOutput.result + // }; + // SapOutputList.Add(output); + //} + + //return SapOutputList; } /// @@ -590,171 +838,279 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient [AllowAnonymous] public async Task> TimingSyncToSAPBom() { - var sapOutputList = new List(); - var sapUserName = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); - // 配置 - var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "SolidWorks").FirstAsync(); + //.Where(x=> SqlFunc.Subqueryable().Where(y => y.RecordGuid == x.RecordGuid).Max(x => x.VersionIndex) == x.VersionIndex) + using var serviceScope = _scopeFactory.CreateScope(); + var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); + var syncData = db.Queryable() + .InnerJoin((x, y) => x.RecordGuid == y.ParentGuid && x.VersionIndex == y.ParentVersion) + //.InnerJoin((x, y, z) => x.fld005679_Rec == z.RecordGuid) + .Where((x, y) => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) && x.fld005530 == "N" && x.fld005529 == "成功" && (x.fld005534 == "A" || x.fld005534 == "M") && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW") && y.isDeleted == false && y.ConfigId == 8 && (y.fld005577 != "不包含" || y.fld005577 == null) && y.isSuppressed == false && y.inContext == false && (!(y.ParentSwFileType == 1 && y.isAddedFromSW == false))) + .Select((x, y) => new + { + x.idRecord, + x.VersionIndex, + x._System_objNBS, + x.RecordGuid, + x.fld005679_Rec, + x.fld005686, + x.fld005678, + x._SWPDM_1187_SAP___, + x.fld005680, + y.ParentGuid, + y.ParentVersion, + y.ChildGuid, + y.ChildObjID, + y.childVersion, + y.ConfigId, + y.QtyManual, + y.PartNumber, + y.fld005541, + y.fld005542, + y.fld005543, + y.fld005544, + y.fld004940, + y.fld005546, + y.fld005547, + //ecn = z._System_objNBS + }) + .ToList(); - var materialData = await _obj137Rep.AsQueryable() - .Where(x => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) && x.fld005530 == "N" && x.fld005529 == "成功" && (x.fld005534 == "A" || x.fld005534 == "M") && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW")) - .ToListAsync(); - var groupedData = materialData.GroupBy(item => item.RecordGuid) - .Select(group => group.OrderByDescending(item => item.VersionIndex).First()) - .ToList(); + var syncList = syncData.GroupBy(record => record.RecordGuid) + .Select(group => new SyncBomData + { + Id = group.FirstOrDefault()?.idRecord, + MaterialCode = group.FirstOrDefault()?._System_objNBS, + RecordGuid = group.FirstOrDefault()?.RecordGuid, + SyncVersion = group.FirstOrDefault()?.fld005686, + Bmeng = group.FirstOrDefault()?.fld005678, + Werks = group.FirstOrDefault()?._SWPDM_1187_SAP___, + Datuv = group.FirstOrDefault()?.fld005680, + VersionIndex = group.FirstOrDefault()?.VersionIndex, + //Ecn = group.FirstOrDefault()?.ecn, + ecnGuid = group.FirstOrDefault()?.fld005679_Rec, + Bom = group.Select(g => new BomData + { + PartNumber = g.PartNumber, + ParentGuid = g.ParentGuid, + ChildGuid = g.ChildGuid, + ChildObjID = g.ChildObjID, + ConfigId = g.ConfigId, + childVersion = g.childVersion, + ParentVersion = g.VersionIndex, + QtyManual = g.QtyManual, + SORTF = g.fld005541, + ITISOB = g.fld005542, + ALPGR = g.fld005543, + ALPRF = g.fld005544, + ZDELETE = g.fld004940, + POSTP = g.fld005546, + ZYFMK = g.fld005547 + }).ToList() + }); + List sapOutputs = new List(); - foreach (var item in groupedData) + var tasks = syncList.Select(async item => { - // 获取版本号 - var versionIndex = item.VersionIndex; - // 获取 ECN guid - var ecnGuid = item.fld005679_Rec; - // 查询 BOM - var bomData = await _configurationDataRep.AsQueryable() - .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == item.RecordGuid && x.isDeleted == false && x.ParentVersion == versionIndex && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); - if (bomData.Count == 0) - { - continue; - } - // 查询 ECN 编码 - var ecnData = await _obj118Rep.AsQueryable().Where(x => x.RecordGuid == ecnGuid && x.deleted == false).OrderByDescending(x => x.VersionIndex).FirstAsync(); - var ecn = ecnData != null ? ecnData._System_objNBS : ""; + var output = await SyncBomToSap(item); + return output; + }); - var itemDataList = new List(); - foreach (var bomItem in bomData) + var bomStockInquiryOutput = await Task.WhenAll(tasks); + + return bomStockInquiryOutput.ToList(); + } + + /// + /// 同步Bom到Sap + /// + /// + /// + public async Task SyncBomToSap(SyncBomData data) + { + using var serviceScope = _scopeFactory.CreateScope(); + //var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74"); + var ecn = db.CopyNew().Queryable().Where(x => x.RecordGuid == data.ecnGuid).OrderByDescending(x => x.idRecord).First(); + if (ecn != null) + { + data.Ecn = ecn._System_objNBS; + } + var itemDataList = new List(); + foreach (var item in data.Bom) + { + + var verification = await _dataValidationService.VerificationMaterial(item.ChildObjID, item.PartNumber, item.ChildGuid); + if (verification == "不存在") { - var verification = await _dataValidationService.VerificationMaterial(bomItem.ChildObjID, bomItem.PartNumber, bomItem.ChildGuid); - if (verification == "不存在") + if (item.ChildObjID == 137) + { + string partNumber = item.PartNumber.Replace("默认 ", "");//过滤BOM表PartNumber字段存在“默认 ” + if (partNumber == item.PartNumber)//判断过滤后，物料编码是否和原料相同，相同的话跳出循环 + { + continue; + } + var data137 = db.CopyNew().Queryable().Where(x => x._System_objNBS == item.ChildGuid && x.deleted == false&& x._system_objConfigurationName == "默认").OrderByDescending(x => x.idRecord).First(); + + if (data137 != null) + { + item.PartNumber = data137._System_objNBS; + } + else + { + continue; + } + } + else { continue; } - - var itemData = new ItemData - { - POSNR = (bomData.IndexOf(bomItem) + 1).ToString(), - IDNRK = bomItem.PartNumber, - MENGE = Math.Round((decimal)bomItem.QtyManual, 3).ToString(), - SORTF = bomItem.fld005541, - ITISOB = bomItem.fld005542, - ALPGR = bomItem.fld005543, - ALPRF = bomItem.fld005544, - ZDELETE = bomItem.fld004940, - POSTP = bomItem.fld005546, - ZYFMK = bomItem.fld005547 - }; - itemDataList.Add(itemData); - } - var ParentData = await _obj137Rep.AsQueryable().Where(x => x.RecordGuid == bomData[0].ParentGuid && x.deleted == false && x.VersionIndex == bomData[0].ParentVersion).FirstAsync(); - - if (!string.IsNullOrEmpty(ParentData.fld005686)) + var itemData = new ItemData { - var configidold = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "SolidWorks").FirstAsync(); - var BomData = await _configurationDataRep.AsQueryable().Where(x => x.ConfigId == configidold.ConfigID && x.ParentGuid == bomData[0].ParentGuid && x.isDeleted == false && x.ParentVersion == Convert.ToInt32(ParentData.fld005686) && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); - for (int i = 0; i < BomData.Count; i++) - { + POSNR = (data.Bom.IndexOf(item) + 1).ToString(), + IDNRK = item.PartNumber, + MENGE = Math.Round((decimal)item.QtyManual, 3).ToString(), + SORTF = item.SORTF, + ITISOB = item.ITISOB, + ALPGR = item.ALPGR, + ALPRF = item.ALPRF, + ZDELETE = item.ZDELETE, + POSTP = item.POSTP, + ZYFMK = item.ZYFMK + }; + itemDataList.Add(itemData); - var itemList = itemDataList.Where(x => x.IDNRK == BomData[i].PartNumber).ToList(); - if (itemList.Count == 0) + } + + if (!string.IsNullOrEmpty(data.SyncVersion)) + { + //var BomData2 = await _configurationDataRep.AsQueryable().Where(x => x.ConfigId == 8 && x.ParentGuid == data.RecordGuid && x.isDeleted == false && x.ParentVersion == Convert.ToInt32(data.fld005686) && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false).ToListAsync(); + + var BomData = db.CopyNew().Queryable().Where(x => x.ConfigId == 8 && x.ParentGuid == data.RecordGuid && x.isDeleted == false && x.ParentVersion == Convert.ToInt32(data.SyncVersion) && (x.fld005577 != "不包含" || x.fld005577 == null) && x.isSuppressed == false && x.inContext == false && (!(x.ParentSwFileType == 1 && x.isAddedFromSW == false))).ToList(); + + foreach (var item in BomData) + { + var itemList = itemDataList.Where(x => x.IDNRK == item.PartNumber).ToList(); + if (itemList.Count == 0) + { + var Verification = await _dataValidationService.VerificationMaterial(item.ChildObjID, item.PartNumber, item.ChildGuid); + if (Verification == "不存在") { - var Verification = await _dataValidationService.VerificationMaterial(BomData[i].ChildObjID, BomData[i].PartNumber, BomData[i].ChildGuid); - if (Verification == "不存在") + if (item.ChildObjID == 137) + { + string partNumber = item.PartNumber.Replace("默认 ", "");//过滤BOM表PartNumber字段存在“默认 ” + if (partNumber == item.PartNumber)//判断过滤后，物料编码是否和原料相同，相同的话跳出循环 + { + continue; + } + var data137 = db.CopyNew().Queryable().Where(x => x._System_objNBS == partNumber && x.deleted == false).OrderByDescending(x => x.idRecord).First(); + + if (data137 != null) + { + item.PartNumber = data137._System_objNBS; + } + else + { + continue; + } + } + else { continue; } - //int sun = i + 1; - var itemData = new ItemData() - { - POSNR = "",//组件序号 sun.ToString() - IDNRK = BomData[i].PartNumber,//组件物料号 - MENGE = Math.Round((decimal)BomData[i].QtyManual, 3).ToString(),//组件数量 - SORTF = BomData[i].fld005541, - ITISOB = BomData[i].fld005542, - ALPGR = BomData[i].fld005543, - ALPRF = BomData[i].fld005544, - ZDELETE = "X", - POSTP = BomData[i].fld005546, - ZYFMK = BomData[i].fld005547 - }; - itemDataList.Add(itemData); } - + //int sun = i + 1; + var itemData = new ItemData() + { + POSNR = "",//组件序号 sun.ToString() + IDNRK = item.PartNumber,//组件物料号 + MENGE = Math.Round((decimal)item.QtyManual, 3).ToString(),//组件数量 + SORTF = item.fld005541, + ITISOB = item.fld005542, + ALPGR = item.fld005543, + ALPRF = item.fld005544, + ZDELETE = "X", + POSTP = item.fld005546, + ZYFMK = item.fld005547 + }; + itemDataList.Add(itemData); } } - - // 获取时间戳精确到毫秒，sap 要求每次调用生成不重复 guid - string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); - - var fld005678 = item.fld005678 ?? 1; - - var isreq = new IS_REQ - { - ReqKeyId = "", - BusinessId = "", - MessageId = "", - SndPrn = "PLM", - RcvPrn = "SAP", - ReqUser = sapUserName, - Note1 = "", - Note2 = "", - Note3 = "", - Zwbid = millisecondTimestamp, - Matnr = item._System_objNBS, - Werks = item._SWPDM_1187_SAP___, - Bmeng = fld005678.ToString(), - Aennr = ecn, - Datuv = item.fld005680.ToString(), - ItemList = itemDataList - }; - - var apiOutput = await _sapService.SapBomApi(isreq); - string codeVal = apiOutput.code == "S" ? "成功" : "失败"; - - if (codeVal == "成功") - { - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005539 = DateTime.Now, - fld005533 = codeVal, - fld005534 = "N", - fld005535 = apiOutput.msg, - fld005686 = versionIndex.ToString() - }) - .Where(it => it.idRecord == item.idRecord) - .ExecuteCommandAsync(); - } - else - { - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005539 = DateTime.Now, - fld005533 = codeVal, - fld005534 = "N", - fld005535 = apiOutput.msg - }) - .Where(it => it.idRecord == item.idRecord) - .ExecuteCommandAsync(); - } - - var msg = apiOutput.msg; - if (string.IsNullOrEmpty(msg)) - { - msg = "同步成功"; - } - - var output = new SapOutput - { - parameter = apiOutput.parameter, - materialCode = item._System_objNBS, - code = codeVal, - msg = msg, - result = apiOutput.result - }; - sapOutputList.Add(output); } - return sapOutputList; + + string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + + var Bmeng = data.Bmeng ?? 1; + + var sapUserName = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); + + var isreq = new IS_REQ + { + ReqKeyId = "", + BusinessId = "", + MessageId = "", + SndPrn = "PLM", + RcvPrn = "SAP", + ReqUser = sapUserName, + Note1 = "", + Note2 = "", + Note3 = "", + Zwbid = millisecondTimestamp, + Matnr = data.MaterialCode, + Werks = data.Werks, + Bmeng = Bmeng.ToString(), + Aennr = data.Ecn, + Datuv = data.Datuv.ToString(), + ItemList = itemDataList + }; + + var apiOutput = await _sapService.SapBomApi(isreq); + + string codeVal = apiOutput.code == "S" ? "成功" : "失败"; + + if (codeVal == "成功") + { + db.CopyNew().Updateable().Where(it => it.idRecord == data.Id) + .SetColumns(it => new Obj137 + { + fld005539 = DateTime.Now, + fld005533 = codeVal, + fld005534 = "N", + fld005535 = apiOutput.msg, + fld005686 = data.VersionIndex.ToString() + }).ExecuteCommand(); + + } + else + { + db.CopyNew().Updateable().Where(it => it.idRecord == data.Id) + .SetColumns(it => new Obj137 + { + fld005539 = DateTime.Now, + fld005533 = codeVal, + fld005534 = "N", + fld005535 = apiOutput.msg + }) + .ExecuteCommand(); + } + + var msg = apiOutput.msg; + if (string.IsNullOrEmpty(msg)) + { + msg = "同步成功"; + } + + var output = new SapOutput + { + parameter = apiOutput.parameter, + materialCode = data.MaterialCode, + code = codeVal, + msg = msg, + result = apiOutput.result + }; + return output; } /// @@ -766,7 +1122,6 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient [DisplayName("获取工艺路线")] public async Task> GetProcessRoute(BomPageProductDesignLibraryInput input) { - var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "pBOM").FirstAsync(); var parent = await _obj137Rep.AsQueryable() .Where(x => x.RecordGuid == input.ParentGuid @@ -781,7 +1136,7 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient ) .MaxAsync(x => x.VersionIndex); var BomData = await _configurationDataRep.AsQueryable() - .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == input.ParentGuid && x.isDeleted == false && x.ParentVersion == parent) + .Where(x => x.ConfigId == 9 && x.ParentGuid == input.ParentGuid && x.isDeleted == false && x.ParentVersion == parent) .WhereIF(!string.IsNullOrWhiteSpace(input.Description), u => u.Description.Contains(input.Description.Trim())) .WhereIF(!string.IsNullOrWhiteSpace(input.PartNumber), u => u.PartNumber.Contains(input.PartNumber.Trim())) .Select().ToPagedListAsync(input.Page, input.PageSize); @@ -811,43 +1166,357 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient && (x.fld005537 == "A" || x.fld005537 == "M") ) .FirstAsync(); + var processRouteList = new List(); + foreach (var item in input) + { + var processRoute = new ProcessRouteList + { + ParentGuid = item.ParentGuid, + ChildGuid = item.ChildGuid, + ChildObjID = item.ChildObjID, + PartNumber = item.PartNumber, + VORNR = item.Marker, + VGW01 = item.fld005571, + VGE01 = item.fld005572, + STEUS = item.fld005573, + BMSCH = item.fld005575 + }; + processRouteList.Add(processRoute); + } + var syncProcessRouteData = new SyncProcessRouteData + { + idRecord = ParentData.idRecord, + _System_objNBS = ParentData._System_objNBS, + VersionIndex = ParentData.VersionIndex, + Werks=ParentData._SWPDM_1187_SAP___, + Datuv = ParentData.fld005680, + ProcessRouteList = processRouteList + }; + + var output = await SyncProcessRouteToSap(syncProcessRouteData); + return output; + //var itemDataList = new List(); + + //for (int i = 0; i < input.Count; i++) + //{ + // var Verification = await _dataValidationService.VerificationMaterial(input[i].ChildObjID, input[i].PartNumber, input[i].ChildGuid); + // if (Verification == "不存在") + // { + // continue; + // } + + // //获取工序描述 + // var procedureDescription = await _obj122Rep.AsQueryable().Where(x => x.RecordGuid == input[i].ChildGuid).ToListAsync(); + // //获取工作中心 + // var workCenter = await _obj121Rep.AsQueryable().Where(x => x.RecordGuid == procedureDescription[0].fld005059_Rec).ToListAsync(); + // //int sun = i + 1; + // var itemData = new SapProcessRouteItemData() + // { + // VORNR = input[i].Marker, + // LTXA1 = procedureDescription[0]._System_ObjDescription, + // ARBPL = workCenter[0]._System_objNBS, + // VGW01 = input[i].fld005571.ToString(), + // VGE01 = input[i].fld005572, + // STEUS = input[i].fld005573, + // BMSCH = input[i].fld005575.ToString() + + // }; + // itemDataList.Add(itemData); + //} + + ////获取时间戳精确到毫秒，sap要求每次调用生成不重复guid + //string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + + //var Datuv = ParentData.fld005680.ToString(); + //if (!string.IsNullOrEmpty(Datuv)) + //{ + // Datuv = ParentData.fld005680.ToDateTime().ToString("yyyy-MM-dd"); + //} + + //var isreq = new SapProcessRouteIS_REQ() + //{ + // ReqKeyId = "", + // BusinessId = "", + // MessageId = "", + // SndPrn = "PLM", + // RcvPrn = "SAP", + // ReqUser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName), + // Note1 = "", + // Note2 = "", + // Note3 = "", + // Zwbid = millisecondTimestamp, + // Matnr = ParentData._System_objNBS, + // Werks = ParentData._SWPDM_1187_SAP___, + // Datuv = Datuv, + // Plnal = "", + + // ItemList = itemDataList + //}; + //var apiOutput = await _sapService.SapProcessRouteApi(isreq); + //string codeVal = apiOutput.code == "S" ? "成功" : "失败"; + //await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005540 = DateTime.Now, + // fld005536 = codeVal, + // fld005537 = "N", + // fld005538 = apiOutput.msg + // }) + // .Where(it => it.idRecord == ParentData.idRecord) + // .ExecuteCommandAsync(); + //var msg = apiOutput.msg; + //if (apiOutput.msg == "") + //{ + // msg = "同步成功"; + //} + //var output = new SapOutput() + //{ + // parameter = apiOutput.parameter, + // code = codeVal, + // msg = msg, + // result = apiOutput.result + //}; + //return output; + } + + /// + /// 产品设计库-定时同步工艺路线到SAP + /// + /// + [ApiDescriptionSettings(Name = "TimingSyncToSAPProcessRoute"), HttpGet] + [DisplayName("产品设计库-定时同步工艺路线到SAP")] + [AllowAnonymous] + public async Task> TimingSyncToSAPProcessRoute() + { + using var serviceScope = _scopeFactory.CreateScope(); + var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); + + var syncPbom = db.Queryable() + .InnerJoin((x, y) => x.RecordGuid == y.ParentGuid && x.VersionIndex == y.ParentVersion) + .Where((x, y) => x.CheckedStatus == 0 && x.deleted == false && x.IsLatestVersion == true && x._system_objConfigurationName == "默认" && !x.SWPDMFileName.Contains("SLDDRW") && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) && x.fld005530 == "N" && x.fld005529 == "成功" && (x.fld005537 == "A" || x.fld005537 == "M") && y.ConfigId == 9 && y.isDeleted == false) + .Select((x, y) => new + { + x.idRecord, + x.VersionIndex, + x.RecordGuid, + x._System_objNBS, + x._SWPDM_1187_SAP___, + x.fld005680, + y.ParentGuid, + y.ChildGuid, + y.ChildObjID, + y.PartNumber, + y.Marker, + y.fld005571, + y.fld005572, + y.fld005573, + y.fld005575, + + }).ToList(); + + var syncList = syncPbom.GroupBy(record => record.RecordGuid) + .Select(group => new SyncProcessRouteData + { + idRecord = group.FirstOrDefault()?.idRecord, + _System_objNBS = group.FirstOrDefault()?._System_objNBS, + VersionIndex = group.FirstOrDefault()?.VersionIndex, + Datuv = group.FirstOrDefault()?.fld005680, + ProcessRouteList = group.Select(g => new ProcessRouteList + { + ParentGuid = g.ParentGuid, + ChildGuid = g.ChildGuid, + ChildObjID = g.ChildObjID, + PartNumber = g.PartNumber, + VORNR = g.Marker, + VGW01 = g.fld005571, + VGE01 = g.fld005572, + STEUS = g.fld005573, + BMSCH = g.fld005575 + }).ToList() + }); + + var tasks = syncList.Select(async item => + { + var output = await SyncProcessRouteToSap(item); + return output; + }); + + var bomStockInquiryOutput = await Task.WhenAll(tasks); + + return bomStockInquiryOutput.ToList(); + + + //var sapOutputList = new List(); + //var sapUserName = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); + //// 配置 + //var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "pBOM").FirstAsync(); + + // //查询需要同步的产品 + // var materialData = await _obj137Rep.AsQueryable() + // .Where(x => + // x.CheckedStatus == 0 + // && x.deleted == false + // && x.IsLatestVersion == true + // && x._system_objConfigurationName == "默认" + // && !x.SWPDMFileName.Contains("SLDDRW") + // && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) + // && x.fld005530 == "N" + // && x.fld005529 == "成功" + // && (x.fld005537 == "A" || x.fld005537 == "M") + // ) + // .ToListAsync(); + // //分组查询最大版本的物料 + // var groupedData = materialData.GroupBy(item => item.RecordGuid) + //.Select(group => group.OrderByDescending(item => item.VersionIndex).First()) + //.ToList(); + + // foreach (var item in groupedData) + // { + // // 获取版本号 + // var versionIndex = item.VersionIndex; + // // 查询 BOM + // var processRouteData = await _configurationDataRep.AsQueryable() + // .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == item.RecordGuid && x.isDeleted == false && x.ParentVersion == versionIndex).ToListAsync(); + // if (processRouteData.Count == 0) + // { + // continue; + // } + // var itemDataList = new List(); + + // foreach (var processRouteItem in processRouteData) + // { + // var verification = await _dataValidationService.VerificationMaterial(processRouteItem.ChildObjID, processRouteItem.PartNumber, processRouteItem.ChildGuid); + // if (verification == "不存在") + // { + // continue; + // } + // //获取工序描述 + // var procedureDescription = await _obj122Rep.AsQueryable().Where(x => x.RecordGuid == processRouteItem.ChildGuid).ToListAsync(); + // //获取工作中心 + // var workCenter = await _obj121Rep.AsQueryable().Where(x => x.RecordGuid == procedureDescription[0].fld005059_Rec).ToListAsync(); + // var itemData = new SapProcessRouteItemData() + // { + // VORNR = processRouteItem.Marker, + // LTXA1 = procedureDescription[0]._System_ObjDescription, + // ARBPL = workCenter[0]._System_objNBS, + // VGW01 = processRouteItem.fld005571.ToString(), + // VGE01 = processRouteItem.fld005572, + // STEUS = processRouteItem.fld005573, + // BMSCH = processRouteItem.fld005575.ToString() + + // }; + // itemDataList.Add(itemData); + // } + // //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid + // string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); + + // var Datuv = item.fld005680.ToString(); + + // if (!string.IsNullOrEmpty(Datuv)) + // { + // Datuv = item.fld005680.ToDateTime().ToString("yyyy-MM-dd"); + // } + // var isreq = new SapProcessRouteIS_REQ() + // { + // ReqKeyId = "", + // BusinessId = "", + // MessageId = "", + // SndPrn = "PLM", + // RcvPrn = "SAP", + // ReqUser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName), + // Note1 = "", + // Note2 = "", + // Note3 = "", + // Zwbid = millisecondTimestamp, + // Matnr = item._System_objNBS, + // Werks = item._SWPDM_1187_SAP___, + // Datuv = Datuv, + // Plnal = "", + + // ItemList = itemDataList + // }; + + // var apiOutput = await _sapService.SapProcessRouteApi(isreq); + // string codeVal = apiOutput.code == "S" ? "成功" : "失败"; + // await _obj137Rep.AsUpdateable() + // .SetColumns(it => new Obj137 + // { + // fld005540 = DateTime.Now, + // fld005536 = codeVal, + // fld005537 = "N", + // fld005538 = apiOutput.msg + // }) + // .Where(it => it.idRecord == item.idRecord) + // .ExecuteCommandAsync(); + // var msg = apiOutput.msg; + // if (apiOutput.msg == "") + // { + // msg = "同步成功"; + // } + // var output = new SapOutput() + // { + // parameter = apiOutput.parameter, + // code = codeVal, + // msg = msg, + // result = apiOutput.result + // }; + + // sapOutputList.Add(output); + // } + // return sapOutputList; + } + + /// + /// 同步工艺路线到Sap + /// + /// + /// + public async Task SyncProcessRouteToSap(SyncProcessRouteData data) + { + using var serviceScope = _scopeFactory.CreateScope(); + //var sysEnumService = serviceScope.ServiceProvider.GetRequiredService(); + var db = serviceScope.ServiceProvider.GetRequiredService().AsTenant().GetConnectionScope("启威星 1.94.4.74").CopyNew(); var itemDataList = new List(); - for (int i = 0; i < input.Count; i++) + foreach (var item in data.ProcessRouteList) { - var Verification = await _dataValidationService.VerificationMaterial(input[i].ChildObjID, input[i].PartNumber, input[i].ChildGuid); - if (Verification == "不存在") + var verification = await _dataValidationService.VerificationMaterial(item.ChildObjID, item.PartNumber, item.ChildGuid); + if (verification == "不存在") { continue; } //获取工序描述 - var procedureDescription = await _obj122Rep.AsQueryable().Where(x => x.RecordGuid == input[i].ChildGuid).ToListAsync(); + var procedureDescription = db.CopyNew().Queryable().Where(x => x.RecordGuid == item.ChildGuid).First(); ; + //获取工作中心 - var workCenter = await _obj121Rep.AsQueryable().Where(x => x.RecordGuid == procedureDescription[0].fld005059_Rec).ToListAsync(); - //int sun = i + 1; + var workCenter = db.CopyNew().Queryable().Where(x => x.RecordGuid == procedureDescription.fld005059_Rec).First(); + var itemData = new SapProcessRouteItemData() { - VORNR = input[i].Marker, - LTXA1 = procedureDescription[0]._System_ObjDescription, - ARBPL = workCenter[0]._System_objNBS, - VGW01 = input[i].fld005571.ToString(), - VGE01 = input[i].fld005572, - STEUS = input[i].fld005573, - BMSCH = input[i].fld005575.ToString() + VORNR = item.VORNR, + LTXA1 = procedureDescription._System_ObjDescription, + ARBPL = workCenter._System_objNBS, + VGW01 = item.VGW01, + VGE01 = item.VGE01, + STEUS = item.STEUS, + BMSCH = item.BMSCH }; itemDataList.Add(itemData); + } //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); - var Datuv = ParentData.fld005680.ToString(); + var Datuv = data.Datuv.ToString(); + if (!string.IsNullOrEmpty(Datuv)) { - Datuv = ParentData.fld005680.ToDateTime().ToString("yyyy-MM-dd"); + Datuv = data.Datuv.ToDateTime().ToString("yyyy-MM-dd"); } var isreq = new SapProcessRouteIS_REQ() @@ -862,25 +1531,27 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient Note2 = "", Note3 = "", Zwbid = millisecondTimestamp, - Matnr = ParentData._System_objNBS, - Werks = ParentData._SWPDM_1187_SAP___, + Matnr = data._System_objNBS, + Werks = data.Werks, Datuv = Datuv, Plnal = "", ItemList = itemDataList }; + var apiOutput = await _sapService.SapProcessRouteApi(isreq); string codeVal = apiOutput.code == "S" ? "成功" : "失败"; - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005540 = DateTime.Now, - fld005536 = codeVal, - fld005537 = "N", - fld005538 = apiOutput.msg - }) - .Where(it => it.idRecord == ParentData.idRecord) - .ExecuteCommandAsync(); + + db.CopyNew().Updateable() + .SetColumns(it => new Obj137 + { + fld005540 = DateTime.Now, + fld005536 = codeVal, + fld005537 = "N", + fld005538 = apiOutput.msg + }) + .Where(it => it.idRecord == data.idRecord) + .ExecuteCommand(); var msg = apiOutput.msg; if (apiOutput.msg == "") { @@ -894,137 +1565,8 @@ public class ProductDesignLibraryService : IDynamicApiController, ITransient result = apiOutput.result }; return output; + } - - /// - /// 产品设计库-定时同步工艺路线到SAP - /// - /// - [ApiDescriptionSettings(Name = "TimingSyncToSAPProcessRoute"), HttpGet] - [DisplayName("产品设计库-定时同步工艺路线到SAP")] - [AllowAnonymous] - public async Task> TimingSyncToSAPProcessRoute() - { - var sapOutputList = new List(); - var sapUserName = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName); - // 配置 - var configid = await _configurationsRep.AsQueryable().Where(x => x.ObjectId == 137 && x.ConfigSystemName == "pBOM").FirstAsync(); - - //查询需要同步的产品 - var materialData = await _obj137Rep.AsQueryable() - .Where(x => - x.CheckedStatus == 0 - && x.deleted == false - && x.IsLatestVersion == true - && x._system_objConfigurationName == "默认" - && !x.SWPDMFileName.Contains("SLDDRW") - && (x._SWPDM_1202_SW_____ != "不展开" || x._SWPDM_1202_SW_____ == null) - && x.fld005530 == "N" - && x.fld005529 == "成功" - && (x.fld005537 == "A" || x.fld005537 == "M") - ) - .ToListAsync(); - //分组查询最大版本的物料 - var groupedData = materialData.GroupBy(item => item.RecordGuid) - .Select(group => group.OrderByDescending(item => item.VersionIndex).First()) - .ToList(); - - foreach (var item in groupedData) - { - // 获取版本号 - var versionIndex = item.VersionIndex; - // 查询 BOM - var processRouteData = await _configurationDataRep.AsQueryable() - .Where(x => x.ConfigId == configid.ConfigID && x.ParentGuid == item.RecordGuid && x.isDeleted == false && x.ParentVersion == versionIndex).ToListAsync(); - if (processRouteData.Count == 0) - { - continue; - } - var itemDataList = new List(); - - foreach (var processRouteItem in processRouteData) - { - var verification = await _dataValidationService.VerificationMaterial(processRouteItem.ChildObjID, processRouteItem.PartNumber, processRouteItem.ChildGuid); - if (verification == "不存在") - { - continue; - } - //获取工序描述 - var procedureDescription = await _obj122Rep.AsQueryable().Where(x => x.RecordGuid == processRouteItem.ChildGuid).ToListAsync(); - //获取工作中心 - var workCenter = await _obj121Rep.AsQueryable().Where(x => x.RecordGuid == procedureDescription[0].fld005059_Rec).ToListAsync(); - var itemData = new SapProcessRouteItemData() - { - VORNR = processRouteItem.Marker, - LTXA1 = procedureDescription[0]._System_ObjDescription, - ARBPL = workCenter[0]._System_objNBS, - VGW01 = processRouteItem.fld005571.ToString(), - VGE01 = processRouteItem.fld005572, - STEUS = processRouteItem.fld005573, - BMSCH = processRouteItem.fld005575.ToString() - - }; - itemDataList.Add(itemData); - } - //获取时间戳精确到毫秒，sap要求每次调用生成不重复guid - string millisecondTimestamp = DateTimeOffset.UtcNow.ToUnixTimeMilliseconds().ToString(); - - var Datuv = item.fld005680.ToString(); - - if (!string.IsNullOrEmpty(Datuv)) - { - Datuv = item.fld005680.ToDateTime().ToString("yyyy-MM-dd"); - } - var isreq = new SapProcessRouteIS_REQ() - { - ReqKeyId = "", - BusinessId = "", - MessageId = "", - SndPrn = "PLM", - RcvPrn = "SAP", - ReqUser = await _sysConfigService.GetConfigValueByCode(ConfigConst.SapUserName), - Note1 = "", - Note2 = "", - Note3 = "", - Zwbid = millisecondTimestamp, - Matnr = item._System_objNBS, - Werks = item._SWPDM_1187_SAP___, - Datuv = Datuv, - Plnal = "", - - ItemList = itemDataList - }; - - var apiOutput = await _sapService.SapProcessRouteApi(isreq); - string codeVal = apiOutput.code == "S" ? "成功" : "失败"; - await _obj137Rep.AsUpdateable() - .SetColumns(it => new Obj137 - { - fld005540 = DateTime.Now, - fld005536 = codeVal, - fld005537 = "N", - fld005538 = apiOutput.msg - }) - .Where(it => it.idRecord == item.idRecord) - .ExecuteCommandAsync(); - var msg = apiOutput.msg; - if (apiOutput.msg == "") - { - msg = "同步成功"; - } - var output = new SapOutput() - { - parameter = apiOutput.parameter, - code = codeVal, - msg = msg, - result = apiOutput.result - }; - - sapOutputList.Add(output); - } - return sapOutputList; - } - /// /// 创建排版软件 /// diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncBomData.cs b/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncBomData.cs new file mode 100644 index 0000000..036acfd --- /dev/null +++ b/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncBomData.cs @@ -0,0 +1,123 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Vistar.Application.Util; +public class SyncBomData +{ + /// + /// 主表Id + /// + public long? Id { get; set; } + + /// + /// 物料编码 + /// + public string MaterialCode { get; set; } + + /// + /// guid + /// + public string RecordGuid { get; set; } + + /// + /// Sap同步版本 + /// + public string SyncVersion { get; set; } + + /// + /// 工厂 + /// + public string Werks { get; set; } + + /// + /// 基本数量 + /// + public int? Bmeng { get; set; } + + /// + /// 有效日期 + /// + public DateTime? Datuv { get; set; } + + /// + /// 版本 + /// + public int? VersionIndex { get; set; } + + /// + /// ecn + /// + public string Ecn { get; set; } + + /// + /// ecn Guid + /// + public string ecnGuid { get; set; } + public List Bom { get; set; } +} + +public class BomData +{ + public string PartNumber { get; set; } + public string ParentGuid { get; set; } + public string ChildGuid { get; set; } + public long ChildObjID { get; set; } + public long ConfigId { get; set; } + public int? childVersion { get; set; } + public int? ParentVersion { get; set; } + + /// + /// 手动数量 + /// + public double? QtyManual { get; set; } + + /// + /// 数量 + /// + public double? Quantity { get; set; } + + /// + /// 排序字符串 + /// + public string SORTF { get; set; } + + /// + /// 是否虚拟 + /// + public string ITISOB { get; set; } + + /// + /// 替代组 + /// + public string ALPGR { get; set; } + + /// + /// 优先级 + /// + public string ALPRF { get; set; } + + /// + /// 是否删除 + /// + public string ZDELETE { get; set; } + + /// + /// 行项目类别 + /// + public string POSTP { get; set; } + + /// + /// 研发模块 + /// + public string ZYFMK { get; set; } + +} \ No newline at end of file diff --git a/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncProcessRouteData.cs b/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncProcessRouteData.cs new file mode 100644 index 0000000..e8f68a0 --- /dev/null +++ b/admin.net.pro/Admin.NET/Vistar.Application/Util/SyncProcessRouteData.cs @@ -0,0 +1,37 @@ +// Admin.NET 项目的版权、商标、专利和其他相关权利均受相应法律法规的保护。使用本项目应遵守相关法律法规和许可证的要求。 +// +// 本项目主要遵循 MIT 许可证和 Apache 许可证（版本 2.0）进行分发和使用。许可证位于源代码树根目录中的 LICENSE-MIT 和 LICENSE-APACHE 文件。 +// +// 不得利用本项目从事危害国家安全、扰乱社会秩序、侵犯他人合法权益等法律法规禁止的活动！任何基于本项目二次开发而产生的一切法律纠纷和责任，我们不承担任何责任！ + +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Vistar.Application.Util; +public class SyncProcessRouteData +{ + public long? idRecord { get; set; } + public int? VersionIndex { get; set; } + public string _System_objNBS { get; set; } + public string Werks { get; set; } + public DateTime? Datuv { get; set; } + public List ProcessRouteList { get; set; } + +} +public class ProcessRouteList +{ + public string ParentGuid { get; set; } + public string ChildGuid { get; set; } + public long ChildObjID { get; set; } + public string PartNumber { get; set; } + public string VORNR { get; set; } + public string LTXA1 { get; set; } + public string ARBPL { get; set; } + public string VGW01 { get; set; } + public string VGE01 { get; set; } + public string STEUS { get; set; } + public string BMSCH { get; set; } +}