From 67e4690927cc1e15ee4a7ce231a0c87a12553545 Mon Sep 17 00:00:00 2001 From: leo <10200039@qq.com> Date: Sun, 23 Apr 2023 23:49:48 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=A9=E6=96=99=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MaterialTeamworkController.cs | 10 ++++++++++ FactorySystemApi/Controllers/TeamworkController.cs | 6 +++--- FactorySystemBll/MaterialTeamworkBll.cs | 4 ++-- .../ResponseModel/MaterialTeamworkRow.cs | 9 ++++++++- 4 files changed, 23 insertions(+), 6 deletions(-) diff --git a/FactorySystemApi/Controllers/MaterialTeamworkController.cs b/FactorySystemApi/Controllers/MaterialTeamworkController.cs index 07116a3..80ef071 100644 --- a/FactorySystemApi/Controllers/MaterialTeamworkController.cs +++ b/FactorySystemApi/Controllers/MaterialTeamworkController.cs @@ -358,6 +358,11 @@ namespace FactorySystemApi.Controllers viewMaterial.FFactoryCode = teamwork.FCreateFactoryCode; // 工厂Code viewMaterial.FAddDate = DateTime.Now; // 创建日期 viewMaterial.FTeamType = 1; // 路线类型 + viewMaterial.FBaseMaterialDesc = material.FName; // 物料描述 + viewMaterial.FBaseMaterialCode = material.FCode; // 物料号 + viewMaterial.FBaseTestCode = material.FTestCode; // 试验号 + viewMaterial.FBaseMaterialGroup = material.FMaterialGroup; // 物料组 + viewMaterial.FBaseBasicMeter = material.FBaseUnit; // 基本计量 int vmId = MaterialTeamworkBll.InsertMaterialView(viewMaterial); result.Add("ViewId", vmId); @@ -372,6 +377,11 @@ namespace FactorySystemApi.Controllers viewMaterial.FFactoryCode = teamwork.FProdFactoryCode; // 工厂Code viewMaterial.FAddDate = DateTime.Now; // 创建日期 viewMaterial.FTeamType = 1; // 路线类型 + viewMaterial.FBaseMaterialDesc = material.FName; // 物料描述 + viewMaterial.FBaseMaterialCode = material.FCode; // 物料号 + viewMaterial.FBaseTestCode = material.FTestCode; // 试验号 + viewMaterial.FBaseMaterialGroup = material.FMaterialGroup; // 物料组 + viewMaterial.FBaseBasicMeter = material.FBaseUnit; // 基本计量 int prodVmId = MaterialTeamworkBll.InsertMaterialView(viewMaterial); result.Add("ProdViewId", prodVmId); diff --git a/FactorySystemApi/Controllers/TeamworkController.cs b/FactorySystemApi/Controllers/TeamworkController.cs index dd44e73..1611686 100644 --- a/FactorySystemApi/Controllers/TeamworkController.cs +++ b/FactorySystemApi/Controllers/TeamworkController.cs @@ -77,9 +77,9 @@ namespace FactorySystemApi.Controllers return ExceptionHelper.TryReturnException(() => { //对接获取 - //inParam.Add("FMdmCode", GetMdmCode(inParam)); - var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0); - inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0")); + inParam.Add("FMdmCode", GetMdmCode(inParam)); + //var ts = DateTime.UtcNow - new DateTime(1970, 1, 1, 0, 0, 0, 0); + //inParam.Add("FMdmCode", ts.TotalSeconds.ToString("F0")); if (!inParam.ContainsKey("FMdmCode") || string.IsNullOrEmpty(inParam["FMdmCode"].ToString().Trim())) { apiResult.Error("获取MDM失败"); diff --git a/FactorySystemBll/MaterialTeamworkBll.cs b/FactorySystemBll/MaterialTeamworkBll.cs index 473539f..6d7a223 100644 --- a/FactorySystemBll/MaterialTeamworkBll.cs +++ b/FactorySystemBll/MaterialTeamworkBll.cs @@ -22,7 +22,7 @@ namespace FactorySystemBll { totalNumber = 0; var db = AppSettingsHelper.GetSqlSugar(); - return db.Queryable((a, b) => new JoinQueryInfos(JoinType.Left, a.FAddUser == b.FID)) + return db.Queryable((a, b, c) => new JoinQueryInfos(JoinType.Left, a.FAddUser == b.FID, JoinType.Left, a.FCreateFactoryID == c.FID)) // 事项状态 .WhereIF(mtq.FState > 0 && mtq.FState != 99, a => a.FState == mtq.FState) // 物料号 @@ -36,7 +36,7 @@ namespace FactorySystemBll //.WhereIF(mtq.FUserID != null, (a, b) => (',' + a.FUserID + ',').Contains(',' + mtq.FUserID + ',') || a.FAddUser.Equals(mtq.FUserID)) //// 协同 //.WhereIF(mtq.FMaterialTeamID > 0, (a, b) => a.FMaterialTeamID == mtq.FMaterialTeamID).OrderBy((a, b) => a.FID, OrderByType.Desc) - .Select("a.* ,b.FName as FAddUserName").OrderBy((a) => a.FID, OrderByType.Desc) + .Select("a.* ,c.FName as FCreateFactoryName, b.FName as FAddUserName").OrderBy((a) => a.FID, OrderByType.Desc) .ToPageList(mtq.FPageIndex, mtq.FPageSize, ref totalNumber); } diff --git a/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs b/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs index df901f0..c67fc8f 100644 --- a/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs +++ b/FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs @@ -4,10 +4,17 @@ namespace FactorySystemModel.ResponseModel { public class MaterialTeamworkRow : TFS_FMaterialTeamwork { + /// + /// Desc:模式名称 + /// Default: + /// Nullable: + /// + public string FCreateFactoryName { get; set; } + /// /// Desc:发起人 /// Default: - /// Nullable:False + /// Nullable: /// public string FAddUserName { get; set; } }