From 00b6ee0318f62da3ca5200f6a1eb7aeaddf42433 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期四, 16 十月 2025 13:40:07 +0800
Subject: [PATCH] 数据库字段做映射
---
Services/WomdaaManager.cs | 153 +++++++++++++++++++++++++++++++++------------------
1 files changed, 99 insertions(+), 54 deletions(-)
diff --git a/Services/WomdaaManager.cs b/Services/WomdaaManager.cs
index 6e41ca0..71ce8fc 100644
--- a/Services/WomdaaManager.cs
+++ b/Services/WomdaaManager.cs
@@ -1,6 +1,7 @@
锘縰sing PadApplication.DB;
using PadApplication.Entites.DbModels;
using PadApplication.Entites.Dto;
+using SqlSugar;
namespace PadApplication.Services;
@@ -10,23 +11,26 @@
public class WomdaaManager : Repository<Womdaa>
{
/// <summary>
- /// 鏍规嵁宸ョ▼缂栧彿鑾峰彇宸ュ崟鍒楄〃
+ /// 鏍规嵁宸ョ▼缂栧彿鍜屽伐鍗曠姸鎬佽幏鍙栧伐鍗曞垪琛�
/// </summary>
- /// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
- /// <returns>宸ュ崟鍒楄〃,鎸夋ā鍏稩D鍒嗙粍鍚庣殑绗竴鏉¤褰�</returns>
- public List<VOrdreBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
+ /// <param name="query">鍖呭惈鏈哄櫒缂栧彿鍜屽伐鍗曠姸鎬佺殑鏌ヨ鏉′欢</param>
+ /// <returns>宸ュ崟鍒楄〃</returns>
+ public List<VOrderBycl> GetWomdaasByEngineeringNo(OrderMachineDto query)
{
var list = VOrders(query);
- // 澧炲姞鐘舵�佺瓫閫�
+ // 鎸夊伐鍗曠姸鎬佺瓫閫�
if (query.OrderStatus != null && query.OrderStatus.Any())
{
- Console.WriteLine("鏀跺埌OrderStatus鍙傛暟: " + string.Join(",", query.OrderStatus ?? Array.Empty<string>()));
- Console.WriteLine("鎵�鏈夊伐鍗曠姸鎬�: " + string.Join(",", list.Select(x => x.Daa018 ?? "").Distinct()));
list = list.Where(p => p.Daa018 != null && query.OrderStatus.Contains(p.Daa018)).ToList();
}
- // 鍘绘帀妯″叿鍒嗙粍锛岀洿鎺ヨ繑鍥炵瓫閫夌粨鏋�
+ //// 鍒嗙粍閫昏緫锛堝闇�鍒嗙粍锛屾寜鍒�鍏稩D鍒嗙粍鍙栫涓�鏉★級
+ //var vOrders = list.GroupBy(p => p.cutterId)
+ // .Select(g => g.First()).ToList();
+
+ //return vOrders;
+ // 濡傞渶鍒嗙粍鍙姞鍒嗙粍閫昏緫锛屽惁鍒欑洿鎺ヨ繑鍥�
return list;
}
@@ -35,30 +39,16 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>鍚堝苟鍚庣殑宸ュ崟鍒楄〃</returns>
- private List<VOrdreBycl> VOrders(OrderMachineDto query)
+ private List<VOrderBycl> VOrders(OrderMachineDto query)
{
- var list = Db.Queryable<VOrdreBycl>()
- .Where(s => s.MachineNo == query.machineNo)
- .Select(s => new VOrdreBycl
- {
- ID = s.ID,
- cutterId = s.cutterId,
- cutterName = s.cutterName,
- cutterModel = s.cutterModel,
- Daa018 = s.Daa018 // 纭繚鐘舵�佸瓧娈佃鏄犲皠
- })
+ var list = Db.Queryable<VOrderBycl>()
+ .Where(s => s.Daa018 != "瀹屽伐" &&
+ s.MachineNo == query.machineNo)
.ToList();
var orders = Db.Queryable<VOrderABycl>()
.Where(s => s.MachineNo == query.machineNo)
- .Select<VOrdreBycl>(s => new VOrdreBycl
- {
- ID = s.ID,
- cutterId = s.cutterId,
- cutterName = s.cutterName,
- cutterModel = s.cutterModel,
- Daa018 = s.Daa018
- })
+ .Select<VOrderBycl>()
.ToList();
list.AddRange(orders);
@@ -74,7 +64,7 @@
/// <returns>
/// 杩斿洖绗﹀悎鏉′欢鐨勫伐鍗曪紙VOrdreBycl锛夊垪琛�
/// </returns>
- public List<VOrdreBycl> GetWomdaasByMachine(OrderMachineDto query)
+ public List<VOrderBycl> GetWomdaasByMachine(OrderMachineDto query)
{
// 鑾峰彇褰撳墠鏃ユ湡瀛楃涓诧紝鏍煎紡涓� yyyy-MM-dd
var date = DateTime.Now.ToString("yyyy-MM-dd");
@@ -90,7 +80,7 @@
// 1. 鏈哄彴缂栧彿绛変簬浼犲叆鐨刴achineNo
// 2. 缂栬緫鏃ユ湡涓轰粖澶╂垨涓虹┖
// 3. 宸ュ崟ID鍦╥ds闆嗗悎涓�
- return Db.Queryable<VOrdreBycl>()
+ return Db.Queryable<VOrderBycl>()
.Where(s =>
s.MachineNo == query.machineNo
&& (s.EditDate == date || s.EditDate == null)
@@ -103,7 +93,7 @@
/// </summary>
/// <param name="query">鍖呭惈鏈哄櫒缂栧彿鐨勬煡璇㈡潯浠�</param>
/// <returns>闇�瑕佹樉绀虹殑宸ュ崟鍒楄〃</returns>
- public List<VOrdreBycl> GetWomdaasByShow(OrderMachineDto query)
+ public List<VOrderBycl> GetWomdaasByShow(OrderMachineDto query)
{
// 鏌ヨ闇�瑕佹樉绀虹殑宸ュ崟ID
var ids = Db.Queryable<MesOrderSelect>()
@@ -118,10 +108,10 @@
// 濡傛灉娌℃湁宸ュ崟ID锛岀洿鎺ヨ繑鍥炵┖鍒楄〃
if (decimals.Count == 0)
- return new List<VOrdreBycl>();
+ return new List<VOrderBycl>();
// 鏌ヨ宸ュ崟瑙嗗浘锛岀瓫閫夊嚭闇�瑕佹樉绀虹殑宸ュ崟
- return Db.Queryable<VOrdreBycl>()
+ return Db.Queryable<VOrderBycl>()
.Where(c =>
decimals.Contains(c.ID) &&
(c.EditDate == date || c.EditDate == null))
@@ -133,52 +123,52 @@
/// </summary>
/// <param name="query">鍖呭惈宸ュ崟ID鍜屽伐鍗曞彿鐨勬煡璇㈡潯浠�</param>
/// <returns>宸ュ崟璇︾粏淇℃伅</returns>
- public VOrder GetWomdaaById(OrderMachineDto query)
+ public VOrderBycl GetWomdaaById(OrderMachineDto query)
{
var date = DateTime.Now.ToString("yyyy-MM-dd");
- var count = Db.Queryable<DeviceStatus>()
+ var count = Db.Queryable<DeviceStatusBycl>()
.Where(b => b.OrderNo == query.orderNo && b.EditDate == date)
.Count();
- var vOrder = Db.Queryable<VOrder>()
+ var VOrdrerBycl = Db.Queryable<VOrderBycl>()
.Where(s => s.ID == query.OrderId)
.WhereIF(count > 0, s => s.EditDate == date)
.OrderByDescending(s => s.workStartDate).First();
- if (vOrder == null) return null;
+ if (VOrdrerBycl == null) return null;
- vOrder.YJQTY ??= 0;
+ VOrdrerBycl.YJQTY ??= 0;
var mesOrderSelect = Db.Queryable<MesOrderSelect>()
- .Where(a => a.OrderId == vOrder.ID
+ .Where(a => a.OrderId == VOrdrerBycl.ID
&& a.IsShow == 0).First();
- vOrder.todayRunTime = 0;
- vOrder.TodayFaultNum = 0;
+ VOrdrerBycl.todayRunTime = 0;
+ VOrdrerBycl.TodayFaultNum = 0;
if (mesOrderSelect != null)
{
- vOrder.todayRunTime = mesOrderSelect.TjTime;
- vOrder.TodayFaultNum = mesOrderSelect.TjCount;
+ VOrdrerBycl.todayRunTime = mesOrderSelect.TjTime;
+ VOrdrerBycl.TodayFaultNum = mesOrderSelect.TjCount;
if (mesOrderSelect.TjTime is null or 0)
{
- vOrder.JDL = 100;
+ VOrdrerBycl.JDL = 100;
}
else
{
var round = Math.Round(mesOrderSelect.TjTime.Value / 1440, 2);
var round1 = (1 - round) * 100;
- vOrder.JDL = round1;
+ VOrdrerBycl.JDL = round1;
}
}
- vOrder.wjQty = vOrder.Daa008 - vOrder.Daa011;
+ VOrdrerBycl.wjQty = VOrdrerBycl.Daa008 - VOrdrerBycl.Daa011;
//DevMachine
var devMachine = Db.Queryable<DevMacBycl>()
- .Where(s => s.MachineNo == vOrder.MachineNo)
+ .Where(s => s.MachineNo == VOrdrerBycl.MachineNo)
.First();
@@ -188,23 +178,78 @@
var sqlQuerySingle = Db.Ado.SqlQuerySingle<string>(sql);
- vOrder.finalResult = sqlQuerySingle;
+ VOrdrerBycl.finalResult = sqlQuerySingle;
- return vOrder;
+ return VOrdrerBycl;
}
/// <summary>
- /// 鏍规嵁宸ュ崟ID鑾峰彇鎵撳嵃淇℃伅
+ /// 鏍规嵁宸ュ崟ID鑾峰彇鎶ュ伐淇℃伅
/// </summary>
/// <param name="query">鍖呭惈宸ュ崟ID鐨勬煡璇㈡潯浠�</param>
- /// <returns>宸ュ崟鎵撳嵃淇℃伅</returns>
+ /// <returns>宸ュ崟鎶ュ伐淇℃伅</returns>
public VPrint GetWomdaaPrintById(OrderMachineDto query)
{
var vPrint = Db.Queryable<VPrint>()
- .Where(s => s.Id == query.OrderId).First();
- vPrint.RmiPrQty =
- (int)Math.Ceiling(
- (double)((vPrint.Bqty - vPrint.SQuantity) / vPrint.Qqty));
+ .Where(s => s.Id == query.OrderId)
+ .First();
+
+ if (vPrint == null)
+ return null;
+
+ // 闃叉闄ら浂鍜岀┖鍊煎紓甯�
+ var bqty = vPrint.Bqty ?? 0;
+ var sQuantity = vPrint.SQuantity ?? 0;
+ var qqty = vPrint.Qqty ?? 0;
+
+ if (qqty == 0)
+ {
+ vPrint.RmiPrQty = 0;
+ }
+ else
+ {
+ // 鍓╀綑鍙墦鍗板紶鏁� = (鍙墦鍗版�绘暟閲� - 宸叉墦鍗版暟閲�) / 鏍囧噯鍖呰鏁帮紝鍚戜笂鍙栨暣
+ var remain = bqty - sQuantity;
+ vPrint.RmiPrQty = remain > 0 ? (int)Math.Ceiling((double)remain / (double)qqty) : 0;
+ }
+
return vPrint;
}
+
+ public (List<MesReportingBgDto> tbBillList, int totalCount) GetByBillNoBG(
+ string billNo, string machineNo, DateTime? from, DateTime? to, int pageIndex, int pageSize)
+ {
+ var query = Db.Queryable<MesReporting>()
+ .Where(x => x.BillNo == billNo);
+
+ if (!string.IsNullOrWhiteSpace(machineNo))
+ query = query.Where(x => x.MachineNo == machineNo);
+
+ if (from.HasValue)
+ query = query.Where(x => x.BgDate >= from.Value);
+
+ if (to.HasValue)
+ query = query.Where(x => x.BgDate < to.Value.AddDays(1));
+
+ var totalCount = query.Count();
+
+ var tbBillList = query.OrderBy(x => x.BgDate, OrderByType.Desc)
+ .Select(x => new MesReportingBgDto
+ {
+ Id = (long)x.Id,
+ BillNo = x.BillNo,
+ ItemNo = x.ItemNo,
+ MachineNo = x.MachineNo,
+ StaffNo = x.BgPerson,//鎶ュ伐浜虹紪鍙�
+ StaffName = x.BgPerson, // 濡傛湁鐙珛濮撳悕瀛楁鍙浛鎹�
+ BgDate = x.BgDate,//鎶ュ伐鏃堕棿
+ CsQty = SqlFunc.ToInt32(x.CsQty),//鍒濆閲囬泦鏁�
+ CjQty = SqlFunc.ToInt32(x.CjQty),//鎶ュ伐鏃堕噰闆嗘暟
+ BfQty = SqlFunc.ToInt32(x.BfQty),//涓嶈壇鏁伴噺
+ OkQty = SqlFunc.ToInt32(x.OkQty)//鑹搧鏁伴噺
+ })
+ .ToPageList((pageIndex < 1 ? 1 : pageIndex), (pageSize < 1 ? 200 : (pageSize > 1000 ? 1000 : pageSize)), ref totalCount);
+
+ return (tbBillList, totalCount);
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3