大改了序列号的返回

src/WMS.Web.Api/Controllers/SysConfigController.cs

@@ -522,11 +522,11 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetMaterial")]
-        public async Task<Result<MaterialResponse>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null, [FromQuery] bool IsOps = false, [FromQuery] int? serialStatus = 0)
+        public async Task<Result<List<MaterialResponse>>> GetMaterial([FromQuery] string serialNumber, [FromQuery] string orgCode = null, [FromQuery] bool IsOps = false, [FromQuery] int? serialStatus = 0)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
-                return Result<MaterialResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+                return Result<List<MaterialResponse>>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             _logger.LogInformation($"请求序列号信息:{serialNumber} 组织:{orgCode} 是否Ops:{IsOps} 查询状态 {serialStatus}");
             var res = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus ?? 0);
@@ -544,12 +544,12 @@ namespace WMS.Web.Api.Controllers
              */
             if (serialStatus == 1 || serialStatus == 2)
             {
-                if (res.IsActivate == true && res.IsDelete != true)
+                if (res[0].IsActivate == true && res[0].IsDelete != true)
-                    return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
+                    return Result<List<MaterialResponse>>.ReFailure(ResultCodes.SerialNumbersIsShelf);
             }
 
-            _logger.LogInformation($"请求序列号信息结果:{res.MaterialNumber}");
+            _logger.LogInformation($"请求序列号信息结果:{res[0].MaterialNumber}");
-            return Result<MaterialResponse>.ReSuccess(res);
+            return Result<List<MaterialResponse>>.ReSuccess(res);
         }
 
         /// <summary>

src/WMS.Web.Domain/IService/ISerialNumberService.cs

@@ -42,6 +42,6 @@ namespace WMS.Web.Domain.IService
         /// <param name="IsOps"></param>
         /// <param name="serialStatus"></param>
         /// <returns></returns>
-        Task<Result<MaterialResponse>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
+        Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
     }
 }

src/WMS.Web.Domain/IService/Public/IOpsService.cs

@@ -13,6 +13,6 @@ namespace WMS.Web.Domain.IService.Public
    public interface IOpsService
     {
         Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request);
-        Task<Result<SerialNumbersWmsResponse>> GetSerialNumbers(SerialNumbersWmsRequest request);
+        Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request);
     }
 }

src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs

@@ -21,7 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
         /// <returns></returns>
         Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
         //根据序列号模糊搜索信息
-        Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
+        Task<List<MaterialResponse>> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
         //根据序列号搜索信息
         Task<SerialNumbersResponse> Get(string serialNumber);
         /// 查询实体集合

src/WMS.Web.Domain/Services/Public/OpsService.cs

@@ -60,13 +60,13 @@ namespace WMS.Web.Domain.Services.Public
         /// <param name="request"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Result<SerialNumbersWmsResponse>> GetSerialNumbers(SerialNumbersWmsRequest request)
+        public async Task<Result<List<SerialNumbersWmsResponse>>> GetSerialNumbers(SerialNumbersWmsRequest request)
         {
             string endStr = "api/WmsBox/GetSerialNumber";
             Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
             //dicHeaders.Add("Authorization", "Bearer " + token);
             //_httpClientService.BuildHttpClient(contentHeaders);
-            var res = await _httpClientService.PostAsync<Result<SerialNumbersWmsResponse>>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
+            var res = await _httpClientService.PostAsync<Result<List<SerialNumbersWmsResponse>>>(_option.Url + endStr, JsonConvert.SerializeObject(request), dicHeaders);
             return res;
         }
 

src/WMS.Web.Domain/Services/SerialNumberService.cs

@@ -579,39 +579,42 @@ namespace WMS.Web.Domain.Services
         /// <param name="serialStatus"></param>
         /// <returns></returns>
         /// <exception cref="NotImplementedException"></exception>
-        public async Task<Result<MaterialResponse>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
+        public async Task<Result<List<MaterialResponse>>> GetBarCodeSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
         {
             //外层方法没有调到数据是null  如果这里查询到序列码
             var list = await _serialNumbersRepositories.GetEntityList(new List<string>() { serialNumber });
             if (list.FirstOrDefault(f => f.SerialNumber.Equals(serialNumber)) != null)
-                return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
+                return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
             //进入供应链系统调数据
             _logger.LogInformation($"拉取供应链系统条码->{serialNumber}");
             var res = await _opsService.GetSerialNumbers(new Core.Dto.SerialNumbers.SerialNumbersWmsRequest() { SerialNumber = serialNumber });
             if (!res.IsSuccess)
-                return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
+                return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
 
             _logger.LogInformation($"拉取供应链系统条码结果:->{JsonConvert.SerializeObject(res)}");
             //插入序列码信息
-            SerialNumbers entity = new SerialNumbers(res.Data.SerialNumber, res.Data.MaterialNumber
+            for (int j = 0; j < res.Data.Count; j++)
-                , 0, 0, res.Data.Creator, res.Data.CreateTime, null,res.Data.IsTwo, res.Data.TwoSerialNumber,res.Data.IsNotCount);
-            var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
-            if (!isSuccess) return Result<MaterialResponse>.ReFailure(ResultCodes.DateWriteError);
-
-            var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
-            if (res_s == null) return Result<MaterialResponse>.ReFailure(ResultCodes.MateriaNoData);
-            /*
-             以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
-                不存在的序列号提示：产品信息不存在
-                非采购上架 改箱  (非激活的或者(激活被冻结)) 1
-                出库回退上架 (激活被冻结) 2
-             */
-            if (serialStatus == 1 || serialStatus == 2)
             {
-                if (res_s.IsActivate == true && res_s.IsDelete != true)
+                SerialNumbers entity = new SerialNumbers(res.Data[j].SerialNumber, res.Data[j].MaterialNumber
-                    return Result<MaterialResponse>.ReFailure(ResultCodes.SerialNumbersIsShelf);
+                    , 0, 0, res.Data[j].Creator, res.Data[j].CreateTime, null, res.Data[j].IsTwo, res.Data[j].TwoSerialNumber, res.Data[j].IsNotCount);
+                var isSuccess = await _serialNumbersRepositories.AddRange(new List<SerialNumbers>() { entity });
+                if (!isSuccess) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.DateWriteError);
             }
-            return Result<MaterialResponse>.ReSuccess(res_s);
+            var res_s = await _serialNumbersRepositories.GetSerialNumber(serialNumber, orgCode, IsOps, serialStatus);
+                if (res_s == null) return Result<List<MaterialResponse>>.ReFailure(ResultCodes.MateriaNoData);
+                /*
+                 以下页面需要判断后提示：如果状态为非冻结的提示：序列号已上架入库 ； 状态为冻结的扫描成功；
+                    不存在的序列号提示：产品信息不存在
+                    非采购上架 改箱  (非激活的或者(激活被冻结)) 1
+                    出库回退上架 (激活被冻结) 2
+                 */
+                if (serialStatus == 1 || serialStatus == 2)
+                {
+                    if (res_s[0].IsActivate == true && res_s[0].IsDelete != true)
+                        return Result<List<MaterialResponse>>.ReFailure(ResultCodes.SerialNumbersIsShelf);
+                }
+            
+            return Result<List<MaterialResponse>>.ReSuccess(res_s);
         }
     }
 }

src/WMS.Web.Repositories/SerialNumbersRepositories.cs

@@ -258,12 +258,16 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="serialNumbers"></param>
         /// <returns></returns>
-        public async Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
+        public async Task<List<MaterialResponse>> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0)
         {
+            List<MaterialResponse> response2 = new List<MaterialResponse>();
             MaterialResponse response = new MaterialResponse();
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
-                return response;
+            {
+                response2.Add(response);
+                return response2;
+            }
             var materials = materials_result.Data.ToList();
 
             var m = materials.Where(f => (f.Specifications.Equals(serialNumber) || f.MaterialNumber.Equals(serialNumber)));
@@ -275,7 +279,8 @@ namespace WMS.Web.Repositories
                 response.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, material.MaterialNumber);
                 response.MaterialNumber = material.MaterialNumber;
                 response.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, material.MaterialNumber);
-                return response;
+                response2.Add(response);
+                return response2;
             }
             var res = _context.SerialNumbers
                 .GroupJoin(_context.BoxInventory.Include(x => x.Details), serial => serial.BoxId, boxInventory => boxInventory.BoxId, (serial, boxInventory) => new { serial, boxInventory })
@@ -325,8 +330,8 @@ namespace WMS.Web.Repositories
                 response.IsNotCount = "0";
             }
                 response.IsNotCount = entity.serial.IsNotCount;
-
+            response2.Add(response);
-            return response;
+            return response2;
         }
 
         /// <summary>
@@ -334,12 +339,16 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="serialNumbers"></param>
         /// <returns></returns>
-        private async Task<MaterialResponse> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
+        private async Task<List<MaterialResponse>> GetSerialNumber_Ops(string serialNumber, int serialStatus = 0)
         {
+            List<MaterialResponse> response2 = new List<MaterialResponse>();
             MaterialResponse response = new MaterialResponse();
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
-                return response;
+            {
+                response2.Add(response);
+                return response2;
+            }
             var materials = materials_result.Data.ToList();
 
             var res = _context.SerialNumbers_Ops
@@ -373,8 +382,8 @@ namespace WMS.Web.Repositories
             //if (entity.boxInventory != null)
             //    response.IsBoxInventory = entity.boxInventory.Details.SelectMany(s => s.SerialNumbers).Where(w => serialNumber.Equals(w)).Count() >= 1 ? true : false;
 
-
+            response2.Add(response);
-            return response;
+            return response2;
         }
         /// <summary>
         /// 老ops条码批量修改