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

BUG修改

Browse Source
This commit is contained in:
赵正易
2025-04-15 14:34:04 +08:00
parent c4eed6c31d
commit 3e26937d93
8 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/qc/FQC/QCStatisticsController.cs
View File

@@ -125,7 +125,7 @@ namespace ZR.Admin.WebApi.Controllers.mes.qc.FQC
"水斑", "脏点", "变形","油珠","脱落","撞伤","其他",
"毛刺", "缩印", "擦伤","砂印","流痕","开裂",
"流挂", "色漆 缺漆", "清漆缺漆","桔皮","其他",
"下件擦伤", "清漆漆块", "色漆漆块","发花","亮斑","喷漏",};
"下件擦伤", "清漆漆块", "色漆漆块","发花","停机","喷漏",};
// 标题列位于第几行
int startTitle = 0;
if (isShowDetail)

2
ZR.Model/MES/qc/QcQualityStatisticsAgain.cs
View File

@@ -235,7 +235,7 @@
[SugarColumn(ColumnName = "team_fahua")]
public int? TeamFahua { get; set; }
/// <summary>
/// 班组操作-亮斑
/// 班组操作-亮斑 改为停机
///</summary>
[SugarColumn(ColumnName = "team_liangbang")]
public int? TeamLiangbang { get; set; }

2
ZR.Service/mes/echarts/FQCEchartsService.cs
View File

@@ -346,7 +346,7 @@ namespace ZR.Service.MES.md
"清漆漆块",
"色漆漆块",
"发花",
"亮斑",
"停机",
"喷漏",
};
string[] detailColDict =

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

@@ -47,11 +47,11 @@ namespace ZR.Service.mes.qc
.Create<QcQualityStatisticsFirst>()
//XXX:修改查询日期查询的字段
.AndIF(
starttime > new DateTime(2023, 1, 1, 0, 0, 0),
starttime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime >= starttime.ToLocalTime()
)
.AndIF(
endTime > new DateTime(2023, 1, 1, 0, 0, 0),
endTime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime <= endTime.ToLocalTime()
)
.AndIF(
@@ -130,11 +130,11 @@ namespace ZR.Service.mes.qc
.Create<QcQualityStatisticsAgain>()
//XXX:修改查询日期查询的字段
.AndIF(
starttime > new DateTime(2023, 1, 1, 0, 0, 0),
starttime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime >= starttime.ToLocalTime()
)
.AndIF(
endTime > new DateTime(2023, 1, 1, 0, 0, 0),
endTime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime <= endTime.ToLocalTime()
)
.AndIF(
@@ -213,11 +213,11 @@ namespace ZR.Service.mes.qc
.Create<QcQualityStatisticsFinal>()
//XXX:修改查询日期查询的字段
.AndIF(
starttime > new DateTime(2023, 1, 1, 0, 0, 0),
starttime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime >= starttime.ToLocalTime()
)
.AndIF(
endTime > new DateTime(2023, 1, 1, 0, 0, 0),
endTime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime <= endTime.ToLocalTime()
)
.AndIF(
@@ -296,11 +296,11 @@ namespace ZR.Service.mes.qc
.Create<QcQualityStatisticsTotal>()
//XXX:修改查询日期查询的字段
.AndIF(
starttime > new DateTime(2023, 1, 1, 0, 0, 0),
starttime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime >= starttime.ToLocalTime()
)
.AndIF(
endTime > new DateTime(2023, 1, 1, 0, 0, 0),
endTime > DateTime.MinValue && string.IsNullOrEmpty(workorderid),
it => it.StartTime <= endTime.ToLocalTime()
)
.AndIF(

4
ZR.Service/mes/qc/QcGp12Service.cs
View File

@@ -439,6 +439,10 @@ namespace ZR.Service.Business
{
try
{
if(string.IsNullOrEmpty(data.DefectCode))
{
throw new Exception("缺陷项传入为空！");
}
Context.Ado.BeginTran();
DateTime nowTime = DateTime.Now;
// 获取缺陷信息

18
ZR.Service/mes/wms/WmBlankRecordService.cs
View File

@@ -334,17 +334,19 @@ namespace ZR.Service.mes.wms
throw new Exception("工单记录不存在！" + workOrderId);
}
//TODO 20250325 remark1 存在不扣，则不扣除
if (workOrderInfo.Remark1.Contains("不扣"))
if (workOrderInfo.Remark1 != null)
{
Context.Ado.CommitTran();
return 0;
if (workOrderInfo.Remark1.Contains("不扣"))
{
Context.Ado.RollbackTran();
return 0;
}
if (workOrderInfo.Remark1.Contains("返工"))
{
type = 2;
}
}
if (workOrderInfo.Remark1.Contains("返工"))
{
type = 2;
}
// 根据工单查看毛坯库存数据记录
WmBlankInventory blankInventory = Context
.Queryable<WmBlankInventory>()

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

@@ -242,6 +242,8 @@ namespace ZR.Service.mes.wms
.Queryable<WmMaterial>()
.LeftJoin<WmOneTimeInventory>((m, p) => m.Partnumber == p.Partnumber)
.Distinct()
.Where((m, p) => !m.Description.Contains("倒车雷达"))
.Where((m, p) => !m.Description.Contains("AH8"))
.WhereIF(
!string.IsNullOrEmpty(parm.Description),
(m, p) => m.Description.Contains(parm.Description)

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

@@ -258,6 +258,8 @@ namespace ZR.Service.mes.wms
.Queryable<WmMaterial>()
.LeftJoin<WmPolishInventory>((m, p) => m.Partnumber == p.Partnumber)
.Distinct()
.Where((m, p) => !m.Description.Contains("倒车雷达"))
.Where((m, p) => !m.Description.Contains("AH8"))
.WhereIF(
!string.IsNullOrEmpty(parm.Description),
(m, p) => m.Description.Contains(parm.Description)