From 8000b3a16fbea87ba4fcbc70a4540723849bf5a8 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期五, 21 十一月 2025 14:14:26 +0800
Subject: [PATCH] 开工数采逻辑优化
---
Services/WomdaaManager.cs | 19 +++++++++++++++----
1 files changed, 15 insertions(+), 4 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 9855967..eb09f37 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -125,7 +125,7 @@
.ToList();
// 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
- vOrderBycl.StartCjNum = sortedList.First().CjNum ?? 0;
+ vOrderBycl.StartCjNum = vOrderBycl.preStartCjNum ?? (sortedList.First().CjNum ?? 0);
// 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
vOrderBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
}
@@ -144,8 +144,19 @@
if (lastReport == null || !lastReport.BgDate.HasValue)
{
- // 娌℃湁鎶ュ伐璁板綍鎴栨姤宸ユ椂闂存棤鏁堬紝鍒濆閲囬泦鏁颁负寮�宸ラ噰鏁�
- vOrderBycl.InitCjNum = vOrderBycl.StartCjNum;
+ if (string.IsNullOrEmpty(vOrderBycl.Daa016)) // 娌℃湁寮�宸ユ椂闂�
+ {
+ // 娌℃湁鎶ュ伐璁板綍涓旀病鏈夊紑宸ユ椂闂达紝鍒濆閲囬泦鏁颁负璋冩満鏃堕棿鍓嶄竴鏉＄殑閲囬泦鏁伴噺
+ vOrderBycl.InitCjNum = vOrderBycl.preStartTjNum;
+ }
+ else
+ {
+ // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ユ椂闂村墠涓�鏉＄殑閲囬泦鏁伴噺
+ vOrderBycl.InitCjNum = vOrderBycl.preStartCjNum;
+ }
+
+ //// 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
+ //VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
}
else
{
@@ -246,7 +257,7 @@
.ToList();
// 寮�宸ユ暟閲囷細鏈�鏃╀竴鏉�
- VOrdrerBycl.StartCjNum = sortedList.First().CjNum ?? 0;
+ VOrdrerBycl.StartCjNum = VOrdrerBycl.preStartCjNum ?? (sortedList.First().CjNum ?? 0);
// 褰撳墠鏁伴噰锛氭渶鏂颁竴鏉�
VOrdrerBycl.CurrentCjNum = sortedList.Last().CjNum ?? 0;
}
--
Gitblit v1.9.3