563565

ZR.Admin.WebApi/Controllers/mes/md/MdProductDefineController.cs

@@ -10,6 +10,7 @@ using ZR.Model.mes.md;
 using ZR.Model.mes.md.DTO;
 using ZR.Service.mes.md;
 using ZR.Service.mes.md.IService;
+using static System.Runtime.InteropServices.JavaScript.JSType;
 
 namespace ZR.Admin.WebApi.Controllers.mes.md
 {
@@ -79,6 +80,10 @@ namespace ZR.Admin.WebApi.Controllers.mes.md
         [HttpPost("addProductDefine")]
         public IActionResult addProductDefine([FromBody] MdProductDefine products)
         {
+            if (products == null)
+            {
+                return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
+            }
             if (products != null)
             {
                 products.ToCreate(HttpContext);

ZR.Admin.WebApi/ZR.Admin.WebApi.csproj

@@ -30,6 +30,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<Folder Include="Images\" />
 		<Folder Include="Properties\PublishProfiles\" />
 	</ItemGroup>
 

ZR.Model/mes/md/MdProductDefine.cs

@@ -35,17 +35,11 @@ namespace ZR.Model.mes.md
         public string ProductUnitName { get; set; }
 
         /// <summary>
-        /// 工艺路线code 
+        /// 产线json
         ///</summary>
-        [SugarColumn(ColumnName="processRoute_code"    )]
+        [SugarColumn(ColumnName= "worklineArray")]
-         public string ProcessrouteCode { get; set; }
+         public string WorklineArray { get; set; }
-        [SugarColumn(IsIgnore = true)]
+       
-        public string ProcessrouteCodeName { get; set; }
-        /// <summary>
-        /// 工艺路线 
-        ///</summary>
-        [SugarColumn(ColumnName="processRoute_name"    )]
-        public string ProcessrouteName { get; set; }
         /// <summary>
         /// 预留字段1 
         ///</summary>

ZR.Service/mes/md/MdProductDefineService.cs

@@ -1,6 +1,7 @@
 using Infrastructure.Attribute;
 using Infrastructure.Extensions;
 using JinianNet.JNTemplate;
+using Microsoft.AspNetCore.Mvc.Formatters.Xml;
 using Microsoft.Extensions.DependencyInjection;
 using SqlSugar;
 using System;
@@ -84,6 +85,7 @@ namespace ZR.Service.mes.md
             return Context.Queryable<MdUnit>().ToList();
         }
 
+        
         public List<MdWorkline> GetWorklineList()
         {
             return Context.Queryable<MdWorkline>().ToList();