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

重要：代码全局优化与添加一次合格，抛光仓库的截止日期数据查询功能

Browse Source
This commit is contained in:
赵正易
2025-07-28 15:40:59 +08:00
parent 89c113e5e1
commit 42de49629b
162 changed files with 3335 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ZR.Model/MES/wms/Dto/WmGoodsRecordDto.cs
View File

@@ -1,11 +1,10 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 成品库数据变动表查询对象
/// </summary>
public class WmGoodsRecordQueryDto : PagerInfo {
public class WmGoodsRecordQueryDto : PagerInfo
{
public string FkInventoryId { get; set; }
public string Code { get; set; }
public string Partnumber { get; set; }

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

@@ -1,5 +1,3 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>

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

@@ -173,7 +173,7 @@ namespace ZR.Model.MES.wms.Dto
/// </summary>
public class WmMaterialSelectOptions
{
public string Key { get; set; }
public string Key { get; set; }
public string Label { get; set; }
public string Value { get; set; }
public string Color { get; set; }

7
ZR.Model/MES/wms/Dto/WmOneTimeInventoryDto.cs
View File

@@ -3,7 +3,8 @@ namespace ZR.Model.MES.wms.Dto
/// <summary>
/// 一次合格品仓库查询对象
/// </summary>
public class WmOneTimeInventoryQueryDto : PagerInfo {
public class WmOneTimeInventoryQueryDto : PagerInfo
{
public string BlankNum { get; set; }
public string Partnumber { get; set; }
@@ -13,6 +14,8 @@ namespace ZR.Model.MES.wms.Dto
public int? Type { get; set; }
public int? Status { get; set; }
// 数据截止时间
public DateTime? EndTime { get; set; }
}
/// <summary>
@@ -66,7 +69,7 @@ namespace ZR.Model.MES.wms.Dto
public int QuantitySum { get; set; }
public int RealQuantitySum { get; set; }
public DateTime MinStocktakingTime { get; set; }
public List<WmOneTimeInventoryDto> Result { get; set; }
}

3
ZR.Model/MES/wms/Dto/WmOneTimeRecordDto.cs
View File

@@ -3,7 +3,8 @@ namespace ZR.Model.MES.wms.Dto
/// <summary>
/// 一次合格品仓库记录表查询对象
/// </summary>
public class WmOneTimeRecordQueryDto : PagerInfo {
public class WmOneTimeRecordQueryDto : PagerInfo
{
public string Id { get; set; }
public string FkInventoryId { get; set; }
public string Code { get; set; }

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

@@ -5,7 +5,7 @@ namespace ZR.Model.MES.wms.Dto
/// <summary>
/// 后道检验工单表查询对象
/// </summary>
public class WmPolishInspectionWorkorderQueryDto : PagerInfo
public class WmPolishInspectionWorkorderQueryDto : PagerInfo
{
public string WorkorderNo { get; set; }

4
ZR.Model/MES/wms/Dto/WmPolishInventoryDto.cs
View File

@@ -1,5 +1,3 @@
using MiniExcelLibs.Attributes;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
@@ -16,6 +14,8 @@ namespace ZR.Model.MES.wms.Dto
public int? Type { get; set; }
public int? Status { get; set; }
// 数据截止时间
public DateTime? EndTime { get; set; }
}
/// <summary>

4
ZR.Model/MES/wms/Dto/WmPolishQualityStatisticsDto.cs
View File

@@ -1,11 +1,9 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 抛光管理-质量统计查询对象
/// </summary>
public class WmPolishQualityStatisticsQueryDto : PagerInfo
public class WmPolishQualityStatisticsQueryDto : PagerInfo
{
public string WorkorderId { get; set; }

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

@@ -5,7 +5,7 @@ namespace ZR.Model.MES.wms.Dto
/// <summary>
/// 三楼抛光仓库查询对象
/// </summary>
public class WmPolishWarehouseQueryDto : PagerInfo
public class WmPolishWarehouseQueryDto : PagerInfo
{
public string Location { get; set; }
public string Remark { get; set; }

4
ZR.Model/MES/wms/Dto/WmPolishWorkQualityStatisticsDto.cs
View File

@@ -1,11 +1,9 @@
using System.ComponentModel.DataAnnotations;
namespace ZR.Model.MES.wms.Dto
{
/// <summary>
/// 抛光管理-抛光操作记录
/// </summary>
public class WmPolishWorkQualityStatisticsQueryDto : PagerInfo
public class WmPolishWorkQualityStatisticsQueryDto : PagerInfo
{
public string WorkorderId { get; set; }

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

@@ -5,7 +5,7 @@ namespace ZR.Model.MES.wms.Dto
/// <summary>
/// 查询对象
/// </summary>
public class WmPolishWorkorderQueryDto : PagerInfo
public class WmPolishWorkorderQueryDto : PagerInfo
{
public string WorkorderNo { get; set; }

8
ZR.Model/MES/wms/ERP_WMS_interactiveModel.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.wms
namespace ZR.Model.MES.wms
{
public class ERP_WMS_interactiveModel
{