出库任务单增加关键件标识

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/OutStore/SapOutTaskRecordController.cs

@@ -203,7 +203,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             List<SapOutTaskRecord> sapOutTaskRecords = new();
             //实例化交验单表对象
             //定义要获取的列头
-            string[] myColHeader = { "领料单号", "WBS元素", "物料", "材料名称", "规格型号", "计量单位", "数量" };
+            string[] myColHeader = { "领料单号", "WBS元素", "物料", "材料名称", "规格型号", "计量单位","关键件标识", "数量" };
             for (int i = 1; i < dataSet.Tables[0].Rows.Count; i++)
             //去除第一行标题行
             {
@@ -217,12 +217,18 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
                     {
                         if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
                         {
-                            if (str == "计量单位")
+                            switch (str)
                             {
-                                sapOutTaskRecord.Unit = dataSet.Tables[0].Rows[i][index].ToString().Trim();
+                                case "计量单位":
+                                    sapOutTaskRecord.Unit = dataSet.Tables[0].Rows[i][index].ToString().Trim();
+                                    break;
+                                case "关键件标识":
+                                    sapOutTaskRecord.KeyFlag = false;
+                                    break;
+                                default:
+                                    return SUCCESS($"导入失败。<br/><br/>sheet2第{i}行{str}内容为空。");
                             }
-                            else
-                                return SUCCESS($"导入失败。<br/><br/>sheet2第{i}行{str}内容为空。");
+                                
                         }
                         else
                         {
@@ -234,6 +240,9 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
                                 case "WBS元素":
                                     sapOutTaskRecord.BomNo = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
                                     break;
+                                case "关键件标识":
+                                    sapOutTaskRecord.KeyFlag = true;
+                                    break;
                                 case "物料":
                                     sapOutTaskRecord.MaterialCode = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
                                     break;

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/ZRModel.xml

@@ -1191,6 +1191,11 @@
             规格型号/图号 
             </summary>
         </member>
+        <member name="P:ZR.Model.Models.SapOutTaskRecord.KeyFlag">
+            <summary>
+            关键件标识（0非关键件，1关键件） 
+            </summary>
+        </member>
         <member name="P:ZR.Model.Models.SapOutTaskRecord.Qty">
             <summary>
             出库需求数量 

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/appsettings.json

@@ -7,8 +7,8 @@
     }
   },
   "ConnectionStrings": {
-    //"conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
-    "conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    "conn_db": "Data Source=localhost;port=3306;User ID=sa;Password=sa123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
+    //"conn_db": "Data Source=39.106.7.239;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     //"conn_db": "Data Source=192.168.0.1;port=3306;User ID=sa;Password=123456;Database=mytest_db;CharSet=utf8;sslmode=none;",
     "conn_db_type": "0" //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3
   },

ZrAdminNetCore-net7.0/ZR.Model/Dto/OutStore/SapOutTaskRecordDto.cs

@@ -21,6 +21,9 @@ namespace ZR.Model.Dto.OutStore
         public string MaterialSpec { get; set; }
         //    物料类型？好像业务不关注
         public string Category { get; set; }
+        //关键件标识
+        public bool? KeyFlag { get; set; }
+
         //    出库任务单号
         public string OutTaskNo { get; set; }
         //    创建时间
@@ -74,6 +77,9 @@ namespace ZR.Model.Dto.OutStore
         [Required(ErrorMessage = "规格型号/图号不能为空")]
         public string MaterialSpec { get; set; }
 
+        [Required(ErrorMessage = "关键件标识不能为空")]
+        public bool KeyFlag { get; set; }
+
         [Required(ErrorMessage = "出库需求数量不能为空")]
         public int Qty { get; set; }
 
@@ -81,7 +87,7 @@ namespace ZR.Model.Dto.OutStore
 
         [Required(ErrorMessage = "出库结果。0：未出库；99：出库完成；不能为空")]
         public int Result { get; set; }
-        
+
         public string Unit { get; set; }
 
         public string CreateBy { get; set; }

ZrAdminNetCore-net7.0/ZR.Model/Models/OutStore/SapOutTaskRecord.cs

@@ -11,7 +11,7 @@ namespace ZR.Model.Models
     /// @date 2023-05-10
     /// </summary>
     [SugarTable("sap_out_task_record")]
-    public class SapOutTaskRecord:BusinessBase
+    public class SapOutTaskRecord : BusinessBase
     {
         /// <summary>
         /// 主键ID 
@@ -48,6 +48,10 @@ namespace ZR.Model.Models
         /// 规格型号/图号 
         /// </summary>
         public string MaterialSpec { get; set; }
+        /// <summary>
+        /// 关键件标识（0非关键件，1关键件） 
+        /// </summary>
+        public bool KeyFlag { get; set; }
 
         /// <summary>
         /// 出库需求数量