diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 4e6e7330..cc5c36ec 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1607,11 +1607,11 @@ 解绑 - + 出库 - 出库单号 + 出库单号 diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 60711f1a..072597b6 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -1,4 +1,5 @@ -using System; +using Newtonsoft.Json; +using System; using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Text; @@ -110,13 +111,13 @@ namespace WMS.Web.Domain.Entitys /// /// 出库 /// - /// 出库单号 - public void OutStock(string outStockBillNo, OutStockType type,int customerId) + /// 出库单号 + public void OutStock(List salBillNos, OutStockType type,int customerId) { this.BoxId = 0; if (type == OutStockType.Sal) { - this.SalBillNo = outStockBillNo; + this.SalBillNo = JsonConvert.SerializeObject(salBillNos); this.CustomerId = customerId; this.OutStockTime = DateTime.Now; } diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 59679a91..86ef5f8b 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -1,4 +1,5 @@ using Microsoft.EntityFrameworkCore.Storage; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -64,7 +65,7 @@ namespace WMS.Web.Domain.Services //修改序列号和箱绑定关系 entity.Bind(destBox.DestBoxId, box.CompleteCartonTime); - + //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() { @@ -194,7 +195,7 @@ namespace WMS.Web.Domain.Services var outstockDetail = outStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); if (outstockDetail == null) continue; //修改序列号和箱绑定关系 - entity.OutStock(outStock.BillNo, outStock.Type, outStock.ReceiptCustomerId); + entity.OutStock(outstockDetail.ErpDetails.Select(s => s.SaleBillNo).ToList(), outStock.Type, outStock.ReceiptCustomerId); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() @@ -206,7 +207,7 @@ namespace WMS.Web.Domain.Services OperateTime = DateTime.Now, OperateType = OutStockTypeConvert(outStock.Type), OperateUser = userName, - Remark = "来源单号:" + string.Join(",", outstockDetail.ErpDetails.Select(s=>s.SourceBillNo)) + "\r\n" + "出库单号:" + outStock.BillNo + Remark = "来源单号:" + string.Join(",", outstockDetail.ErpDetails.Select(s => s.SourceBillNo)) + "\r\n" + "出库单号:" + outStock.BillNo }; if (outStock.Type == OutStockType.Sal) { @@ -387,7 +388,7 @@ namespace WMS.Web.Domain.Services //if (backRecord.Type == BackRecordType.InstockOff) // entity.UnBind(); if (backRecord.Type == BackRecordType.OutstockOn) - entity.Bind(detail.BoxId,box.CompleteCartonTime); + entity.Bind(detail.BoxId, box.CompleteCartonTime); //记录序列号操作日志 diff --git a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs index 980d3435..2558570b 100644 --- a/src/WMS.Web.Repositories/SerialNumbersRepositories.cs +++ b/src/WMS.Web.Repositories/SerialNumbersRepositories.cs @@ -1,6 +1,7 @@ using AutoMapper; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -123,10 +124,20 @@ namespace WMS.Web.Repositories InStockTime = s.InStockTime.DateToStringSeconds(), OutStockTime = s.OutStockTime.DateToStringSeconds(), PurchaseBillNo = s.PurchaseBillNo, - SalBillNo = s.SalBillNo, Customer = _erpBasicDataExtendService.GetCustomerName(customers, s.CustomerId), SerialNumber = s.SerialNumber }; + if (!string.IsNullOrEmpty(s.SalBillNo)) + { + Random rd = new Random(); + var list = JsonConvert.DeserializeObject>(s.SalBillNo); + if (list.Count() > 0) + { + int index = rd.Next(0, list.Count); + respone.SalBillNo = list[index]; + } + } + return respone; }