diff --git a/src/WMS.Web.Api/Controllers/TestController.cs b/src/WMS.Web.Api/Controllers/TestController.cs index 940c1993..9afae123 100644 --- a/src/WMS.Web.Api/Controllers/TestController.cs +++ b/src/WMS.Web.Api/Controllers/TestController.cs @@ -48,14 +48,15 @@ namespace WMS.Web.Api.Controllers // t.Details[0].Remark = "sdf"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // var s = await _outStockTaskRepositories.Edit(t); - // await _boxService.Sync(); + await _boxService.Sync(); //var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300)); //var result= await this._erpService.BillQueryForPurchaseInStock(); //var result = await this._erpService.BillQueryForOrg(); - var result = await this._erpService.BillQueryForMaterial(); - if (!result.IsSuccess) - return ""; - return JsonConvert.SerializeObject(result.Data); + //var result = await this._erpService.BillQueryForMaterial(); + //if (!result.IsSuccess) + // return ""; + //return JsonConvert.SerializeObject(result.Data); + return ""; } [HttpGet] diff --git a/src/WMS.Web.Domain/Services/BoxService.cs b/src/WMS.Web.Domain/Services/BoxService.cs index 69febf42..000fe806 100644 --- a/src/WMS.Web.Domain/Services/BoxService.cs +++ b/src/WMS.Web.Domain/Services/BoxService.cs @@ -56,7 +56,8 @@ namespace WMS.Web.Domain.Services { //数据库里已经存在箱信息 移除 var box = list.FirstOrDefault(f => f.BoxBillNo.Equals(s)); - list.Remove(box); + if (box != null) + list.Remove(box); } var boxs = _mapper.Map>(list); @@ -75,13 +76,14 @@ namespace WMS.Web.Domain.Services var ops_box = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId); foreach (var sn in ops_box.Details.SelectMany(s => s.SerialNumbers)) { - var detail = ops_box.Details.FirstOrDefault(f => f.SerialNumbers.Select(s=>s.SerialNumber).Equals(sn.SerialNumber)); - if (detail == null) continue; + var detail = ops_box.Details.FirstOrDefault(f => f.SerialNumbers.Select(s => s.SerialNumber).Contains(sn.SerialNumber)); + if (detail == null) + continue; var opsSerial = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId).Details .SelectMany(s => s.SerialNumbers) .FirstOrDefault(s => s.SerialNumber.Equals(sn.SerialNumber)); //序列号 - SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialId,b.Id,b.OpsBoxId, opsSerial.BarCereateUser,opsSerial.BarCreateTime); + SerialNumbers s = new SerialNumbers(sn.SerialNumber, detail.MaterialId, b.Id, b.OpsBoxId, opsSerial.BarCereateUser, opsSerial.BarCreateTime); sList.Add(s); //序列号记录(序列号生成) SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);