From 7f973db754fe5746b48b6b90a1a6e05cb7b8ed24 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 17 十月 2025 10:25:38 +0800
Subject: [PATCH] 如果有报工记录，那么初始始采集数为：上一次报工时间后最近一条齿轮数采表的采集数量
---
Services/WomdaaManager.cs | 108 ++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 80 insertions(+), 28 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 303cb2a..019afce 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -91,8 +91,7 @@
{
// 鏌ヨ闇�瑕佹樉绀虹殑宸ュ崟ID
var ids = Db.Queryable<MesOrderSelect>()
- .Where(b => b.MachineNo == query.machineNo
- && b.IsShow == 0)
+ .Where(b => b.MachineNo == query.machineNo && b.IsShow == 0)
.Select(s => s.OrderId)
.ToList();
@@ -104,12 +103,72 @@
if (decimals.Count == 0)
return new List<VOrderBycl>();
- // 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟
- return Db.Queryable<VOrderBycl>()
+ // 鏌ヨ榻胯疆鏁伴噰琛�
+ var numericalList = Db.Queryable<MesNumericalBycl>()
+ .Where(x => ids.Contains(x.OrderId ?? 0))
+ .OrderBy(x => x.CjTiem)
+ .ToList();
+
+ var vOrderBycl = new VOrderBycl();
+ if (numericalList.Count > 0)
+ {
+ // 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
+ vOrderBycl.StartCjNum = numericalList.First().CjNum ?? 0;
+ // 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
+ vOrderBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
+ }
+ else
+ {
+ vOrderBycl.StartCjNum = 0;
+ vOrderBycl.CurrentCjNum = 0;
+ }
+
+ // 鏌ヨ鎶ュ伐璁板綍锛岃幏鍙栨渶鍚庝竴娆℃姤宸ユ椂闂�
+ var lastReport = Db.Queryable<MesReporting>()
+ .Where(r => r.BillNo != null && r.BillNo.Contains(query.orderNo))
+ .OrderBy(r => r.BgDate, OrderByType.Desc)
+ .First();
+
+ if (lastReport == null)
+ {
+ // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
+ vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
+ }
+ else
+ {
+ // 鏈夋姤宸ヨ褰曪紝鍒濆閲囬泦鏁颁负涓婁竴娆℃姤宸ユ椂闂村悗鏈�杩戜竴鏉￠娇杞暟閲囪〃鐨勯噰闆嗘暟閲�
+ var afterReportNum = numericalList
+ .Where(x =>
+ DateTime.TryParse(x.CjTiem, out var cjTiemDt) &&
+ lastReport.BgDate.HasValue &&
+ cjTiemDt > lastReport.BgDate.Value)
+ .OrderBy(x => DateTime.Parse(x.CjTiem))
+ .FirstOrDefault();
+
+ vOrderBycl.InitCjNum = afterReportNum?.CjNum ?? vOrderBycl.StartCjNum;
+ }
+
+ var startCjNum = vOrderBycl.StartCjNum;
+ var currentCjNum = vOrderBycl.CurrentCjNum;
+ var initCjNum = vOrderBycl.InitCjNum;
+
+ // 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟锛屽彧鍙栨渶鏂颁竴鏉�
+ var orders = Db.Queryable<VOrderBycl>()
.Where(c =>
decimals.Contains(c.ID) &&
(c.EditDate == date || c.EditDate == null))
+ .OrderBy(c => c.EditDate, OrderByType.Desc)
+ .Take(1)
.ToList();
+
+ foreach (var order in orders)
+ {
+ order.StartCjNum = startCjNum;
+ order.CurrentCjNum = currentCjNum;
+ order.InitCjNum = initCjNum;
+ }
+
+ return orders;
}
/// <summary>
@@ -171,31 +230,24 @@
var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);
VOrdrerBycl.finalResult = sqlQuerySingle;
- // 鏂板锛氭煡璇㈡暟閲囪褰曪紙澶勭悊鍚屼竴CjNum鍦ㄤ笉鍚屾椂闂撮噸澶嶇殑鎯呭喌锛�
- var baseQuery = Db.Queryable<MesNumericalBycl>()
- .Where(n => n.OrderId == Convert.ToDecimal(query.OrderId)
- && n.MachineNo == VOrdrerBycl.MachineNo
- && !string.IsNullOrEmpty(n.CjTiem));
+ // 鏌ヨMES_NUMERICAL_BYCL琛紝鑾峰彇寮�宸ユ暟閲囧拰褰撳墠鏁伴噰
+ var numericalList = Db.Queryable<MesNumericalBycl>()
+ .Where(x => x.OrderId == VOrdrerBycl.ID)
+ .OrderBy(x => x.CjTiem)
+ .ToList();
- // 鏈�鏃╀竴鏉¤褰曪紙鎸夐噰闆嗘椂闂村崌搴忥級
- var startRecord = baseQuery
- .OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss"))
- .Select(n => new { n.CjNum, n.CjTiem })
- .First();
-
- // 鏈�鏂版椂闂寸偣鐨勮褰曪紙鎸夐噰闆嗘椂闂撮檷搴忓彇鏁存潯锛�
- var latestRecord = baseQuery
- .OrderBy(n => SqlFunc.Oracle_ToDate(n.CjTiem, "yyyy-MM-dd HH24:mi:ss"), OrderByType.Desc)
- .Select(n => new { n.CjNum, n.CjTiem })
- .First();
-
- // 鎵�鏈夎褰曚腑鐨勬渶澶jNum锛堝鏋滈渶瑕佲�滃綋鍓嶇疮璁℃渶澶у�尖�濓級
- var maxCjNum = baseQuery.Max(n => n.CjNum);
-
- // 濡傛灉甯屾湜鈥滃綋鍓嶆暟閲団�濇樉绀烘渶鏂版椂闂村搴旂殑CjNum锛岀敤 latestRecord.CjNum
- // 濡傛灉甯屾湜鏄剧ず绱鏈�澶у�硷紙澶勭悊鍚屼竴缂栧彿澶氭鍑虹幇锛夛紝鐢� maxCjNum
- VOrdrerBycl.StartCjNum = startRecord?.CjNum;
- VOrdrerBycl.CurrentCjNum = latestRecord?.CjNum; // 鎴栨浛鎹负 maxCjNum 鏍规嵁涓氬姟瀹氫箟
+ if (numericalList.Count > 0)
+ {
+ // 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
+ VOrdrerBycl.StartCjNum = numericalList.First().CjNum ?? 0;
+ // 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
+ VOrdrerBycl.CurrentCjNum = numericalList.Last().CjNum ?? 0;
+ }
+ else
+ {
+ VOrdrerBycl.StartCjNum = 0;
+ VOrdrerBycl.CurrentCjNum = 0;
+ }
return VOrdrerBycl;
}
--
Gitblit v1.9.3