Merge branch 'master' of https://codeup.aliyun.com/62ce7bca487c500c27f70a79/OPS/WMS-Api

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

@@ -93,15 +93,15 @@ namespace WMS.Web.Api.Controllers
         /// <returns></returns>
         [HttpGet]
         [Route("GetOutStockTaskByNo/{billNo}")]
-        public async Task<Result<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
+        public async Task<ResultList<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo([FromRoute] string billNo)
         {
             var loginInfo = _loginService.GetLoginInfo(this.HttpContext.Request.Headers["Authorization"]);
             if (loginInfo == null || loginInfo.UserInfo == null)
-                return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
+                return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.Token_Invalid_Error);
 
             var res= await _repositories.GetOutStockTaskByNo(billNo);
-            if (res == null) return Result<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
+            if (res == null) return ResultList<GetOutStockTaskByNoResponse>.ReFailure(ResultCodes.OutStockTaskNoData);
-            return Result<GetOutStockTaskByNoResponse>.ReSuccess(res);
+            return ResultList<GetOutStockTaskByNoResponse>.ReSuccess(res);
         }
 
     }

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

@@ -25,26 +25,22 @@ namespace WMS.Web.Api.Controllers
         private IInStockTaskService _inStockTaskService;
         private IBasicsRepositories _transactionRepositories;
         private readonly IOpsService _opsService;
-
+        private readonly IBoxService _boxService;
         public TestController(IErpService erpService, IInStockTaskService inStockTaskService, 
-            IBasicsRepositories transactionRepositories, IOpsService opsService)
+            IBasicsRepositories transactionRepositories, IOpsService opsService, IBoxService boxService)
         {
             this._erpService = erpService;
             this._inStockTaskService = inStockTaskService;
             this._transactionRepositories = transactionRepositories;
             _opsService = opsService;
+            _boxService = boxService;
         }
 
         [HttpGet]
         [Route("hj")]
         public async Task<string> TestHJ()
         {
-            OpsBoxRequest request = new OpsBoxRequest()
+            await _boxService.Sync();
-            {
-                StrartTime = DateTime.Now.AddYears(-1),
-                EndTime=DateTime.Now
-            };
-           await _opsService.GetBox(request);
             //var res = await this._erpService.BillQueryForSubStock();
             //var result= await this._erpService.BillQueryForPurchaseInStock();
             //var result = await this._erpService.BillQueryForOrg();

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

@@ -37,6 +37,6 @@ namespace WMS.Web.Domain.Infrastructure
         //获取实体
         Task<OutStockTask> Get(int id);
         //根据订单号获取订单信息
-        Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo);
+        Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo(string billNo);
     }
 }

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

@@ -34,64 +34,14 @@ namespace WMS.Web.Domain.Services.Public
 
         public async Task<List<OpsBoxResponse>> GetBox(OpsBoxRequest request)
         {
-            List<OpsBoxResponse> listss = new List<OpsBoxResponse>();
-            OpsBoxResponse respnose = new OpsBoxResponse();
-            List<OpsBoxDetailsResponse> details = new List<OpsBoxDetailsResponse>();
-            List<SerialNumbersResponse> ss = new List<SerialNumbersResponse>();
-            ss.Add(new SerialNumbersResponse() { 
-             SerialNumber="sss",
-              BarCereateUser="sdf",
-               BarCreateTime="20-20-20"
-            });
-            ss.Add(new SerialNumbersResponse()
-            {
-                SerialNumber = "sss2",
-                BarCereateUser = "sdf2",
-                BarCreateTime = "20-20-20"
-            });
-            details.Add(new OpsBoxDetailsResponse()
-            {
-                MaterialId = 1,
-                Qty = 1,
-                SerialNumbers = ss
-            });
-            respnose.Details = details;
-            listss.Add(respnose);
-
-            OpsBoxResponse respnose2 = new OpsBoxResponse();
-            List<OpsBoxDetailsResponse> details2 = new List<OpsBoxDetailsResponse>();
-            List<SerialNumbersResponse> ss2 = new List<SerialNumbersResponse>();
-            ss2.Add(new SerialNumbersResponse()
-            {
-                SerialNumber = "sss",
-                BarCereateUser = "sdf",
-                BarCreateTime = "20-20-20"
-            });
-            ss2.Add(new SerialNumbersResponse()
-            {
-                SerialNumber = "sss2",
-                BarCereateUser = "sdf2",
-                BarCreateTime = "20-20-20"
-            });
-            details2.Add(new OpsBoxDetailsResponse()
-            {
-                MaterialId = 1,
-                Qty = 1,
-                SerialNumbers = ss
-            });
-            respnose2.Details = details2;
-
-            listss.Add(respnose2);
-
-            var str = JsonConvert.SerializeObject(listss);
-
             var token = await GetToken();
             Dictionary<string, string> dicHeaders = new Dictionary<string, string>();
             dicHeaders.Add("Authorization", "Bearer " + token);
             //_httpClientService.BuildHttpClient(contentHeaders);
             var res = await _httpClientService.PostAsync<OpsReponse>(_option.Url + "BarCode/carton-box_api/carton-box", JsonConvert.SerializeObject(request), dicHeaders);
             if (!res.succeeded) return new List<OpsBoxResponse>();
-            return JsonConvert.DeserializeObject<List<OpsBoxResponse>>(res.data.date);
+            var list = JsonConvert.DeserializeObject<List<OpsBoxResponse>>(res.data.date);
+            return list;
         }
 
         private async Task<string> GetToken()

src/WMS.Web.Repositories/OutStockTaskRepositories.cs

@@ -308,12 +308,25 @@ namespace WMS.Web.Repositories
         /// </summary>
         /// <param name="billNo"></param>
         /// <returns></returns>
-        public async Task<GetOutStockTaskByNoResponse> GetOutStockTaskByNo(string billNo)
+        public async Task<List<GetOutStockTaskByNoResponse>> GetOutStockTaskByNo(string billNo)
         {
-            var entity = await _context.OutStockTask.Include(x => x.Details).FirstOrDefaultAsync(f => billNo.Equals(f.BillNo));
+            var materials_result = await _erpService.BillQueryForMaterial();
-            var response = _mapper.Map<GetOutStockTaskByNoResponse>(entity);
+            if (!materials_result.IsSuccess)
+                return new List<GetOutStockTaskByNoResponse>();
+            var materials = materials_result.Data.ToList();
+
+            var list = await _context.OutStockTask.Include(x => x.Details)
+                .Where(f => (EF.Functions.Like(f.BillNo, "%" + billNo + "%") ||
+                EF.Functions.Like(f.SourceBillNo, "%" + billNo + "%")) &&
+                (f.Status == OutStockStatus.Part || f.Status == OutStockStatus.Wait)).ToListAsync();
+            var response = _mapper.Map<List<GetOutStockTaskByNoResponse>>(list);
             //获取物料信息 显示物料三件套
-            var mIds = entity.Details.Select(s => s.MaterialId).ToList();
+            foreach (var r in response.SelectMany(s => s.details))
+            {
+                r.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, r.MaterialId);
+                r.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, r.MaterialId);
+                r.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, r.MaterialId);
+            }
             return response;
         }
         /// <summary>