From c78de54cc66df1fc8d68e23858b37e50d1178a02 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 18 十月 2025 17:11:12 +0800
Subject: [PATCH] 报工逻辑优化
---
Entites/DbModels/MesReporting.cs | 4 ++--
Entites/Dto/OrderMachineDto.cs | 2 ++
Services/MesInvItemBarcodesManager.cs | 10 ++++++----
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Entites/DbModels/MesReporting.cs b/Entites/DbModels/MesReporting.cs
index 2b6fd08..86c87ce 100644
--- a/Entites/DbModels/MesReporting.cs
+++ b/Entites/DbModels/MesReporting.cs
@@ -150,13 +150,13 @@
/// 鏈哄彴闈㈡澘鏁�
/// </summary>
[SugarColumn(ColumnName = "JT_QTY")]
- public string? JtQty { get; set; }
+ public decimal? JtQty { get; set; }
/// <summary>
/// 鍒濆鍊�
/// </summary>
[SugarColumn(ColumnName = "CS_QTY")]
- public string? CsQty { get; set; }
+ public decimal? CsQty { get; set; }
[SugarColumn(IsIgnore = true)] public string? StaffName { get; set; }
}
\ No newline at end of file
diff --git a/Entites/Dto/OrderMachineDto.cs b/Entites/Dto/OrderMachineDto.cs
index 878f554..0e42a24 100644
--- a/Entites/Dto/OrderMachineDto.cs
+++ b/Entites/Dto/OrderMachineDto.cs
@@ -32,4 +32,6 @@
public List<string>? OrderStatus { get; set; } // 鏂板锛氬伐鍗曠姸鎬佺瓫閫�
public string? staffNo { get; set; } // 鏂板锛氭姤宸ヤ汉鍛樺伐鍙�
+ public decimal? currentCjNum { get; set; } // 鏂板锛氭姤宸ユ椂閲囬泦鏁�
+ public decimal? initCjNum { get; set; } // 鏂板锛氬垵濮嬮噰闆嗘暟
}
\ No newline at end of file
diff --git a/Services/MesInvItemBarcodesManager.cs b/Services/MesInvItemBarcodesManager.cs
index 421e99c..6b5e122 100644
--- a/Services/MesInvItemBarcodesManager.cs
+++ b/Services/MesInvItemBarcodesManager.cs
@@ -300,8 +300,10 @@
// BgPerson = strings[0],
AddressCode = womdaa.AddressCode,
MachineNo = womdaa.MachineNo,
- BfQty = query.bf,
- // OkQty = print,
+ BfQty = query.bf,//涓嶈壇鏁伴噺
+ OkQty = query.currentCjNum - query.initCjNum - query.bf,//鑹搧鏁伴噺
+ CsQty = query.initCjNum,//鍒濆閲囬泦鏁�
+ JtQty = query.currentCjNum,//鎶ュ伐鏃堕噰闆嗘暟
ItemNo = womdaa.Daa002,
BillNo = womdaa.Daa001,
BgPerson = query.staffNo // 鏂板锛氭姤宸ヤ汉缂栧彿
@@ -363,8 +365,8 @@
// 鏇存柊鎶ュ伐璁板綍
Db.Updateable<MesReporting>()
.SetColumns(a => a.BlQty == BlQty.ToString())
- .SetColumns(a => a.CsQty == anchors.InitialValue.ToString())
- .SetColumns(a => a.JtQty == jt.ToString())
+ .SetColumns(a => a.CsQty == (anchors.InitialValue ?? 0))
+ .SetColumns(a => a.JtQty == jt)
// .SetColumns(a => a.BfQty == bfQty)
.SetColumns(a => a.CjQty == ljcj.ToString())
.SetColumns(a => a.DyQty == DyQty.ToString())
--
Gitblit v1.9.3