18923810322/WMS-Api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修复bug

Browse Source
This commit is contained in:
18942506660
2023-11-16 15:49:23 +08:00
parent 5583cf1d82
commit 0ab01cbdc3
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/WMS.Web.Api/Controllers/TestController.cs
View File

@@ -48,14 +48,15 @@ namespace WMS.Web.Api.Controllers
// t.Details[0].Remark = "sdf"; // t.Details[0].Remark = "sdf";
// t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb"; // t.Details[0].ErpDetails[0].SaleBillNo = "sdfsfsbbbb";
// var s = await _outStockTaskRepositories.Edit(t); // var s = await _outStockTaskRepositories.Edit(t);
// await _boxService.Sync(); await _boxService.Sync();
//var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300)); //var res = await this._erpService.BillQueryForDeliveryNoticeOutStock(null,DateTime.Now.AddDays(-300));
//var result= await this._erpService.BillQueryForPurchaseInStock(); //var result= await this._erpService.BillQueryForPurchaseInStock();
//var result = await this._erpService.BillQueryForOrg(); //var result = await this._erpService.BillQueryForOrg();
var result = await this._erpService.BillQueryForMaterial(); //var result = await this._erpService.BillQueryForMaterial();
if (!result.IsSuccess) //if (!result.IsSuccess)
return ""; // return "";
return JsonConvert.SerializeObject(result.Data); //return JsonConvert.SerializeObject(result.Data);
return "";
} }
[HttpGet] [HttpGet]

10
src/WMS.Web.Domain/Services/BoxService.cs
View File

@@ -56,7 +56,8 @@ namespace WMS.Web.Domain.Services
{ {
//数据库里已经存在箱信息 移除 //数据库里已经存在箱信息 移除
var box = list.FirstOrDefault(f => f.BoxBillNo.Equals(s)); var box = list.FirstOrDefault(f => f.BoxBillNo.Equals(s));
list.Remove(box); if (box != null)
list.Remove(box);
} }
var boxs = _mapper.Map<List<Box>>(list); var boxs = _mapper.Map<List<Box>>(list);
@@ -75,13 +76,14 @@ namespace WMS.Web.Domain.Services
var ops_box = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId); var ops_box = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId);
foreach (var sn in ops_box.Details.SelectMany(s => s.SerialNumbers)) 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)); var detail = ops_box.Details.FirstOrDefault(f => f.SerialNumbers.Select(s => s.SerialNumber).Contains(sn.SerialNumber));
if (detail == null) continue; if (detail == null)
continue;
var opsSerial = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId).Details var opsSerial = list.FirstOrDefault(f => f.OpsBoxId == b.OpsBoxId).Details
.SelectMany(s => s.SerialNumbers) .SelectMany(s => s.SerialNumbers)
.FirstOrDefault(s => s.SerialNumber.Equals(sn.SerialNumber)); .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); sList.Add(s);
//序列号记录(序列号生成) //序列号记录(序列号生成)
SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime); SerialNumberOperate so = new SerialNumberOperate(sn.SerialNumber, SerialNumberOperateType.Generate, detail.MaterialId, opsSerial.BarCereateUser, "", b.SupplierId, b.OrgId, null, opsSerial.BarCreateTime);