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

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

@@ -373,6 +373,8 @@ namespace WMS.Web.Api.Controllers
                 return Result<BoxResponse>.ReFailure("箱号" + boxBillNo + "不存在", 800000);
             var response = res[0];
             var detail = await _outStockRepositories.GetDetailsByBoxId(response.Id);
+            if (detail.Count() == 0)
+                return Result<BoxResponse>.ReFailure("箱号" + boxBillNo + "未出库", 800000);
             response.Details = detail;
             response.TotalQty = detail.Sum(s => s.Qty);
             return Result<BoxResponse>.ReSuccess(response);

src/WMS.Web.Core/Dto/TakeStock/SaveTakeStockRequest.cs

@@ -46,7 +46,6 @@ namespace WMS.Web.Core.Dto.TakeStock
         /// <summary>
         /// 备注
         /// </summary>
-        [Required(ErrorMessage = "备注不能为空")]
         public string Remark { get; set; }
     }
 }

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

@@ -370,7 +370,7 @@ namespace WMS.Web.Domain.Services
             //获取序列号信息
             var serialNumbers = backRecord.Details.SelectMany(s => s.SerialNumbers).ToList();
             var entityList = await _serialNumbersRepositories.GetEntityList(serialNumbers);
-            var boxIds = entityList.Select(s => s.BoxId).ToList();
+            var boxIds = backRecord.Details.Select(s => s.BoxId).ToList();
             var boxList = await _boxRepositories.GetEntityList(boxIds);
             var userName = _singleDataService.GetSingleData(SingleAction.Staffs, loginInfo.UserInfo.CompanyId, loginInfo.UserInfo.StaffId);
 

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

@@ -164,11 +164,16 @@ namespace WMS.Web.Domain.Services
             //获取金蝶仓库仓位编码
             //var stockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.StockId);
             //var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, entity.SubStockId);
+            try
+            {
                 var materials_result = await _erpService.BillQueryForMaterial();
+                if (!materials_result.IsSuccess) return Result.ReFailure(ResultCodes.ErpMaterialError);
                 var materials = materials_result.Data.ToList();
 
                 var res = await _erpService.BillQueryForStock();
+                if (!res.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError);
                 var resSub = await _erpService.BillQueryForSubStock();
+                if (!resSub.IsSuccess) return Result.ReFailure(ResultCodes.ErpStockError);
                 var stock = res.Data.FirstOrDefault(f => f.Code == entity.Details[0].StockCode);//需要根据单点code搜索
                 if (stock == null) return Result.ReFailure(ResultCodes.ErpStockNoData);
                 //组装dto
@@ -178,7 +183,7 @@ namespace WMS.Web.Domain.Services
                 foreach (var d in entity.Details)
                 {
                     var subStockCode = _singleDataService.GetSingleDataCode(SingleAction.Stocks, _loginRepositories.CompanyId, d.SubStockId);
-                var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
+                    //var subStock = resSub.Data.FirstOrDefault(f => f.Code == subStockCode);//需要根据单点code搜索
                     var unitNumber = _erpBasicDataExtendService.GetMaterialUnitNumber(materials, d.MaterialId);
                     detils.Add(new ErpTakeStockDetailsSaveDto()
                     {
@@ -212,6 +217,12 @@ namespace WMS.Web.Domain.Services
                 await _takeStockRepositories.Edit(entity, true);
                 return res;
             }
+            catch (Exception ex)
+            {
+                _logger.LogError($"盘点同步金蝶: {ex.ToString()}");
+                return Result.ReFailure(ResultCodes.NoDateError);
+            }
+        }
         /// <summary>
         /// 同步金蝶操作
         /// </summary>

src/WMS.Web.Repositories/OutStockRepositories.cs

@@ -325,15 +325,16 @@ namespace WMS.Web.Repositories
                .Include(s => s.Details).ThenInclude(s => s.BoxsDetails.Where(w => w.BoxId == boxId))
               .Where(f => f.Details.SelectMany(s => s.BoxsDetails).Where(w => w.BoxId == boxId).Any())
               .OrderByDescending(o => o.Id)
-              .FirstAsync();
+              .ToListAsync();
             List<BoxDetailResponse> details = new List<BoxDetailResponse>();
+            if (res.Count() == 0) return details;
 
             var materials_result = await _erpService.BillQueryForMaterial();
             if (!materials_result.IsSuccess)
                 return new List<BoxDetailResponse>();
             var materials = materials_result.Data.ToList();
 
-            foreach (var d in res.Details)
+            foreach (var d in res.First().Details)
             {
                 var boxDetail = d.BoxsDetails.FirstOrDefault(f => f.BoxId == boxId);
                 if (boxDetail == null) continue;
@@ -341,7 +342,7 @@ namespace WMS.Web.Repositories
                 detail.MaterialName = _erpBasicDataExtendService.GetMaterialName(materials, d.MaterialId);
                 detail.MaterialNumber = _erpBasicDataExtendService.GetMaterialNumber(materials, d.MaterialId);
                 detail.Specifications = _erpBasicDataExtendService.GetMaterialSpecifications(materials, d.MaterialId);
-                detail.SerialNumbers = d.SerialNumbers;
+                detail.SerialNumbers = boxDetail.SerialNumbers;
                 detail.MaterialId = d.MaterialId;
                 detail.Qty = boxDetail.Qty;
                 details.Add(detail);