From 1005018634c9e17ae29e862c016c30fe4c8a4a45 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 16 十月 2025 15:56:06 +0800
Subject: [PATCH] 添加开工数采与当前数采逻辑
---
Entites/DbModels/VOrderBycl.cs | 4 ++++
Services/WomdaaManager.cs | 15 +++++++++++++--
2 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/Entites/DbModels/VOrderBycl.cs b/Entites/DbModels/VOrderBycl.cs
index 66ecb49..80dc219 100644
--- a/Entites/DbModels/VOrderBycl.cs
+++ b/Entites/DbModels/VOrderBycl.cs
@@ -191,4 +191,8 @@
[SugarColumn(IsIgnore = true)] public decimal? wjQty { get; set; }
[SugarColumn(IsIgnore = true)] public string? finalResult { get; set; }
+
+ // 鏂板锛氬紑宸ユ暟閲�(鏈�鏃╅噰闆嗗��)銆佸綋鍓嶆暟閲�(鏈�鏂伴噰闆嗗��)
+ [SugarColumn(IsIgnore = true)] public long? StartCjNum { get; set; }
+ [SugarColumn(IsIgnore = true)] public long? CurrentCjNum { get; set; }
}
\ No newline at end of file
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index eb45acb..2019ea2 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -160,7 +160,6 @@
VOrdrerBycl.wjQty = VOrdrerBycl.Daa008 - VOrdrerBycl.Daa011;
- //DevMachine
var devMachine = Db.Queryable<DevMacBycl>()
.Where(s => s.MachineNo == VOrdrerBycl.MachineNo)
.First();
@@ -170,9 +169,21 @@
devMachine.UniqueBarcode);
var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);
-
VOrdrerBycl.finalResult = sqlQuerySingle;
+ // 鏂板锛氭煡璇㈡渶鏃╀笌鏈�鏂版暟閲囪褰�
+ var baseQuery = Db.Queryable<MesNumericalBycl>()
+ .Where(n => n.OrderId == query.OrderId && n.MachineNo == VOrdrerBycl.MachineNo);
+
+ var startCjNum = baseQuery.OrderBy(n => n.Id)
+ .Select(n => n.CjNum).First();
+
+ var currentCjNum = baseQuery.OrderBy(n => n.Id, OrderByType.Desc)
+ .Select(n => n.CjNum).First();
+
+ VOrdrerBycl.StartCjNum = startCjNum ?? 0;
+ VOrdrerBycl.CurrentCjNum = currentCjNum ?? 0;
+
return VOrdrerBycl;
}
--
Gitblit v1.9.3