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

123

Browse Source
This commit is contained in:
赵正易
2025-03-24 17:11:05 +08:00
parent 28e899ed46
commit c12d428650
7 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/wms/WmOneTimeInventoryController.cs
View File

@@ -35,7 +35,7 @@ namespace ZR.Admin.WebApi.Controllers
// [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")] // [ActionPermissionFilter(Permission = "business:wmonetimeinventory:list")]
public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm) public IActionResult QueryWmOneTimeInventory([FromQuery] WmOneTimeInventoryQueryDto parm)
{ {
var response = _WmOneTimeInventoryService.GetList(parm); var response = _WmOneTimeInventoryService.GetListNew(parm);
return SUCCESS(response); return SUCCESS(response);
} }

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

@@ -65,6 +65,8 @@ namespace ZR.Model.MES.wms.Dto
public int StocktakingTotal { get; set; } public int StocktakingTotal { get; set; }
public int QuantitySum { get; set; } public int QuantitySum { get; set; }
public int RealQuantitySum { get; set; } public int RealQuantitySum { get; set; }
public DateTime MinStocktakingTime { get; set; }
public List<WmOneTimeInventoryDto> Result { get; set; } public List<WmOneTimeInventoryDto> Result { get; set; }
} }

16
ZR.Service/mes/qc/CommonFQCService.cs
View File

@@ -1872,8 +1872,8 @@ namespace ZR.Service.mes.qc
query.EndTime != null, query.EndTime != null,
it => it.StartTime <= query.EndTime.Value.ToLocalTime() it => it.StartTime <= query.EndTime.Value.ToLocalTime()
) )
.Sum(it => it.PolishNumber) ?? 0; .Where(it => it.GroupSort == 1)
gP12PolishTotal = gP12PolishTotal / 3; .Sum(it => it.PolishNumber) ?? 0;
// 抛光总投入数 // 抛光总投入数
int polishRequireTotal = int polishRequireTotal =
Context Context
@@ -1997,8 +1997,8 @@ namespace ZR.Service.mes.qc
query.EndTime != null, query.EndTime != null,
it => it.StartTime <= query.EndTime.Value.ToLocalTime() it => it.StartTime <= query.EndTime.Value.ToLocalTime()
) )
.Sum(it => it.RequireNumber) ?? 0; .Where(it => it.GroupSort == 1)
gP12RequireTotal = gP12RequireTotal / 3; .Sum(it => it.RequireNumber) ?? 0;
// 后道直接出库 // 后道直接出库
int afterPolishOutTotal = int afterPolishOutTotal =
Context Context
@@ -2069,8 +2069,8 @@ namespace ZR.Service.mes.qc
) )
.Where(it => it.StartTime >= boardData.PolishStockTime) .Where(it => it.StartTime >= boardData.PolishStockTime)
.Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime()) .Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime())
.Sum(it => it.PolishNumber) ?? 0; .Where(it => it.GroupSort == 1)
gP12PolishTotal2 = gP12PolishTotal2 / 3; .Sum(it => it.PolishNumber) ?? 0;
// 抛光总投入数 // 抛光总投入数
int polishRequireTotal2 = int polishRequireTotal2 =
Context Context
@@ -2144,9 +2144,9 @@ namespace ZR.Service.mes.qc
it => it.PartNumber == query.Partnumber it => it.PartNumber == query.Partnumber
) )
.Where(it => it.StartTime >= boardData.OneTimeStockTime) .Where(it => it.StartTime >= boardData.OneTimeStockTime)
.Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime()) .Where(it => it.GroupSort == 1)
.Where(it => it.StartTime <= query.StartTime.Value.ToLocalTime())
.Sum(it => it.RequireNumber) ?? 0; .Sum(it => it.RequireNumber) ?? 0;
gP12RequireTotal2 = gP12RequireTotal2 / 3;
// 后道直接出库 // 后道直接出库
int afterPolishOutTotal2 = int afterPolishOutTotal2 =
Context Context

7
ZR.Service/mes/wms/WmOneTimeInventoryService.cs
View File

@@ -294,7 +294,7 @@ namespace ZR.Service.mes.wms
//.Where(it => it.Code == "自动") //.Where(it => it.Code == "自动")
.Where(it => it.ActionTime >= minDateTime) .Where(it => it.ActionTime >= minDateTime)
.ToList(); .ToList();
foreach (WmOneTimeInventoryDto item in list) foreach (WmOneTimeInventoryDto item in list)
{ {
int? runum = wmOneTimeRecords int? runum = wmOneTimeRecords
.Where(o => .Where(o =>
@@ -314,10 +314,10 @@ namespace ZR.Service.mes.wms
.Sum(); .Sum();
item.RealQuantity = item.Quantity.Value + (runum.Value - chunum.Value); item.RealQuantity = item.Quantity.Value + (runum.Value - chunum.Value);
} }
list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0) list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0)
.Where(it => !string.IsNullOrEmpty(it.Partnumber)) .Where(it => !string.IsNullOrEmpty(it.Partnumber))
.DistinctBy(it => it.Partnumber) .DistinctBy(it => it.Partnumber)
.OrderBy(it => it.RealQuantity)
.ToList(); .ToList();
int total = list.Count; int total = list.Count;
@@ -335,7 +335,8 @@ namespace ZR.Service.mes.wms
StocktakingTotal = StocktakingTotal, StocktakingTotal = StocktakingTotal,
QuantitySum = QuantitySum, QuantitySum = QuantitySum,
RealQuantitySum = RealQuantitySum, RealQuantitySum = RealQuantitySum,
Result = list.Skip((parm.PageNum - 1) * parm.PageSize) MinStocktakingTime = minDateTime,
Result = list.Skip((parm.PageNum - 1) * parm.PageSize)
.Take(parm.PageSize) .Take(parm.PageSize)
.ToList(), .ToList(),
}; };

15
ZR.Service/mes/wms/WmOneTimeRecordService.cs
View File

@@ -40,10 +40,10 @@ namespace ZR.Service.mes.wms
) )
.AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark)) .AndIF(!string.IsNullOrEmpty(parm.Remark), it => it.Remark.Contains(parm.Remark))
.AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code)) .AndIF(!string.IsNullOrEmpty(parm.Code), it => it.Code.Contains(parm.Code))
.AndIF( /*.AndIF(
!string.IsNullOrEmpty(parm.FkInventoryId), !string.IsNullOrEmpty(parm.FkInventoryId),
it => it.FkInventoryId == parm.FkInventoryId it => it.FkInventoryId == parm.FkInventoryId
) )*/
.AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id) .AndIF(!string.IsNullOrEmpty(parm.Id), it => it.Id == parm.Id)
.AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType) .AndIF(parm.ChangeType > -1, it => it.ChangeType == parm.ChangeType)
.AndIF( .AndIF(
@@ -137,7 +137,8 @@ namespace ZR.Service.mes.wms
.Where(it => !it.ProductDescription.Contains("倒车雷达")) .Where(it => !it.ProductDescription.Contains("倒车雷达"))
.Where(it => it.StartTime >= parm.StartTime) .Where(it => it.StartTime >= parm.StartTime)
.Where(it => it.QualifiedNumber > 0) .Where(it => it.QualifiedNumber > 0)
.ToList(); .Where(it => it.Remark == "抛光")
.ToList();
//TODO 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数 //TODO 入库条件2 抛光合格品 wm_polish_work_quality_statistics 合格数
List<WmPolishWorkQualityStatistics> wmPolishWorkQualityStatistics = Context List<WmPolishWorkQualityStatistics> wmPolishWorkQualityStatistics = Context
@@ -189,7 +190,7 @@ namespace ZR.Service.mes.wms
ChangeQuantity = item.QualifiedNumber, ChangeQuantity = item.QualifiedNumber,
ActionTime = item.StartTime, ActionTime = item.StartTime,
Status = 1, Status = 1,
Remark = "产线合格品 合格数" Remark = "产线报表合格品自动入库,来源工单号:" + item.WorkorderId
} }
); );
} }
@@ -207,7 +208,7 @@ namespace ZR.Service.mes.wms
ChangeQuantity = item.QualifiedNumber, ChangeQuantity = item.QualifiedNumber,
ActionTime = item.StartTime, ActionTime = item.StartTime,
Status = 1, Status = 1,
Remark = "抛光合格品 合格数" Remark = "抛光报表合格品自动入库"
} }
); );
} }
@@ -225,7 +226,7 @@ namespace ZR.Service.mes.wms
ChangeQuantity = item.RequireNumber, ChangeQuantity = item.RequireNumber,
ActionTime = item.StartTime, ActionTime = item.StartTime,
Status = 1, Status = 1,
Remark = "触摸屏投入数" Remark = "GP12触摸屏报表投入自动出库"
} }
); );
} }
@@ -243,7 +244,7 @@ namespace ZR.Service.mes.wms
ChangeQuantity = item.RequireNumber, ChangeQuantity = item.RequireNumber,
ActionTime = item.StartTime, ActionTime = item.StartTime,
Status = 1, Status = 1,
Remark = "后道投入数" Remark = "后道报表自动出库"
} }
); );
} }

1
ZR.Service/mes/wms/WmPolishInventoryService.cs
View File

@@ -336,6 +336,7 @@ namespace ZR.Service.mes.wms
list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0) list = list.Where(it => it.RealQuantity != 0 || it.Quantity != 0)
.Where(it => !string.IsNullOrEmpty(it.Partnumber)) .Where(it => !string.IsNullOrEmpty(it.Partnumber))
.DistinctBy(it => it.Partnumber) .DistinctBy(it => it.Partnumber)
.OrderBy(it => it.RealQuantity)
.ToList(); .ToList();
int total = list.Count; int total = list.Count;

15
ZR.Service/mes/wms/WmPolishRecordService.cs
View File

@@ -131,6 +131,7 @@ namespace ZR.Service.mes.wms
.Where(it => !it.ProductDescription.Contains("倒车雷达")) .Where(it => !it.ProductDescription.Contains("倒车雷达"))
.Where(it => it.StartTime >= parm.StartTime) .Where(it => it.StartTime >= parm.StartTime)
.Where(it => it.PaoguangTotal > 0) .Where(it => it.PaoguangTotal > 0)
.Where(it=> it.Remark == "抛光")
.ToList(); .ToList();
// 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics // 后道报表 根据日期范围 去取后道反抛光的数据 wm_polish_quality_statistics
@@ -156,8 +157,8 @@ namespace ZR.Service.mes.wms
.Where(it => it.PolishNumber > 0) .Where(it => it.PolishNumber > 0)
.ToList(); .ToList();
//qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList(); //qcGp12ServiceStatistics = qcGp12ServiceStatistics.DistinctBy(o => o.PartNumber).ToList();
//TODO 旧数据先不使用
List<WmGp12QualityStatistics> wmGp12QualityStatistics = Context /*List<WmGp12QualityStatistics> wmGp12QualityStatistics = Context
.Queryable<WmGp12QualityStatistics>() .Queryable<WmGp12QualityStatistics>()
.WhereIF( .WhereIF(
!string.IsNullOrEmpty(parm.Partnumber), !string.IsNullOrEmpty(parm.Partnumber),
@@ -165,7 +166,7 @@ namespace ZR.Service.mes.wms
) )
.Where(it => it.StartTime >= parm.StartTime) .Where(it => it.StartTime >= parm.StartTime)
.Where(it => it.PaoguangTotal > 0) .Where(it => it.PaoguangTotal > 0)
.ToList(); .ToList();*/
//二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据 //二出（同一张表）wm_polish_work_quality_statistics 根据日期范围 去取抛光操作出库的数据
List<WmPolishWorkQualityStatistics> wmPolishWorkQualityStatistics = Context List<WmPolishWorkQualityStatistics> wmPolishWorkQualityStatistics = Context
@@ -182,7 +183,7 @@ namespace ZR.Service.mes.wms
qcQualityStatisticsFirsts.Count qcQualityStatisticsFirsts.Count
+ wmPolishQualityStatistics.Count + wmPolishQualityStatistics.Count
+ qcGp12ServiceStatistics.Count + qcGp12ServiceStatistics.Count
+ wmGp12QualityStatistics.Count //+ wmGp12QualityStatistics.Count
+ wmPolishWorkQualityStatistics.Count; + wmPolishWorkQualityStatistics.Count;
#region 组装 WmPolishRecord 实体 #region 组装 WmPolishRecord 实体
@@ -202,7 +203,7 @@ namespace ZR.Service.mes.wms
ChangeQuantity = item.PaoguangTotal, ChangeQuantity = item.PaoguangTotal,
ActionTime = item.StartTime, ActionTime = item.StartTime,
Status = 1, Status = 1,
Remark = "产线触摸屏报表抛光件自动入库" Remark = "产线报表抛光件自动入库，来源工单："+item.WorkorderId
} }
); );
} }
@@ -243,7 +244,7 @@ namespace ZR.Service.mes.wms
); );
} }
foreach (var item in wmGp12QualityStatistics) /*foreach (var item in wmGp12QualityStatistics)
{ {
wmPolishRecords.Add( wmPolishRecords.Add(
new WmPolishRecord new WmPolishRecord
@@ -259,7 +260,7 @@ namespace ZR.Service.mes.wms
Remark = " GP12手填报表抛光件自动入库" Remark = " GP12手填报表抛光件自动入库"
} }
); );
} }*/
foreach (var item in wmPolishWorkQualityStatistics) foreach (var item in wmPolishWorkQualityStatistics)
{ {