Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

仓库货物，出库记录查询调整

Browse Source
This commit is contained in:
赵正易
2024-06-28 15:21:25 +08:00
parent 9b63150b66
commit c7cd6ba42c
23 changed files with 335 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ZR.Model/MES/mm/Dto/MmIngredientTaskDto.cs
View File

@@ -5,12 +5,12 @@ namespace ZR.Model.MES.mm.Dto
/// <summary>
/// 配料任务清单查询对象
/// </summary>
public class MmIngredientTaskQueryDto : PagerInfo
public class MmIngredientTaskQueryDto : PagerInfo
{
public string Workorder { get; set; }
public string Workorder { get; set; }
public DateTime Starttime { get; set; }
public DateTime Endtime { get; set; }
public DateTime Starttime { get; set; }
public DateTime Endtime { get; set; }
}

9
ZR.Model/MES/ql/DTO/PLBatchDto.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql.DTO
namespace ZR.Model.MES.ql.DTO
{
/// <summary>
/// 当前工单

9
ZR.Model/MES/ql/DTO/PLRawMaterialDto.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql.DTO
namespace ZR.Model.MES.ql.DTO
{
/// <summary>
/// 当前工单

9
ZR.Model/MES/ql/DTO/PLTestDto.cs
View File

@@ -1,11 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Numerics;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql.DTO
namespace ZR.Model.MES.ql.DTO
{
/// <summary>
/// 当前工单

8
ZR.Model/MES/ql/PLBatch.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql
namespace ZR.Model.MES.ql
{
/// <summary>

8
ZR.Model/MES/ql/PLRawMaterial.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql
namespace ZR.Model.MES.ql
{
/// <summary>

8
ZR.Model/MES/ql/PLTest.cs
View File

@@ -1,10 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace ZR.Model.MES.ql
namespace ZR.Model.MES.ql
{
/// <summary>

23
ZR.Model/MES/wms/Dto/WmGoodsNowProductionDto.cs
View File

@@ -7,24 +7,25 @@ namespace ZR.Model.MES.wms.Dto
{
public string Id { get; set; }
public string PackageCode { get; set; }
public string PackageCodeClient { get; set; }
public string PackageCodeOriginal { get; set; }
public string LocationCode { get; set; }
public string Partnumber { get; set; }
public string Description { get; set; }
public int? GoodsNumLogic { get; set; }
public int? GoodsNumAction { get; set; }
public DateTime? EntryWarehouseTime { get; set; }
public DateTime? EntryWarehouseTimeStart { get; set; }
public DateTime? EntryWarehouseTimeEnd { get; set; }
public string Remark { get; set; }
@@ -42,21 +43,18 @@ namespace ZR.Model.MES.wms.Dto
/// </summary>
public class WmGoodsNowProductionDto
{
public string Id { get; set; }
public string PackageCode { get; set; }
public string PackageCodeClient { get; set; }
public string PackageCodeOriginal { get; set; }
public string LocationCode { get; set; }
public string Partnumber { get; set; }
public string Description { get; set; }
public int? GoodsNumLogic { get; set; }
@@ -76,7 +74,6 @@ namespace ZR.Model.MES.wms.Dto
public DateTime? CreatedTime { get; set; }
}
/// <summary>
/// 成品库当前货物表查询对象（下拉菜单）
/// </summary>
@@ -93,37 +90,45 @@ namespace ZR.Model.MES.wms.Dto
/// 成品库货物id
/// </summary>
public string Id { get; set; }
/// <summary>
/// 批次号(MES中)
/// </summary>
public string PackageCodeClient { get; set; } = string.Empty;
/// <summary>
/// 库位号
/// </summary>
public string LocationCode { get; set; } = string.Empty;
/// <summary>
/// 零件号
/// </summary>
public string Partnumber { get; set; } = string.Empty;
/// <summary>
/// 详细描述
/// </summary>
public string Description { get; set; } = string.Empty;
/// <summary>
/// 入库时库存
/// </summary>
public int? GoodsNumLogic { get; set; } = 0;
/// <summary>
/// 当前实际库存！
/// </summary>
public int? GoodsNumAction { get; set; } = 0;
/// <summary>
/// 下拉显示值
/// </summary>
public string Label { get; set; } = string.Empty;
/// <summary>
/// 下拉实际值
/// </summary>
public object Value { get; set; }
}
}
}

2
ZR.Model/MES/wms/Dto/WmGoodsOutProductionDto.cs
View File

@@ -32,6 +32,8 @@ namespace ZR.Model.MES.wms.Dto
public DateTime? EntryWarehouseTime { get; set; }
public DateTime? OutTime { get; set; }
public DateTime? OutTimeStart { get; set; }
public DateTime? OutTimeEnd { get; set; }
public string Remark { get; set; }