From 9b6756c28a93d0b38ae0878bebe64272e17a92fc Mon Sep 17 00:00:00 2001 From: leo <10200039@qq.com> Date: Sun, 9 Apr 2023 20:28:39 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85=E5=AE=8C?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 9491a2f..adbe2cd 100644 --- a/.gitignore +++ b/.gitignore @@ -360,4 +360,5 @@ MigrationBackup/ .ionide/ # Fody - auto-generated XML schema -FodyWeavers.xsd \ No newline at end of file +FodyWeavers.xsd +/FactorySystemApi/File/Temp From 4097150bfa81b75e1539abe5e41564d061206c5b Mon Sep 17 00:00:00 2001 From: leo <10200039@qq.com> Date: Sun, 9 Apr 2023 20:28:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=86=E5=9B=BE=E7=BC=96=E8=BE=91?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AD=97=E6=AE=B5=E8=A1=A5=E5=85=85=E5=AE=8C?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- FactorySystemBll/ViewBll.cs | 8 +- .../SqlSugarModel/TFS_Material.cs | 126 ++++++++++++++++++ .../SqlSugarModel/TFS_ViewMaterial.cs | 70 ++++++++++ 3 files changed, 202 insertions(+), 2 deletions(-) diff --git a/FactorySystemBll/ViewBll.cs b/FactorySystemBll/ViewBll.cs index 2f573e2..c229d1d 100644 --- a/FactorySystemBll/ViewBll.cs +++ b/FactorySystemBll/ViewBll.cs @@ -28,14 +28,18 @@ namespace FactorySystemBll .Where((a, b) => a.FTeamID == teamId) .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID) .WhereIF(viewType > 0, (a, b) => a.FViewType == viewType) - .Select("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode").ToDictionaryList(); + .Select("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," + + "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," + + "b.FQualityTest1,b.FQualityTest2").ToDictionaryList(); if (viewType == 1) { List> viewList1 = db.Queryable((a, b) => new JoinQueryInfos(JoinType.Inner, a.FMaterialID == b.FID)) .Where((a, b) => a.FTeamID == teamId) .WhereIF(currUser != null, (a, b) => a.FFactoryID == currUser.FFactoryID) .WhereIF(viewType > 0, (a, b) => a.FViewType == 2) - .Select("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode").ToDictionaryList(); + .Select("distinct a.*,b.FTypeID1,b.FTypeID2,b.FK3Code,b.FK3Name,b.FK3ShortCode,b.FTestCode,b.FRelationCode,b.FRelationName,b.FSAPCode,b.FSAPDescription,b.FMaterialGroup,b.FMaterialType,b.FCustomerCode,b.FStoreHouse," + + "b.FBomEntry,b.FLineHouse,b.FProductDesc,b.FWorkCenter,b.FCraftExplain,b.FIidentifier,b.FGuaranteePeriod,b.FBStorageConditions,b.FSafetyStock,b.FTriggerRatio,b.FMinAmount,b.FMaxAmount,b.FYield,b.FFixedLoss,b.FTheoryYield," + + "b.FQualityTest1,b.FQualityTest2").ToDictionaryList(); List Minfo = GetMaterialInfoList(viewList1.GroupBy(s => s["FMaterialID"]).Select(s => int.Parse(s.Key.ToString())).ToList(), "", "", currUserId); if (Minfo.Count > 0) { FGuaranteePeriod = Minfo[0].FGuaranteePeriod; diff --git a/FactorySystemModel/SqlSugarModel/TFS_Material.cs b/FactorySystemModel/SqlSugarModel/TFS_Material.cs index 142078c..74d22eb 100644 --- a/FactorySystemModel/SqlSugarModel/TFS_Material.cs +++ b/FactorySystemModel/SqlSugarModel/TFS_Material.cs @@ -362,5 +362,131 @@ namespace FactorySystemModel.SqlSugarModel /// [SugarColumn(IsIgnore = true)] public int FLevelID { get; set; } + + /// + /// Desc:客供料标识 + /// Default: + /// Nullable:False + /// + public string FCustomerCode { get; set; } + + /// + /// Desc:BOM录入情况 + /// Default: + /// Nullable:False + /// + public string FBomEntry { get; set; } + + /// + /// Desc:产品说明 + /// Default: + /// Nullable:False + /// + public string FProductDesc { get; set; } + + /// + /// Desc:标识符 + /// Default: + /// Nullable:False + /// + public string FIidentifier { get; set; } + + /// + /// Desc:保质期 + /// Default: + /// Nullable:False + /// + public string FGuaranteePeriod { get; set; } + + /// + /// Desc:存储条件 + /// Default: + /// Nullable:False + /// + public string FBStorageConditions { get; set; } + + /// + /// Desc:安全库存 + /// Default: + /// Nullable:False + /// + public string FSafetyStock { get; set; } + + /// + /// Desc:触发比例 + /// Default: + /// Nullable:False + /// + public string FTriggerRatio { get; set; } + + /// + /// Desc:最小量 + /// Default: + /// Nullable:False + /// + public string FMinAmount { get; set; } + + /// + /// Desc:最大量 + /// Default: + /// Nullable:False + /// + public string FMaxAmount { get; set; } + + /// + /// Desc:得率 + /// Default: + /// Nullable:False + /// + public string FYield { get; set; } + + /// + /// Desc:理论得率 + /// Default: + /// Nullable:False + /// + public string FTheoryYield { get; set; } + + /// + /// Desc:品质检验1 + /// Default: + /// Nullable:False + /// + public string FQualityTest1 { get; set; } + + /// + /// Desc:品质检验2 + /// Default: + /// Nullable:False + /// + public string FQualityTest2 { get; set; } + + /// + /// Desc:关联物料代码 + /// Default: + /// Nullable:False + /// + public string FRelationCode { get; set; } + + /// + /// Desc:关联物料名称 + /// Default: + /// Nullable:False + /// + public string FRelationName { get; set; } + + /// + /// Desc:SAP系统代码 + /// Default: + /// Nullable:False + /// + public string FSAPCode { get; set; } + + /// + /// Desc:SAP系统描述 + /// Default: + /// Nullable:False + /// + public string FSAPDescription { get; set; } } } diff --git a/FactorySystemModel/SqlSugarModel/TFS_ViewMaterial.cs b/FactorySystemModel/SqlSugarModel/TFS_ViewMaterial.cs index 65fca13..70a2f23 100644 --- a/FactorySystemModel/SqlSugarModel/TFS_ViewMaterial.cs +++ b/FactorySystemModel/SqlSugarModel/TFS_ViewMaterial.cs @@ -802,5 +802,75 @@ namespace FactorySystemModel.SqlSugarModel /// [SugarColumn(IsIgnore = true)] public int FBomMaterialID { get; set; } + + /// + /// Desc:MRP1.再订货点 + /// Default: + /// Nullable:False + /// + public string FMRP1ReorderLocation { get; set; } + + /// + /// Desc:MRP1.固定批量大小 + /// Default: + /// Nullable:False + /// + public string FMRP1RegularBatchSize { get; set; } + + /// + /// Desc:MRP1.最大库存水平 + /// Default: + /// Nullable:False + /// + public string FMRP1MaxInventorySize { get; set; } + + /// + /// Desc:MRP1.不计算缺料 + /// Default: + /// Nullable:False + /// + public string FMRP1IgnoreLack { get; set; } + + /// + /// Desc:MRP1.压膜 + /// Default: + /// Nullable:False + /// + public string FMRP1laminated { get; set; } + + /// + /// Desc:MRP1.安全库存带小样 + /// Default: + /// Nullable:False + /// + public string FMRP1SafeStock { get; set; } + + /// + /// Desc:MRP1.需求计算不考虑前置物料库存 + /// Default: + /// Nullable:False + /// + public string FMRP1RequireCount { get; set; } + + /// + /// Desc:MRP4.非连续标识 + /// Default: + /// Nullable:False + /// + public string FMRP4DiscontinuousIidentifier { get; set; } + + /// + /// Desc:MRP4.生效期 + /// Default: + /// Nullable:False + /// + public string FMRP4EffectivePeriod { get; set; } + + /// + /// Desc:MRP4.后续的物料 + /// Default: + /// Nullable:False + /// + public string FMRP4FollowMaterial { get; set; } } }