修改物料新增相关问题

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);

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失败");

FactorySystemBll/MaterialTeamworkBll.cs

@@ -22,7 +22,7 @@ namespace FactorySystemBll
         {
             totalNumber = 0;
             var db = AppSettingsHelper.GetSqlSugar();
-            return db.Queryable<TFS_FMaterialTeamwork, TUser>((a, b) => new JoinQueryInfos(JoinType.Left, a.FAddUser == b.FID))
+            return db.Queryable<TFS_FMaterialTeamwork, TUser, TFS_Factory>((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<MaterialTeamworkRow>("a.* ,b.FName as FAddUserName").OrderBy((a) => a.FID, OrderByType.Desc)
+                .Select<MaterialTeamworkRow>("a.* ,c.FName as FCreateFactoryName, b.FName as FAddUserName").OrderBy((a) => a.FID, OrderByType.Desc)
                 .ToPageList(mtq.FPageIndex, mtq.FPageSize, ref totalNumber);
         }
 

FactorySystemModel/ResponseModel/MaterialTeamworkRow.cs

@@ -4,10 +4,17 @@ namespace FactorySystemModel.ResponseModel
 {
     public class MaterialTeamworkRow : TFS_FMaterialTeamwork
     {
+        /// <summary>
+        /// Desc:模式名称
+        /// Default:
+        /// Nullable:
+        /// </summary>  
+        public string FCreateFactoryName { get; set; }
+
         /// <summary>
         /// Desc:发起人
         /// Default:
-        /// Nullable:False
+        /// Nullable:
         /// </summary>  
         public string FAddUserName { get; set; }
     }