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

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

@@ -48,6 +48,7 @@ namespace WMS.Web.Domain.Services
         public async Task<Result> Sync()
         {
             DateTime begin = await _erpOpsSyncDateRepositories.Get(ErpOpsSyncType.Ops);
+            begin= begin.AddYears(-1);
             OpsBoxRequest request = new OpsBoxRequest(begin, DateTime.Now);
             var list = await _opsService.GetBox(request);
             var nos = list.Select(s => s.BoxBillNo).ToList();

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

@@ -95,6 +95,9 @@ namespace WMS.Web.Domain.Services
                     oErpDetail.Qty = c.qty;
                     outd.ErpDetails.Add(oErpDetail);
                 }
+                var boxs = dto.Details.Where(w => w.MaterialId == mid).ToList();
+                outd.BoxsDetails = _mapper.Map<List<OutStockBoxsDetails>>(boxs);
+
                 outd.Qty = qty;
                 outd.SerialNumbers.AddRange(dtoDetails.SelectMany(s => s.SerialNumbers));
                 entity.Details.Add(outd);