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

增加序列号服务

Browse Source
This commit is contained in:
18942506660
2023-11-11 14:18:47 +08:00
parent d0139f855a
commit 32c63959dc
9 changed files with 109 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/WMS.Web.Api/wwwroot/WMS.Web.Domain.xml
View File

@@ -1052,6 +1052,14 @@
备注
</summary>
</member>
<member name="M:WMS.Web.Domain.Entitys.SerialNumberOperate.CompleteCartonBox(System.String,System.Int32,WMS.Web.Domain.Entitys.Box)">
<summary>
装箱(记录)
</summary>
<param name="SerialNumber"></param>
<param name="MaterialId"></param>
<param name="box"></param>
</member>
<member name="T:WMS.Web.Domain.Entitys.SerialNumbers">
<summary>
序列号
@@ -1761,6 +1769,11 @@
出库服务
</summary>
</member>
<member name="T:WMS.Web.Domain.IService.ISerialNumberService">
<summary>
序列号服务
</summary>
</member>
<member name="T:WMS.Web.Domain.IService.ITakeStockService">
<summary>
盘点单服务
@@ -3315,6 +3328,11 @@
<param name="customerStockCode"></param>
<returns></returns>
</member>
<member name="T:WMS.Web.Domain.Services.SerialNumberService">
<summary>
序列号服务
</summary>
</member>
<member name="T:WMS.Web.Domain.Services.TakeStockService">
<summary>
盘点单服务
@@ -3690,6 +3708,21 @@
序列号操作类型
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.SerialNumberOperateType.CompleteCartonBox">
<summary>
装箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.SerialNumberOperateType.MoveBox">
<summary>
移箱
</summary>
</member>
<member name="F:WMS.Web.Domain.Values.SerialNumberOperateType.ChangeBox">
<summary>
改箱
</summary>
</member>
<member name="T:WMS.Web.Domain.Values.ShelfMethod">
<summary>
非采购上架方式

2
src/WMS.Web.Core/Dto/OpsBoxResponse.cs
View File

@@ -34,7 +34,7 @@ namespace WMS.Web.Core.Dto
/// 完成装箱时间
/// </summary>
[JsonProperty("CompleteCartonTime")]
public string CompleteCartonTime { get; set; }
public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
/// <summary>
/// 箱子创建用户
/// </summary>

6
src/WMS.Web.Domain/Entitys/Box.cs
View File

@@ -33,15 +33,15 @@ namespace WMS.Web.Domain.Entitys
/// <summary>
/// 供应商Id
/// </summary>
public int? SupplierId { get; set; }
public int SupplierId { get; set; } = 0;
/// <summary>
/// 组织Id
/// </summary>
public int? OrgId { get; set; }
public int OrgId { get; set; } = 0;
/// <summary>
/// 完成装箱时间
/// </summary>
public string CompleteCartonTime { get; set; }
public DateTime CompleteCartonTime { get; set; } = DateTime.Now;
/// <summary>
/// 箱子创建用户
/// </summary>

20
src/WMS.Web.Domain/Entitys/SerialNumberOperate.cs
View File

@@ -15,7 +15,7 @@ namespace WMS.Web.Domain.Entitys
public class SerialNumberOperate : EntityBase
{
public SerialNumberOperate() { }
public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, int materialId,string operateUser, string remark,
public SerialNumberOperate(string serialNumber, SerialNumberOperateType operateType, int materialId, string operateUser, string remark,
int? supplierId = null, int? orgId = null, int? stockId = null,
DateTime? operateTime = null)
{
@@ -69,5 +69,23 @@ namespace WMS.Web.Domain.Entitys
/// 备注
/// </summary>
public string Remark { get; set; }
/// <summary>
/// 装箱(记录)
/// </summary>
/// <param name="SerialNumber"></param>
/// <param name="MaterialId"></param>
/// <param name="box"></param>
public void CompleteCartonBox(string serialNumber, int materialId, Box box)
{
this.SerialNumber = serialNumber;
this.MaterialId = materialId;
this.OperateType = SerialNumberOperateType.CompleteCartonBox;
this.OperateTime = box.CompleteCartonTime;
this.OperateUser = box.CreateUser;
this.OrgId = box.OrgId;
this.SupplierId = box.SupplierId;
this.Remark = "箱号: " + box.BoxBillNo;
}
}
}

13
src/WMS.Web.Domain/IService/ISerialNumberService.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Text;
namespace WMS.Web.Domain.IService
{
/// <summary>
/// 序列号服务
/// </summary>
public interface ISerialNumberService
{
}
}

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

@@ -82,9 +82,13 @@ namespace WMS.Web.Domain.Services
//序列号
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);
soList.Add(so);
//序列号记录(装箱)
SerialNumberOperate so_g = new SerialNumberOperate();
so_g.CompleteCartonBox(sn.SerialNumber, detail.MaterialId, b);
soList.Add(so_g);
}
}
#endregion

14
src/WMS.Web.Domain/Services/SerialNumberService.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Domain.IService;
namespace WMS.Web.Domain.Services
{
/// <summary>
/// 序列号服务
/// </summary>
public class SerialNumberService: ISerialNumberService
{
}
}

22
src/WMS.Web.Domain/Values/SerialNumberOperateType.cs
View File

@@ -1,14 +1,32 @@
using System;
using System.Collections.Generic;
using System.Text;
using WMS.Web.Core;
namespace WMS.Web.Domain.Values
{
/// <summary>
/// 序列号操作类型
/// </summary>
public enum SerialNumberOperateType
public enum SerialNumberOperateType
{
Generate = 0
//序列号生成
[EnumRemark("序列号生成")]
Generate = 0,
/// <summary>
/// 装箱
/// </summary>
[EnumRemark("装箱")]
CompleteCartonBox = 1,
/// <summary>
/// 移箱
/// </summary>
[EnumRemark("移箱")]
MoveBox = 2,
/// <summary>
/// 改箱
/// </summary>
[EnumRemark("改箱")]
ChangeBox = 3,
}
}

3
src/WMS.Web.Repositories/DependencyInjection/AppBuilder.cs
View File

@@ -262,8 +262,7 @@ namespace WMS.Web.Repositories.DependencyInjection
Services.AddTransient<IInStockService, InStockService>();
Services.AddTransient<IInStockTaskService, InStockTaskService>();
Services.AddTransient<IOutStockTaskService, OutStockTaskService>();
Services.AddTransient<ISerialNumberService, SerialNumberService>();
}
}
}