wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

销售出库与拣货接口以及部分问题修复

Browse Source
This commit is contained in:
马健
2024-05-14 15:29:18 +08:00
parent 72ddc61591
commit eadaa50ef7
22 changed files with 1195 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/ModuleConsts.cs
View File

@@ -209,4 +209,17 @@ public class ModuleConsts
/// </summary>
public const string MODLUE_WMSTASKSTOCK_ID = "27690726707477";
/// <summary>
/// 模块标识-销售出库
/// </summary>
public const string MODULE_WMSSALERELEASE_ID = "25104446664213";
/// <summary>
/// 模块标识-分拣任务
/// </summary>
public const string MODULE_WMSSORTINGTASK_ID = "34088685351445";
/// <summary>
/// 模块标识-成品调拨入库单
/// </summary>
public const string MODULE_WMSTRANSFERINSTOCKH_ID = "34154749548053";
}

12
WarehouseMgr/Tnb.WarehouseMgr.Entities/Consts/WmsWareHouseConst.cs
View File

@@ -203,6 +203,10 @@
/// </summary>
public const string BIZTYPE_WMSDELIVERY_ID = "26585291847957";
/// <summary>
/// 预任务生成业务类型-销售出库下发(未定) TODO
/// </summary>
public const string BIZTYPE_WMSSALERELEASE_ID = "BIZTYPE_WMSSALERELEASE_ID";
/// <summary>
/// 预任务生成业务类型-载具绑定
/// </summary>
public const string BIZTYPE_WMSCARRYBIND_ID = "27118595509525";
@@ -211,6 +215,10 @@
/// </summary>
public const string BIZTYPE_WMSCHECKOUTSTOCK_ID = "27718132310037";
/// <summary>
/// 成品调拨入库
/// </summary>
public const string BIZTYPE_WMSTRANSFERINSTOCK_ID = "34154749548053";
/// <summary>
/// 条码打印状态-已完成
@@ -302,5 +310,9 @@
/// 一楼成品出库工位
/// </summary>
public const string FinishproductOutstockStation3 = "30018217822229";
/// <summary>
/// 分拣任务生成Encode
/// </summary>
public const string WMS_SORTINGTASK_ENCODE = "Sortingtask";
}
}

14
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/CarryCodeUnbindInput.cs Normal file
View File

@@ -0,0 +1,14 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
public class CarryCodeUnbindInput
{
public string? carry_id { get; set; }
}
}

14
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/FinishproductOutstockSignInput.cs
View File

@@ -6,18 +6,8 @@
public class FinishproductOutstockSortInput
{
/// <summary>
/// 载具id
/// 分拣任务id
/// </summary>
public string? carry_id { get; set; }
///// <summary>
///// 物料id
///// </summary>
//public string? material_id { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal qty { get; set; }
public string? source_id { get; set; }
}
}

8
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/OutsourcedPartsInstockInput.cs
View File

@@ -8,7 +8,7 @@
/// <summary>
/// 载具ID
/// </summary>
public string? carry_id { get; set; }
public string? carry_code { get; set; }
/// <summary>
/// 物料ID
/// </summary>
@@ -21,5 +21,11 @@
/// 起点
/// </summary>
public string? startlocation_id { get; set; }
/// <summary>
/// 需求单据
/// </summary>
public string? source_id { get; set; }
}
}

25
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/SaleReleaseDistributeInput.cs Normal file
View File

@@ -0,0 +1,25 @@
namespace Tnb.WarehouseMgr.Entities.Dto
{
/// <summary>
/// 库房业务更新输入参数
/// </summary>
public class SaleReleaseDistributeInput
{
/// <summary>
/// 组织ID
/// </summary>
public string org_id { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string create_id { get; set; }
/// <summary>
/// 物料数量
/// </summary>
public decimal qty { get; set; }
/// <summary>
/// 来源单据id
/// </summary>
public string? source_id { get; set; }
}
}

13
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Inputs/TransferInstockHListInput.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Tnb.WarehouseMgr.Entities.Dto.Inputs
{
public class TransferInstockHListInput
{
public string? id { get; set; }
}
}

5
WarehouseMgr/Tnb.WarehouseMgr.Entities/Dto/Queries/OutStockStrategyQuery.cs
View File

@@ -28,6 +28,11 @@
public int BllType { get; set; }
public int Size { get; set; }
/// <summary>
/// 数量
/// </summary>
public decimal qty { get; set; }
/// <summary>
/// 规格型号
/// </summary>

77
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsSortingtask.cs Normal file
View File

@@ -0,0 +1,77 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities;
/// <summary>
/// 分拣任务主表
/// </summary>
[SugarTable("wms_sortingtask")]
public partial class WmsSortingtask : BaseEntity<string>
{
public WmsSortingtask()
{
id = SnowflakeIdHelper.NextId();
}
/// <summary>
/// 所属组织
/// </summary>
public string? org_id { get; set; }
/// <summary>
/// 分拣任务单号
/// </summary>
public string bill_code { get; set; }
/// <summary>
/// 分拣数量
/// </summary>
public decimal qty { get; set; }
/// <summary>
/// 分拣数量
/// </summary>
public string carry_id { get; set; }
/// <summary>
/// 分拣指定载具
/// </summary>
public string carry_code { get; set; }
/// <summary>
/// 分拣指定库位id
/// </summary>
public string location_id { get; set; }
/// <summary>
/// 分拣指定库位
/// </summary>
public string location_code { get; set; }
/// <summary>
/// 状态
/// </summary>
public string status { get; set; }
/// <summary>
/// 分拣完成时间
/// </summary>
public DateTime complete_time { get; set; }
/// <summary>
/// 创建用户
/// </summary>
public string create_id { get; set; } = string.Empty;
/// <summary>
/// 创建时间
/// </summary>
public DateTime create_time { get; set; } = DateTime.Now;
/// <summary>
/// 来源单据id
/// </summary>
public string source_id { get; set; } = string.Empty;
}

108
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockD .cs Normal file
View File

@@ -0,0 +1,108 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities.Entity;
/// <summary>
/// 成品调拨入库子表
/// </summary>
[SugarTable("wms_transfer_instock_d")]
public partial class WmsTransferInstockD : BaseEntity<string>
{
public WmsTransferInstockD()
{
id = SnowflakeIdHelper.NextId();
}
    /// <summary>
    /// 所属组织
    /// </summary>
    public string? org_id { get; set; }
    /// <summary>
    /// 入库单ID
    /// </summary>
    public string? bill_id { get; set; }
    /// <summary>
    /// 执行状态
    /// </summary>
    public string? status { get; set; }
    /// <summary>
    /// 物品ID
    /// </summary>
    public string? material_id { get; set; }
    /// <summary>
    /// 物品代码
    /// </summary>
    public string? material_code { get; set; }
    /// <summary>
    /// 单位ID
    /// </summary>
    public string? unit_id { get; set; }
    /// <summary>
    /// 单位代码
    /// </summary>
    public string? unit_code { get; set; }
    /// <summary>
    /// 入库需求数量
    /// </summary>
    public decimal? pr_qty { get; set; }
    /// <summary>
    /// 已下发数量
    /// </summary>
    public decimal? xf_qty { get; set; }
    /// <summary>
    /// 实际入库数量
    /// </summary>
    public decimal? qty { get; set; }
    /// <summary>
    /// 流程任务Id
    /// </summary>
    public string? f_flowtaskid { get; set; }
    /// <summary>
    /// 流程引擎Id
    /// </summary>
    public string? f_flowid { get; set; }
    /// <summary>
    /// 规格型号
    /// </summary>
    public string? material_desc { get; set; }
    /// <summary>
    /// 创建用户
    /// </summary>
    public string? create_id { get; set; }
    /// <summary>
    /// 创建时间
    /// </summary>
    public DateTime? create_time { get; set; }
    /// <summary>
    /// 修改用户
    /// </summary>
    public string? modify_id { get; set; }
    /// <summary>
    /// 修改时间
    /// </summary>
    public DateTime? modify_time { get; set; }
    /// <summary>
    /// 批号
    /// </summary>
    public string? pi_code { get; set; }
}

79
WarehouseMgr/Tnb.WarehouseMgr.Entities/Entity/WmsTransferInstockH.cs Normal file
View File

@@ -0,0 +1,79 @@
using JNPF.Common.Contracts;
using JNPF.Common.Security;
using SqlSugar;
namespace Tnb.WarehouseMgr.Entities.Entity;
/// <summary>
/// 成品调拨入库主表
/// </summary>
[SugarTable("wms_transfer_instock_h")]
public partial class WmsTransferInstockH : BaseEntity<string>
{
public WmsTransferInstockH()
{
id = SnowflakeIdHelper.NextId();
}
    /// <summary>
    /// 创建用户
    /// </summary>
    public string? create_id { get; set; }
    /// <summary>
    /// 创建时间
    /// </summary>
    public DateTime? create_time { get; set; }
    /// <summary>
    /// 修改用户
    /// </summary>
    public string? modify_id { get; set; }
    /// <summary>
    /// 修改时间
    /// </summary>
    public DateTime? modify_time { get; set; }
    /// <summary>
    /// 所属组织
    /// </summary>
    public string? org_id { get; set; }
    /// <summary>
    /// 流程任务Id
    /// </summary>
    public string? f_flowtaskid { get; set; }
    /// <summary>
    /// 流程引擎Id
    /// </summary>
    public string? f_flowid { get; set; }
    /// <summary>
    /// 审核员
    /// </summary>
    public string? auditor_id { get; set; }
    /// <summary>
    /// 审核状态
    /// </summary>
    public int? audit_status { get; set; }
    /// <summary>
    /// 入库单号
    /// </summary>
    public string? bill_code { get; set; }
    /// <summary>
    /// 入库单创建日期
    /// </summary>
    public DateTime? bill_date { get; set; }
    /// <summary>
    /// 单据状态
    /// </summary>
    public string? status { get; set; }
}