From 4f33ac39577a3a20860e3895f748d6f10bd39b23 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 04 十二月 2025 16:25:09 +0800
Subject: [PATCH] 修改注释
---
Services/WomdaaManager.cs | 40 ++++++++++++++++++++++++++++++----------
1 files changed, 30 insertions(+), 10 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 716dbdd..f51401a 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;
}
@@ -273,13 +284,21 @@
.OrderBy(r => r.BgDate, OrderByType.Desc)
.First();
- if (lastReport == null || !lastReport.BgDate.HasValue)
+ if (lastReport == null || !lastReport.BgDate.HasValue)//娌℃湁鎶ュ伐璁板綍
{
- // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ユ椂闂村墠涓�鏉＄殑閲囬泦鏁伴噺
- VOrdrerBycl.InitCjNum = VOrdrerBycl.preStartCjNum;
+ if (string.IsNullOrEmpty(VOrdrerBycl.Daa016)) // 娌℃湁寮�宸ユ椂闂�
+ {
+ // 娌℃湁鎶ュ伐璁板綍涓旀病鏈夊紑宸ユ椂闂达紝鍒濆閲囬泦鏁颁负璋冩満鏃堕棿鍓嶄竴鏉＄殑閲囬泦鏁伴噺
+ VOrdrerBycl.InitCjNum = VOrdrerBycl.preStartTjNum;
+ }
+ else
+ {
+ // 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ユ椂闂村墠涓�鏉＄殑閲囬泦鏁伴噺
+ VOrdrerBycl.InitCjNum = VOrdrerBycl.preStartCjNum;
- //// 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
- //VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
+ //// 娌℃湁鎶ュ伐璁板綍锛屽垵濮嬮噰闆嗘暟涓哄紑宸ラ噰鏁�
+ //VOrdrerBycl.InitCjNum = VOrdrerBycl.StartCjNum;
+ }
}
else
{
@@ -439,7 +458,8 @@
CsQty = SqlFunc.ToInt32(r.CsQty),//鍒濆閲囬泦鏁�
CjQty = SqlFunc.ToInt32(r.CjQty),//鎶ュ伐鏃堕噰闆嗘暟
BfQty = SqlFunc.ToInt32(r.BfQty),//涓嶈壇鏁伴噺
- OkQty = SqlFunc.ToInt32(r.OkQty)//鑹搧鏁伴噺
+ OkQty = SqlFunc.ToInt32(r.OkQty),//鑹搧鏁伴噺
+ REMARK = r.Remark //澶囨敞
})
.ToPageList((pageIndex < 1 ? 1 : pageIndex),
(pageSize < 1 ? 200 : (pageSize > 1000 ? 1000 : pageSize)), ref totalCount);
--
Gitblit v1.9.3