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

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

Browse Source
This commit is contained in:
tongfei
2024-04-09 15:16:53 +08:00
parent beb0c8732a 55721d7630
commit 9a03233328
8 changed files with 69 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/WMS.Web.Domain/Entitys/SerialNumbers.cs
View File

@@ -97,6 +97,11 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("IsDelete")]
public bool? IsDelete { get; set; } = false;
/// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary>
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
/// <summary>
/// 操作(绑定箱信息)
@@ -140,6 +145,7 @@ namespace WMS.Web.Domain.Entitys
/// <param name="inStockBillNo">出库单号</param>
public void InStock(string inStockBillNo, InstockType type)
{
this.IsActivate = true;
if (type == InstockType.Purchase)
{
this.PurchaseBillNo = inStockBillNo;
@@ -168,6 +174,7 @@ namespace WMS.Web.Domain.Entitys
//盘点, 整箱移货上架, 出库回退上架----序列号正常可用
if (BackRecordType.OutstockOn == type)
{
this.IsActivate = true;
this.BoxId = boxId;
this.IsDelete = false;
}
@@ -177,12 +184,14 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 盘点
/// </summary>
public void TakeStock(int boxId)
public void TakeStock(int boxId, TakeStockType type)
{
//拣货出库, 整箱移货下架, 入库回退下架---- 序列号状态失效
//盘点, 整箱移货上架, 出库回退上架----序列号正常可用
this.BoxId = boxId;
this.IsDelete = false;
//盘亏被冻结 盘盈反冻结
this.IsDelete = type == TakeStockType.Profit ? true : false;
this.IsActivate = true;
}
}

5
src/WMS.Web.Domain/Entitys/SerialNumbers_Ops.cs
View File

@@ -86,5 +86,10 @@ namespace WMS.Web.Domain.Entitys
///</summary>
[Column("IsDelete")]
public bool? IsDelete { get; set; } = false;
/// <summary>
/// 是否激活过(只有做过 盘点 采购和非采购上架 出库回退上架 才算激活)
///</summary>
[Column("IsActivate")]
public bool? IsActivate { get; set; } = false;
}
}

2
src/WMS.Web.Domain/Infrastructure/ISerialNumbersRepositories.cs
View File

@@ -21,7 +21,7 @@ namespace WMS.Web.Domain.Infrastructure
/// <returns></returns>
Task<bool> AddRange(List<SerialNumbers> entitys, bool isTransaction = true);
//根据序列号模糊搜索信息
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, bool IsIncludeDelete = false);
Task<MaterialResponse> GetSerialNumber(string serialNumber, string orgCode, bool IsOps = false, int serialStatus = 0);
//根据序列号搜索信息
Task<SerialNumbersResponse> Get(string serialNumber);
/// 查询实体集合

7
src/WMS.Web.Domain/Services/SerialNumberService.cs
View File

@@ -461,7 +461,9 @@ namespace WMS.Web.Domain.Services
foreach (var s in serialNumbers)
{
var takeStockDetail = takeStocks.SelectMany(s => s.Details).FirstOrDefault(w => w.SerialNumbers.Contains(s));
if (takeStockDetail == null) continue;
var box = boxList.FirstOrDefault(f => f.Id == takeStockDetail.BoxId);
var s_entity = entityList.FirstOrDefault(f => f.SerialNumber.Equals(s));
if (box != null && box.Details.FirstOrDefault(f => f.MaterialNumber == takeStockDetail.MaterialNumber) == null)
@@ -479,10 +481,11 @@ namespace WMS.Web.Domain.Services
}
else
{
s_entity.TakeStock(takeStockDetail.BoxId);
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
s_entity.TakeStock(takeStockDetail.BoxId, takeStock.ResultType);
if (s_entity.BoxId == takeStockDetail.BoxId) continue;
var takeStock = takeStocks.FirstOrDefault(w => w.Details.FirstOrDefault(w => w.SerialNumbers.Contains(s)) != null);
//记录序列号操作日志
SerialNumberOperate op = new SerialNumberOperate()
{