Merge branch 'master' of http://39.106.7.239:3000/admin_Syl/TFT_WmsBackEnd

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

@@ -77,7 +77,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
         /// <returns></returns>
         [HttpPost]
         [ActionPermissionFilter(Permission = "business:sapdeliverrecord:add")]
-         [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.INSERT)]
+        [Log(Title = "接口管理/SAP交验单记录表", BusinessType = BusinessType.INSERT)]
         public IActionResult AddSapDeliverRecord([FromBody] SapDeliverRecordDto parm)
         {
             if (parm == null)
@@ -147,15 +147,22 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             {
                 return SUCCESS("导入失败。<br/><br/>导入交验单文件错误。文件不是xls文件也不是xlsx文件。");
             }
-            //if (!dataSet.Tables[0].Rows[0][0].ToString().Contains("北京七星华创"))
-            //{
-            //    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[0].TableName}】中<br/>表头为：{dataSet.Tables[0].Rows[0][0]}<br/>请确认文件无误。");
-            //}
+            //获取列头
+            Dictionary<string, int> colHeaders = new();
+            for (int j = 0; j < dataSet.Tables[1].Columns.Count; j++)
+            {
+                string colHeader = dataSet.Tables[1].Rows[0][j].ToString().Trim();
+                colHeaders.TryAdd(colHeader, j);
+            }
             //通过交验单号，验证是否以存在交验单
-            string checkDeliverNo = dataSet.Tables[1].Rows[1][2].ToString().Trim();
+            if (!colHeaders.TryGetValue("CHKNO", out int colHead_chkNo))
+            {
+                return SUCCESS($"导入失败。<br/>未找到交验单号，请确认文件无误。");
+            }
+            string checkDeliverNo = dataSet.Tables[1].Rows[1][colHead_chkNo].ToString().Trim();
             if (string.IsNullOrEmpty(checkDeliverNo))
             {
-                return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中<br/>C列交验单号有误。");
+                return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中<br/>第{colHead_chkNo}列交验单号有误。");
             }
             var response = _SapDeliverRecordService.GetList(
                 new SapDeliverRecordQueryDto { DeliverNo = checkDeliverNo });
@@ -168,6 +175,8 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             //var SheetNames = stream.GetSheetNames();
             //list = stream.Query(sheetName: SheetNames[1]).ToList();
 
+            //定义要获取的列头
+            string[] myColHeader = { "CHKNO","ERNAM", "ITMNO", "PSPID", "EBELN", "MATNR", "MAKTX", "TXZ01", "MENGE", "CHKNG" ,"ZPPIMPLV"};
 
             List<SapDeliverRecord> sapDeliverRecords = new();
             //实例化交验单表对象
@@ -176,74 +185,80 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             {
                 //row中空单元格会转化为空字符串而不是null
                 SapDeliverRecord sapDeliverRecord = new();
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][2].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行C列，交验单编号有误。");
-                }
-                else
-                    sapDeliverRecord.DeliverNo = dataSet.Tables[1].Rows[i][2].ToString().Trim();//*
-                sapDeliverRecord.CheckName = dataSet.Tables[1].Rows[i][32].ToString().Trim();
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][14]!.ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行O列，生产令号有误。");
-                }
-                else
-                    sapDeliverRecord.BomNo = dataSet.Tables[1].Rows[i][14].ToString().Trim();//*
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][3].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行D列，行项目有误。");
-                }
-                else
-                    sapDeliverRecord.RowNo = Convert.ToInt32(dataSet.Tables[1].Rows[i][3]);//*
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][15].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行P列，采购订单号有误。");
-                }
-                else
-                    sapDeliverRecord.PurchaseOrder = dataSet.Tables[1].Rows[i][15].ToString().Trim();//*
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][17].ToString().Trim()))
+                foreach (string str in myColHeader)
                 {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行R列，物料编码有误。");
+                    int index = -1;
+                    if (colHeaders.TryGetValue(str,out index))
+                        {
+                        if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][index].ToString().Trim()))
+                        {
+                            if (str == "ERNAM")
+                            {
+                                sapDeliverRecord.CheckName = dataSet.Tables[1].Rows[i][index].ToString().Trim();
+                            }
+                            else if (str == "PSPID")
+                            {
+                                sapDeliverRecord.BomNo = dataSet.Tables[1].Rows[i][index].ToString().Trim();
+                            }
+                            else if (str == "ZPPIMPLV")
+                            {
+                                
+                                sapDeliverRecord.KeyFlag = false;//*
+                            }
+                            else
+                            {
+                                return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】第{i}行{index}列，{str}内容有误。");
+                            }
+                        }
+                        else
+                        {
+                            switch (str)
+                            {
+                                case "CHKNO":
+                                    sapDeliverRecord.DeliverNo = dataSet.Tables[1].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "ERNAM":
+                                    sapDeliverRecord.CheckName = dataSet.Tables[1].Rows[i][index].ToString().Trim();
+                                    break;
+                                case "ITMNO":
+                                    sapDeliverRecord.RowNo = Convert.ToInt32(dataSet.Tables[1].Rows[i][index]);//*
+                                    break;
+                                case "PSPID":
+                                    sapDeliverRecord.BomNo = dataSet.Tables[1].Rows[i][index].ToString().Trim();
+                                    break;
+                                case "EBELN":
+                                    sapDeliverRecord.PurchaseOrder = dataSet.Tables[1].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "MATNR":
+                                    sapDeliverRecord.MaterialCode = dataSet.Tables[1].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "MAKTX":
+                                    sapDeliverRecord.MaterialName = dataSet.Tables[1].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "TXZ01":
+                                    sapDeliverRecord.MaterialSpec = dataSet.Tables[1].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "MENGE":
+                                    sapDeliverRecord.Qty = Convert.ToInt32(dataSet.Tables[1].Rows[i][index]);//*
+                                    break;
+                                case "CHKNG":
+                                    sapDeliverRecord.SpotCheckQty = Convert.ToInt32(dataSet.Tables[1].Rows[i][index]);//*
+                                    break;
+                                case "ZPPIMPLV":
+                                    sapDeliverRecord.KeyFlag = true;//*
+                                    break;
+                                default:
+                                    break;
+                            }
+                        }
+                    }
                 }
-                else
-                    sapDeliverRecord.MaterialCode = dataSet.Tables[1].Rows[i][17].ToString().Trim();//*
-
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][18].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行S列，物料名称有误。");
-                }
-                else
-                    sapDeliverRecord.MaterialName = dataSet.Tables[1].Rows[i][18].ToString().Trim();//*
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][19].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行T列，规格型号/图号有误。");
-                }
-                else
-                    sapDeliverRecord.MaterialSpec = dataSet.Tables[1].Rows[i][19].ToString().Trim();//*
 
                 sapDeliverRecord.Category = category;//*
-                if (category == "外协件")//所有外协件默认都是关键件
-                {
-                    sapDeliverRecord.KeyFlag = true;//*//非空
-
-                }
-                else 
-                {
-                    sapDeliverRecord.KeyFlag = true;//此处应读取交验单中的关键件列数据。
-                }
-
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][21].ToString().Trim()))
-                {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行V列，物料数量有误。");
-                }
-                else
-                    sapDeliverRecord.Qty = Convert.ToInt32(dataSet.Tables[1].Rows[i][21]);//*
-                if (string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][23].ToString().Trim()))
+                if (category == "外购件"&&!sapDeliverRecord.KeyFlag)//外购件，且非关键件则不导入，跳过
                 {
-                    return SUCCESS($"导入失败。<br/><br/>导入Excel的【{dataSet.Tables[1].TableName}】中{i + 1}行X列，抽检数量有误。");
+                    continue;
                 }
-                else
-                    sapDeliverRecord.SpotCheckQty = Convert.ToInt32(dataSet.Tables[1].Rows[i][23]);//*
 
                 //sapDeliverRecord.CheckQty = string.IsNullOrEmpty(dataSet.Tables[1].Rows[i][27].ToString().Trim()) ? 0 : Convert.ToInt32(dataSet.Tables[1].Rows[i][27].ToString().Trim());
                 //sapDeliverRecord.InstoreResult = 99;//*//非空 模拟数据
@@ -300,7 +315,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             string msg = _SapDeliverRecordService.ImportDatas(sapDeliverRecords);
 
             //TODO 业务逻辑,自行插入数据到db
-            return SUCCESS("交验单导入成功！");
+            return SUCCESS(msg);
         }
 
         /// <summary>
@@ -353,7 +368,7 @@ namespace ZR.Admin.WebApi.Controllers.Inspect
             return SUCCESS(response);
         }
         [HttpGet("GetSapDeliverRecordSumList")]
-        public IActionResult  GetSapDeliverRecordSumList([FromQuery] SapDeliverRecordSumQueryDto parm)
+        public IActionResult GetSapDeliverRecordSumList([FromQuery] SapDeliverRecordSumQueryDto parm)
         {
             var response = _SapDeliverRecordService.GetSapDeliverRecordSumList(parm);
             return SUCCESS(response);

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

@@ -13,6 +13,7 @@ using ZR.Service.Business.IBusinessService.OutStore;
 using ZR.Model.Dto.OutStore;
 using ZR.Model.Models.OutStore;
 using ZR.Service.Business.OutStore;
+using System.Data;
 
 namespace ZR.Admin.WebApi.Controllers.OutStore
 {
@@ -132,24 +133,31 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
         [ActionPermissionFilter(Permission = "business:sapbomrecord:import")]
         public IActionResult ImportData([FromForm(Name = "file")] IFormFile formFile)
         {
-            List<dynamic>? list = new();
-            //读取上传文件内容。
-            using (var stream = formFile.OpenReadStream())
-            {
-                list = stream.Query().ToList();
-            }
-            string bomNo = list[2].H;
+            DataSet dataSet = ExcelReader.ReadExcel(formFile);
+
+            //List<dynamic>? list = new();
+            ////读取上传文件内容。
+            //using (var stream = formFile.OpenReadStream())
+            //{
+            //    list = stream.Query().ToList();
+            //}
+            //string bomNo = list[2].H;
+            string bomNo = dataSet.Tables[0].Rows[2][7].ToString().Trim();//H
             if (string.IsNullOrEmpty(bomNo))
             {
                 return SUCCESS("未找到生产令号，导入文件格式错误");
             }
-            string equipmentName = list[2].D;
-            string makeBy = list[3].D;
-            DateTime makeTime = list[3].H;
+            //string equipmentName = list[2].D;
+            //string makeBy = list[3].D;
+            //DateTime makeTime = list[3].H;
+            string equipmentName = dataSet.Tables[0].Rows[2][3].ToString().Trim();
+            string makeBy = dataSet.Tables[0].Rows[3][3].ToString().Trim();
+            DateTime makeTime = (DateTime)dataSet.Tables[0].Rows[3][7];
+
             List<SapBomRecord> sapBomRecords = new();
-            for (int i = 5; i < list.Count; i++)
+            for (int i = 5; i < dataSet.Tables[0].Rows.Count;i++)
             {
-                if (string.IsNullOrEmpty($"{list[i].B}"))
+                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][1].ToString().Trim()))
                 {
                     break;//序号一列出现空，即表单内容结束
                 }
@@ -159,26 +167,58 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
                     EquipmentName = equipmentName,
                     MakeBy = makeBy,
                     MakeTime = makeTime,
-                    Category = list[i].C,
-                    MaterialCode = list[i].D,
-                    MaterialName = list[i].E,
-                    MaterialSpec = list[i].F,
+                    Category = dataSet.Tables[0].Rows[i][2].ToString().Trim(),
+                    MaterialCode = dataSet.Tables[0].Rows[i][3].ToString().Trim(),
+                    MaterialName = dataSet.Tables[0].Rows[i][4].ToString().Trim(),
+                    MaterialSpec = dataSet.Tables[0].Rows[i][5].ToString().Trim(),
                     KeyFlag = true,
-                    Qty = Convert.ToInt32(list[i].H),
+                    Qty = Convert.ToInt32(dataSet.Tables[0].Rows[i][7]),
                     AssembleQty = 0,
                     Result = 0,
 
                     CreateBy = HttpContext.GetName(),
                     CreateTime = DateTime.Now,
+                    UpdateBy = HttpContext.GetName(),
+                    UpdateTime = DateTime.Now,
                     Remark = "导入数据"
                 };
                 sapBomRecord.Category = sapBomRecord.Category.Contains("外购件") ? "外购件" : "外协件";
                 sapBomRecords.Add(sapBomRecord);
+
             }
+            //miniExcel不支持xls,弃用
+            //for (int i = 5; i < list.Count; i++)
+            //{
+            //    if (string.IsNullOrEmpty($"{list[i].B}"))
+            //    {
+            //        break;//序号一列出现空，即表单内容结束
+            //    }
+            //    SapBomRecord sapBomRecord = new()
+            //    {
+            //        BomNo = bomNo,
+            //        EquipmentName = equipmentName,
+            //        MakeBy = makeBy,
+            //        MakeTime = makeTime,
+            //        Category = list[i].C,
+            //        MaterialCode = list[i].D,
+            //        MaterialName = list[i].E,
+            //        MaterialSpec = list[i].F,
+            //        KeyFlag = true,
+            //        Qty = Convert.ToInt32(list[i].H),
+            //        AssembleQty = 0,
+            //        Result = 0,
+
+            //        CreateBy = HttpContext.GetName(),
+            //        CreateTime = DateTime.Now,
+            //        Remark = "导入数据"
+            //    };
+            //    sapBomRecord.Category = sapBomRecord.Category.Contains("外购件") ? "外购件" : "外协件";
+            //    sapBomRecords.Add(sapBomRecord);
+            //}
             string msg = _SapBomRecordService.ImportDatas(sapBomRecords);
 
             //TODO 业务逻辑,自行插入数据到db
-            return SUCCESS(list);
+            return SUCCESS(msg);
         }
 
         #region 2023 0524 孙亚龙 新增

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

@@ -174,16 +174,24 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             {
                 return SUCCESS("导入失败。<br/><br/>导入错误。文件不是xls文件也不是xlsx文件。");
             }
+            //获取列头
+            Dictionary<string, int> colHeaders = new();
+            for (int j = 0; j < dataSet.Tables[0].Columns.Count; j++)
+            {
+                string colHeader = dataSet.Tables[0].Rows[0][j].ToString().Trim();
+                colHeaders.TryAdd(colHeader, j);
+            }
+
             //简单验证表格式
-            if (!dataSet.Tables[0].Rows[0][1].ToString().Contains("领料单号"))
+            if (!colHeaders.TryGetValue("领料单号", out int colHead_outTaskNo))
             {
-                return SUCCESS($"导入失败。<br/>请确认文件无误。");
+                return SUCCESS($"导入失败。<br/>未找到领料单号，请确认文件无误。");
             }
             //通过领料单号，验证是否已存在出库任务单
-            string checkOutTaskNo = dataSet.Tables[0].Rows[1][1].ToString().Trim();
+            string checkOutTaskNo = dataSet.Tables[0].Rows[1][colHead_outTaskNo].ToString().Trim();
             if (string.IsNullOrEmpty(checkOutTaskNo))
             {
-                return SUCCESS($"导入失败。<br/>B列出库任务单号有误。");
+                return SUCCESS($"导入失败。<br/>第1行领料单号有误。");
             }
             var response = _SapOutTaskRecordService.GetList(
                 new SapOutTaskRecordQueryDto { OutTaskNo = checkOutTaskNo });
@@ -194,15 +202,8 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
 
             List<SapOutTaskRecord> sapOutTaskRecords = new();
             //实例化交验单表对象
-            //获取列头
-            Dictionary<string, int> colHeaders = new();
-            for (int j = 0; j < dataSet.Tables[0].Columns.Count; j++)
-            {
-                string colHeader = dataSet.Tables[0].Rows[0][j].ToString().Trim();
-                colHeaders.TryAdd(colHeader, j);
-            }
             //定义要获取的列头
-            string[] myColHeader = {"领料单号","WBS元素","物料","材料名称","规格型号", "计量单位", "数量"};
+            string[] myColHeader = { "领料单号", "WBS元素", "物料", "材料名称", "规格型号", "计量单位", "数量" };
             for (int i = 1; i < dataSet.Tables[0].Rows.Count; i++)
             //去除第一行标题行
             {
@@ -212,82 +213,46 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
                 foreach (string str in myColHeader)
                 {
                     int index = -1;
-                    switch (str)
+                    if (colHeaders.TryGetValue(str, out index))
                     {
-                        case "领料单号":
-                            if (colHeaders.TryGetValue("领料单号", out index))
+                        if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
+                        {
+                            if (str == "计量单位")
                             {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>领料单号有误。");
-                                }
-                                else
-                                    sapOutTaskRecord.OutTaskNo = dataSet.Tables[0].Rows[i][index].ToString().Trim();
+                                sapOutTaskRecord.Unit = dataSet.Tables[0].Rows[i][index].ToString().Trim();
                             }
-                            break;
-                        case "WBS元素":
-                            if (colHeaders.TryGetValue("WBS元素", out index))
+                            else
+                                return SUCCESS($"导入失败。<br/><br/>sheet2第{i}行{str}内容为空。");
+                        }
+                        else
+                        {
+                            switch (str)
                             {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index]!.ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>WBS元素有误。");
-                                }
-                                else
+                                case "领料单号":
+                                    sapOutTaskRecord.OutTaskNo = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
+                                    break;
+                                case "WBS元素":
                                     sapOutTaskRecord.BomNo = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
-                            }
-                            break;
-                        case "物料":
-                            if (colHeaders.TryGetValue("物料", out index))
-                            {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>物料(编码)有误。");
-                                }
-                                else
+                                    break;
+                                case "物料":
                                     sapOutTaskRecord.MaterialCode = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
-                            }
-                            break;
-                        case "材料名称":
-                            if (colHeaders.TryGetValue("材料名称", out index))
-                            {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>材料名称有误。");
-                                }
-                                else
+                                    break;
+                                case "材料名称":
                                     sapOutTaskRecord.MaterialName = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
-                            }
-                            break;
-                        case "规格型号":
-                            if (colHeaders.TryGetValue("规格型号", out index))
-                            {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>规格型号/图号有误。");
-                                }
-                                else
+                                    break;
+                                case "规格型号":
                                     sapOutTaskRecord.MaterialSpec = dataSet.Tables[0].Rows[i][index].ToString().Trim();//*
-                            }
-                            break;
-                        case "计量单位":
-                            if (colHeaders.TryGetValue("计量单位", out index))
-                            {
-                                sapOutTaskRecord.Unit = dataSet.Tables[0].Rows[i][index].ToString().Trim();
-                            }
-                            break;
-                        case "数量":
-                            if (colHeaders.TryGetValue("数量", out index))
-                            {
-                                if (string.IsNullOrEmpty(dataSet.Tables[0].Rows[i][index].ToString().Trim()))
-                                {
-                                    return SUCCESS($"导入失败。<br/><br/>物料数量有误。");
-                                }
-                                else
+                                    break;
+                                case "计量单位":
+                                    sapOutTaskRecord.Unit = dataSet.Tables[0].Rows[i][index].ToString().Trim();
+                                    break;
+                                case "数量":
                                     sapOutTaskRecord.Qty = Convert.ToInt32(dataSet.Tables[0].Rows[i][index]);//*
+                                    break;
+                                default:
+                                    break;
                             }
-                            break;
-                        default:
-                            break;
+                        }
                     }
                 }
                 sapOutTaskRecord.Category = "";//暂时没用，给个空字符串
@@ -296,6 +261,8 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
 
                 sapOutTaskRecord.CreateBy = HttpContext.GetName();
                 sapOutTaskRecord.CreateTime = DateTime.Now;
+                sapOutTaskRecord.UpdateBy = HttpContext.GetName();
+                sapOutTaskRecord.UpdateTime = DateTime.Now;
                 sapOutTaskRecord.Remark = "导入数据";
                 sapOutTaskRecords.Add(sapOutTaskRecord);
 
@@ -304,7 +271,7 @@ namespace ZR.Admin.WebApi.Controllers.OutStore
             string msg = _SapOutTaskRecordService.ImportDatas(sapOutTaskRecords);
 
             //TODO 业务逻辑,自行插入数据到db
-            return SUCCESS("出库任务单导入成功！");
+            return SUCCESS(msg);
         }
 
 

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/BaseSet/BasBinDto.cs

@@ -33,7 +33,7 @@ namespace ZR.Model.Dto.BaseSet
     public class BasBinDto
     {
         [Required(ErrorMessage = "库位Id 系统主键不能为空")]
-        [JsonConverter(typeof(ValueToStringConverter))]
+        //[JsonConverter(typeof(ValueToStringConverter))]
         public long BinId { get; set; }
 
         [Required(ErrorMessage = "库位编码不能为空")]
@@ -45,7 +45,7 @@ namespace ZR.Model.Dto.BaseSet
         public string BinType { get; set; }
 
         [Required(ErrorMessage = "库区编码不能为空")]
-        public string RegionId { get; set; }
+        public long RegionId { get; set; }
 
         [Required(ErrorMessage = "库位所在排不能为空")]
         public int BinRow { get; set; }