diff --git a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml index 85931adb..790b3d8f 100644 --- a/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml +++ b/src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml @@ -1223,15 +1223,15 @@ 解绑 - + 出库 出库单号 - + - 出库 + 入库 出库单号 diff --git a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs index 8ec98788..810dddd6 100644 --- a/src/WMS.Web.Domain/Entitys/SerialNumbers.cs +++ b/src/WMS.Web.Domain/Entitys/SerialNumbers.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; using System.Text; using WMS.Web.Core; +using WMS.Web.Domain.Values; namespace WMS.Web.Domain.Entitys { @@ -14,7 +15,7 @@ namespace WMS.Web.Domain.Entitys public class SerialNumbers : EntityBase { public SerialNumbers() { } - public SerialNumbers(string serialNumber,int materialId,int boxId,int opsBoxId,string creator,DateTime? createTime) + public SerialNumbers(string serialNumber, int materialId, int boxId, int opsBoxId, string creator, DateTime? createTime) { this.SerialNumber = serialNumber; this.MaterialId = materialId; @@ -88,18 +89,20 @@ namespace WMS.Web.Domain.Entitys /// 出库 /// /// 出库单号 - public void OutStock(string outStockBillNo) + public void OutStock(string outStockBillNo, OutStockType type) { this.BoxId = 0; - this.OutStockBillNo = outStockBillNo; + if (type == OutStockType.Sal) + this.OutStockBillNo = outStockBillNo; } /// - /// 出库 + /// 入库 /// /// 出库单号 - public void InStock(string inStockBillNo) + public void InStock(string inStockBillNo, InstockType type) { - this.InStockBillNo = inStockBillNo; + if (type == InstockType.Purchase) + this.InStockBillNo = inStockBillNo; } } } diff --git a/src/WMS.Web.Domain/Services/SerialNumberService.cs b/src/WMS.Web.Domain/Services/SerialNumberService.cs index 9b82ac6e..15021c82 100644 --- a/src/WMS.Web.Domain/Services/SerialNumberService.cs +++ b/src/WMS.Web.Domain/Services/SerialNumberService.cs @@ -188,7 +188,7 @@ namespace WMS.Web.Domain.Services { var box = boxList.FirstOrDefault(f => f.Id == entity.BoxId); //修改序列号和箱绑定关系 - entity.OutStock(outStock.BillNo); + entity.OutStock(outStock.BillNo, outStock.Type); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate() @@ -316,7 +316,7 @@ namespace WMS.Web.Domain.Services var instockDetail = inStock.Details.FirstOrDefault(f => f.MaterialId == entity.MaterialId); var subStock = _singleDataService.GetSingleData(SingleAction.SubStocks, loginInfo.UserInfo.CompanyId, instockDetail.SubStockId); //修改序列号和箱绑定关系 - entity.InStock(inStock.BillNo); + entity.InStock(inStock.BillNo, inStock.Type); //记录序列号操作日志 SerialNumberOperate op = new SerialNumberOperate()