记录检测功能增加，毛坯扣除添加不扣逻辑
This commit is contained in:
parent
c12d428650
commit
0526dcb908
@ -228,5 +228,18 @@ namespace ZR.Admin.WebApi.Controllers
|
||||
var result = ExportExcelMini(list, "wm_one_time_inventory", "一次合格品仓库数据");
|
||||
return ExportExcel(result.Item2, result.Item1);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 一次合格品仓库数据导出
|
||||
/// </summary>
|
||||
/// <param name="parm"></param>
|
||||
/// <returns></returns>
|
||||
[HttpGet("ErrorCheck")]
|
||||
[AllowAnonymous]
|
||||
public IActionResult ErrorCheck()
|
||||
{
|
||||
var list = _WmOneTimeInventoryService.CheckErrorTable();
|
||||
return SUCCESS(list);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -70,6 +70,15 @@ namespace ZR.Model.MES.wms.Dto
|
||||
public List<WmOneTimeInventoryDto> Result { get; set; }
|
||||
}
|
||||
|
||||
public class ErrorCheckTableDto
|
||||
{
|
||||
public string Name { get; set; }
|
||||
public string Partnumber { get; set; }
|
||||
public string Description { get; set; }
|
||||
public string ErrorMessage { get; set; }
|
||||
public DateTime CheckTime { get; set; }
|
||||
}
|
||||
|
||||
// 一次合格(产成品)导出
|
||||
[SugarTable("wm_one_time_record", "一次合格表")]
|
||||
public class WmOneTimeInventoryExportDto
|
||||
|
||||
@ -59,5 +59,13 @@ namespace ZR.Service.mes.wms.IService
|
||||
/// <returns></returns>
|
||||
public (string, object, object) ImportExcel(List<WmOneTimeInventoryExportDto> excel);
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 检查一次合格品记录，抛光记录错误原因
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public List<ErrorCheckTableDto> CheckErrorTable();
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -326,11 +326,21 @@ namespace ZR.Service.mes.wms
|
||||
.Queryable<ProWorkorder_v2>()
|
||||
.Where(it => it.ClientWorkorder == workOrderId)
|
||||
.First();
|
||||
|
||||
|
||||
if (workOrderInfo == null)
|
||||
{
|
||||
Context.Ado.RollbackTran();
|
||||
throw new Exception("工单记录不存在！" + workOrderId);
|
||||
}
|
||||
//TODO 20250325 remark1 存在不扣，则不扣除
|
||||
if (workOrderInfo.Remark1.Contains("不扣"))
|
||||
{
|
||||
Context.Ado.CommitTran();
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
if (workOrderInfo.Remark1.Contains("返工"))
|
||||
{
|
||||
type = 2;
|
||||
|
||||
@ -231,8 +231,6 @@ namespace ZR.Service.mes.wms
|
||||
return response;*/
|
||||
}
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 查询一次合格品仓库列表
|
||||
/// </summary>
|
||||
@ -341,8 +339,6 @@ namespace ZR.Service.mes.wms
|
||||
.ToList(),
|
||||
};
|
||||
return response;
|
||||
|
||||
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@ -767,7 +763,10 @@ namespace ZR.Service.mes.wms
|
||||
// 获取报表数据
|
||||
// 一次合格计算后库存 = 盘点库存 + 产线合格 + 抛光合格 - gp12投入 - 后道直接出库
|
||||
//return commonFQCService.GetBatchOneTimePartRealStock(partnumbers, checkTime.Value);
|
||||
return commonFQCService.GetBatchOneTimePartRealStockNew(partnumbers, checkTime.Value);
|
||||
return commonFQCService.GetBatchOneTimePartRealStockNew(
|
||||
partnumbers,
|
||||
checkTime.Value
|
||||
);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
@ -832,5 +831,141 @@ namespace ZR.Service.mes.wms
|
||||
|
||||
return (msg, x.ErrorList, x.IgnoreList);
|
||||
}
|
||||
|
||||
public List<ErrorCheckTableDto> CheckErrorTable()
|
||||
{
|
||||
List<ErrorCheckTableDto> errorCheckTableDtos = new List<ErrorCheckTableDto>();
|
||||
|
||||
// 盘点数据的零件号与物料内零件号不匹配异常进行检查
|
||||
// 获取物料列表并将零件号提取到 HashSet 中以进行快速查找
|
||||
HashSet<string> materialPartnumbers =
|
||||
new(GetWmMaterialList("").Select(m => m.Partnumber));
|
||||
List<WmOneTimeInventory> oneTimeInventoryList = Context
|
||||
.Queryable<WmOneTimeInventory>()
|
||||
.ToList();
|
||||
List<WmPolishInventory> polishInventoryList = Context
|
||||
.Queryable<WmPolishInventory>()
|
||||
.ToList();
|
||||
foreach (var inventoryItem in oneTimeInventoryList)
|
||||
{
|
||||
if (!materialPartnumbers.Contains(inventoryItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "零件号不存在",
|
||||
Partnumber = inventoryItem.Partnumber,
|
||||
Description = "该零件号在物料列表中不存在。",
|
||||
ErrorMessage = "检测到【一次合格盘点记录】中的零件号不匹配。",
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
foreach (var inventoryItem in polishInventoryList)
|
||||
{
|
||||
if (!materialPartnumbers.Contains(inventoryItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "零件号不存在",
|
||||
Partnumber = inventoryItem.Partnumber,
|
||||
Description = "该零件号在物料列表中不存在。",
|
||||
ErrorMessage = "检测到【抛光品盘点记录】中的零件号不匹配。",
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
DateTime minOneTimeStocktakingTime =
|
||||
oneTimeInventoryList.Min(x => x.CreatedTime) ?? DateTime.Now;
|
||||
DateTime minPolishStocktakingTime =
|
||||
polishInventoryList.Min(x => x.CreatedTime) ?? DateTime.Now;
|
||||
|
||||
List<WmOneTimeRecord> oneTimeRecordList = Context
|
||||
.Queryable<WmOneTimeRecord>()
|
||||
.Where(it => it.ActionTime >= minOneTimeStocktakingTime)
|
||||
.ToList();
|
||||
List<WmPolishRecord> polishRecordList = Context
|
||||
.Queryable<WmPolishRecord>()
|
||||
.Where(it => it.ActionTime >= minPolishStocktakingTime)
|
||||
.ToList();
|
||||
|
||||
foreach (var recordItem in oneTimeRecordList)
|
||||
{
|
||||
if (!materialPartnumbers.Contains(recordItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "零件号不存在",
|
||||
Partnumber = recordItem.Partnumber,
|
||||
Description = "该零件号在物料列表中不存在。",
|
||||
ErrorMessage = "检测到【一次合格品报表】中的零件号不匹配。记录时间:" + recordItem.ActionTime,
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var recordItem in polishRecordList)
|
||||
{
|
||||
if (!materialPartnumbers.Contains(recordItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "零件号不存在",
|
||||
Partnumber = recordItem.Partnumber,
|
||||
Description = "该零件号在物料列表中不存在。",
|
||||
ErrorMessage = "检测到【抛光品报表】中的零件号不匹配。记录时间:" + recordItem.ActionTime,
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
//TODO 判断oneTimeRecordList中是否存在oneTimeInventoryList没有的零件号
|
||||
// 提取 oneTimeInventoryList 中的所有零件号
|
||||
HashSet<string> oneTimeInventoryPartnumbers = new HashSet<string>(oneTimeInventoryList.Select(i => i.Partnumber));
|
||||
foreach (var recordItem in oneTimeRecordList)
|
||||
{
|
||||
if (!oneTimeInventoryPartnumbers.Contains(recordItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "该零件号记录丢失",
|
||||
Partnumber = recordItem.Partnumber,
|
||||
Description = "该零件号与盘点数据不匹配。请确认情况，是否未盘点到！",
|
||||
ErrorMessage = $"检测到【一次合格品记录】中的零件号在盘点清单中不存在。记录时间: {recordItem.ActionTime}",
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
//TODO 判断polishRecordList中是否存在polishInventoryList没有的零件号
|
||||
HashSet<string> polishInventoryPartnumbers = new HashSet<string>(polishInventoryList.Select(i => i.Partnumber));
|
||||
foreach (var recordItem in polishRecordList)
|
||||
{
|
||||
if (!polishInventoryPartnumbers.Contains(recordItem.Partnumber))
|
||||
{
|
||||
errorCheckTableDtos.Add(
|
||||
new ErrorCheckTableDto
|
||||
{
|
||||
Name = "该零件号记录丢失",
|
||||
Partnumber = recordItem.Partnumber,
|
||||
Description = "该零件号与盘点数据不匹配。请确认情况，是否未盘点到！",
|
||||
ErrorMessage = $"检测到【抛光品记录】中的零件号在盘点清单中不存在。记录时间: {recordItem.ActionTime}",
|
||||
CheckTime = DateTime.Now
|
||||
}
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
return errorCheckTableDtos;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -116,6 +116,7 @@ namespace ZR.Tasks.TaskScheduler
|
||||
.And(it => it.Year == year)
|
||||
.And(it => it.Week == week)
|
||||
.And(it => it.Date == date)
|
||||
.And(it => !it.Remark1.Contains("不扣"))
|
||||
.And(it => it.Remark2.Contains("调试"))
|
||||
// .And(it => it.Remark3 == "是")
|
||||
.ToExpression();
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user