From f3ac4e7983dd475d800acc31cbbb8bbaf2e6c638 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 29 8月 2024 15:08:18 +0800
Subject: [PATCH] 修复 OP05工位 获取打标二维码，会漏获取数据
---
iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
index 00a3cf9..4923d49 100644
--- a/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
+++ b/iWara.SCADA.Code/iWare.Wms.Application/Service/QualityDataInfo/QualityDataInfoService.cs
@@ -137,6 +137,24 @@
QualityOP80To8 = m.a.QualityOP80To8,
QualityOP80To9 = m.a.QualityOP80To9,
QualityOP80To10 = m.a.QualityOP80To10,
+
+ //鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024 - 06 - 13銆�
+ QualityOP80_Houdu = m.a.QualityOP80_Houdu,
+ QualityOP80_ZXJ = m.a.QualityOP80_ZXJ,
+ QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD,
+ QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD,
+ QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD,
+ QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ,
+ QualityOP80_D_S_X = m.a.QualityOP80_D_S_X,
+ QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y,
+ QualityOP80_D_X_X = m.a.QualityOP80_D_X_X,
+ QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y,
+ QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ,
+ QualityOP80_X_S_X = m.a.QualityOP80_X_S_X,
+ QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y,
+ QualityOP80_X_X_X = m.a.QualityOP80_X_X_X,
+ QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y,
+
Remarks = m.a.Remarks,
})
//.OrderBy(PageInputOrder.OrderBuilder<QualityDataInfoSearch>(input))
@@ -247,13 +265,55 @@
OP30QualityStateCH5 = m.a.OP30QualityStateCH5,
OP30QualityStateCH6 = m.a.OP30QualityStateCH6,
+ //鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024 - 06 - 13銆�
+ QualityOP80_Houdu = m.a.QualityOP80_Houdu,
+ QualityOP80_ZXJ = m.a.QualityOP80_ZXJ,
+ QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD,
+ QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD,
+ QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD,
+ QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ,
+ QualityOP80_D_S_X = m.a.QualityOP80_D_S_X,
+ QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y,
+ QualityOP80_D_X_X = m.a.QualityOP80_D_X_X,
+ QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y,
+ QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ,
+ QualityOP80_X_S_X = m.a.QualityOP80_X_S_X,
+ QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y,
+ QualityOP80_X_X_X = m.a.QualityOP80_X_X_X,
+ QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y,
+
Remarks = m.a.Remarks,
UpdateTime = m.a.UpdatedTime,
})
- .ProjectToType<QualityDataInfoOutput>()
- .OrderByDescending(o => o.UpdateTime)
- .ToADPagedListAsync(input.PageNo, input.PageSize);
- return qualityDataInfos;
+ .ProjectToType<QualityDataInfoOutput>().ToListAsync();
+
+ if (input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP10"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP10QualityReceiveTime).ToList();
+ }
+ else if (input.EquipmentID.Equals("EOP10") && !string.IsNullOrEmpty(input.WorkingProcedure) && input.WorkingProcedure.Equals("OP40"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP40QualityReceiveTime).ToList();
+ }
+ else if (input.EquipmentID.Equals("EOP20"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP20QualityReceiveTime).ToList();
+ }
+ else if (input.EquipmentID.Equals("EOP30"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP30QualityReceiveTime).ToList();
+ }
+ else if (input.EquipmentID.Equals("EOP60"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP60QualityReceiveTime).ToList();
+ }
+ else if (input.EquipmentID.Equals("EOP80"))
+ {
+ qualityDataInfos = qualityDataInfos.OrderByDescending(x => x.OP80QualityReceiveTime).ToList();
+ }
+
+ var retData = qualityDataInfos.ToADPagedList(input.PageNo, input.PageSize);
+ return retData;
}
@@ -348,6 +408,24 @@
OP35QualityState = m.a.OP35QualityState,
OP60QualityState = m.a.OP60QualityState,
OP80QualityState = m.a.OP80QualityState,
+
+ //鏂板OP80鐨勪竴浜涜川閲忔暟鎹� 銆怑ditby shaocx,2024 - 06 - 13銆�
+ QualityOP80_Houdu = m.a.QualityOP80_Houdu,
+ QualityOP80_ZXJ = m.a.QualityOP80_ZXJ,
+ QualityOP80_DTKYZD = m.a.QualityOP80_DTKYZD,
+ QualityOP80_XTSMYD = m.a.QualityOP80_XTSMYD,
+ QualityOP80_XTXMYD = m.a.QualityOP80_XTXMYD,
+ QualityOP80_D_TKZJ = m.a.QualityOP80_D_TKZJ,
+ QualityOP80_D_S_X = m.a.QualityOP80_D_S_X,
+ QualityOP80_D_S_Y = m.a.QualityOP80_D_S_Y,
+ QualityOP80_D_X_X = m.a.QualityOP80_D_X_X,
+ QualityOP80_D_X_Y = m.a.QualityOP80_D_X_Y,
+ QualityOP80_X_TKZJ = m.a.QualityOP80_X_TKZJ,
+ QualityOP80_X_S_X = m.a.QualityOP80_X_S_X,
+ QualityOP80_X_S_Y = m.a.QualityOP80_X_S_Y,
+ QualityOP80_X_X_X = m.a.QualityOP80_X_X_X,
+ QualityOP80_X_X_Y = m.a.QualityOP80_X_X_Y,
+
Remarks = m.a.Remarks,
UpdateTime = m.a.UpdatedTime,
})
--
Gitblit v1.9.3