更新交验单导入功能

ZrAdminNetCore-net7.0/ZR.Admin.WebApi/Controllers/Inspect/SapDeliverRecordController.cs

@@ -13,6 +13,8 @@ using ZR.Service.Business;
 using ZR.Service.Business.IBusinessService.Inspect;
 using ZR.Model.Dto.Inspect;
 using ZR.Model.Models.Inspect;
+using System.ComponentModel.DataAnnotations;
+using AspectCore.DynamicProxy.Parameters;
 
 namespace ZR.Admin.WebApi.Controllers.Inspect
 {
@@ -126,31 +128,33 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// 导入
         /// </summary>
         /// <param name="formFile">使用IFromFile必须使用name属性否则获取不到文件</param>
+        /// <param name="category"></param>
         /// <returns></returns>
         [HttpPost("importData")]
         [Log(Title = "交验单导入", BusinessType = BusinessType.IMPORT, IsSaveRequestData = false, IsSaveResponseData = false)]
         [ActionPermissionFilter(Permission = "business:sapdeliverrecord:import")]
-        public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
+        public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile, [FromForm(Name = "category")] string category)
         {
             List<dynamic>? list = new();
             //读取上传文件内容。
             using (var stream = formFile.OpenReadStream())
             {
+                var SheetNames = stream.GetSheetNames();
                 //list = stream.Query<SapDeliverRecord>(startCell:"A6").ToList();
-                list = stream.Query().ToList();
+                //list = stream.Query(sheetName:"Sheet2").ToList();
+                list = stream.Query(sheetName: SheetNames[1]).ToList();
 
-                //var test= stream.Query(sheetName:"sheet1");
             }
-            string deliverNo = list[2].M;
-            if (string.IsNullOrEmpty(deliverNo))
-            {
-                return SUCCESS("未找到交验单编号，导入文件格式错误");
-            }
-            deliverNo = deliverNo.Replace("编号", "").Replace("：", "").Replace(":", "");
-            string checkName = list[3].A;
-            checkName = string.IsNullOrEmpty(checkName) ? "" : checkName.Replace("送检人员", "").Replace("：", "").Replace(":", "");
+            //string deliverNo = list[2].M;
+            //if (string.IsNullOrEmpty(deliverNo))
+            //{
+            //    return SUCCESS("未找到交验单编号，导入文件格式错误");
+            //}
+            //deliverNo = deliverNo.Replace("编号", "").Replace("：", "").Replace(":", "");
+            //string checkName = list[3].A;
+            //checkName = string.IsNullOrEmpty(checkName) ? "" : checkName.Replace("送检人员", "").Replace("：", "").Replace(":", "");
             List<SapDeliverRecord> sapDeliverRecords = new();
-            for (int i = 6; i < list.Count; i++)
+            for (int i = 1; i < list.Count; i++)
             {
                 if (string.IsNullOrEmpty($"{list[i].A}"))
                 {
@@ -158,19 +162,20 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
                 }
                 SapDeliverRecord sapDeliverRecord = new()
                 {
-                    DeliverNo = deliverNo,
-                    CheckName = checkName,
-                    BomNo = list[i].B,
+                    DeliverNo = list[i].C,
+                    CheckName = list[i].AG,
+                    BomNo = list[i].O,
                     RowNo = Convert.ToInt32(list[i].D),
-                    MaterialCode = $"MAT{list[i].F}",//非空 模拟数据
-                    MaterialName = list[i].E,
-                    MaterialSpec = list[i].F,
-                    Category = i % 2 > 0 ? "外协件" : "外购件",//非空 模拟数据
+                    PurchaseOrder = list[i].P.ToString(),
+                    MaterialCode = $"MAT{list[i].T}",//非空 模拟数据（交验单中没有这个编码，要自己规范一个吗？
+                    MaterialName = list[i].S,
+                    MaterialSpec = list[i].T,
+                    Category = category,
                     KeyFlag = i % 2 > 0,//非空 模拟数据
-                    Qty = Convert.ToInt32(list[i].H),
-                    SpotCheckQty = Convert.ToInt32(list[i].I),
-                    CheckQty = Convert.ToInt32(list[i].M),
-                    CheckResult = "OK",//非空 模拟数据
+                    Qty = Convert.ToInt32(list[i].V),
+                    SpotCheckQty = Convert.ToInt32(list[i].X),
+                    CheckQty = Convert.ToInt32(list[i].AB),
+                    CheckResult = list[i].X > 0 ? ((list[i].AB < list[i].X) ? (list[i].AB > 0 ? "PartOK" : "NG") : "OK") : "Wait",//计算质检结果，抽检数量为0是未质检Wait，合格数为0则NG，大于零小于抽检数则PartOK，合格数量等于抽检数量则全合格OK
                     InstoreResult = 99,//非空 模拟数据
 
                     CreateBy = HttpContext.GetName(),
@@ -182,7 +187,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             string msg = _SapDeliverRecordService.ImportDatas(sapDeliverRecords);
 
             //TODO 业务逻辑,自行插入数据到db
-            return SUCCESS(list);
+            return SUCCESS(sapDeliverRecords);
         }
 
         /// <summary>

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

@@ -563,9 +563,14 @@
             交验单号 
             </summary>
         </member>
+        <member name="P:ZR.Model.Models.Inspect.SapDeliverRecord.PurchaseOrder">
+            <summary>
+            采购订单
+            </summary>
+        </member>
         <member name="P:ZR.Model.Models.Inspect.SapDeliverRecord.CheckName">
             <summary>
-            送检人员 
+            检验人员 
             </summary>
         </member>
         <member name="P:ZR.Model.Models.Inspect.SapDeliverRecord.BomNo">

ZrAdminNetCore-net7.0/ZR.Model/Dto/Inspect/SapDeliverRecordDto.cs

@@ -17,6 +17,8 @@ namespace ZR.Model.Dto.Inspect
         public string MaterialCode { get; set; }
         //物料类型
         public string Category { get; set; }
+        //质检结果
+        public string CheckResult { get; set; }
         //规格型号
         public string MaterialSpec { get; set; }
         //关键件标识

ZrAdminNetCore-net7.0/ZR.Model/Models/Inspect/SapDeliverRecord.cs

@@ -23,9 +23,12 @@ namespace ZR.Model.Models.Inspect
         /// 交验单号 
         /// </summary>
         public string DeliverNo { get; set; }
-
         /// <summary>
-        /// 送检人员 
+        /// 采购订单
+        /// </summary>
+        public string PurchaseOrder { get; set; }
+        /// <summary>
+        /// 检验人员 
         /// </summary>
         public string CheckName { get; set; }
 

ZrAdminNetCore-net7.0/ZR.Service/Business/Inspect/SapDeliverRecordService.cs

@@ -46,6 +46,7 @@ namespace ZR.Service.Business.Inspect
             predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialName), d => d.MaterialName.Contains(parm.MaterialName));
             predicate.AndIF(!string.IsNullOrEmpty(parm.MaterialSpec), d => d.MaterialSpec.Contains(parm.MaterialSpec));
             predicate.AndIF(!string.IsNullOrEmpty(parm.Category), d => d.Category == parm.Category);
+            predicate.AndIF(!string.IsNullOrEmpty(parm.CheckResult), d => d.CheckResult == parm.CheckResult);
             predicate.AndIF(parm.KeyFlag != null, d => d.KeyFlag == parm.KeyFlag);
             //搜索条件查询语法参考Sqlsugar
             var response = Queryable()