From 7e0aad095dc9ed744f1f7ecd8a0ca56b674a8f26 Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期三, 22 十月 2025 10:00:09 +0800
Subject: [PATCH] RefreshDevBycl
---
Services/MesOrderStaManager.cs | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/Services/MesOrderStaManager.cs b/Services/MesOrderStaManager.cs
index 49e30f5..17923ba 100644
--- a/Services/MesOrderStaManager.cs
+++ b/Services/MesOrderStaManager.cs
@@ -152,7 +152,7 @@
"application/json");
var response = httpClient
- .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDev",
+ .PostAsync("http://192.168.0.94:9095/Numerical/RefreshDevBycl",
content).GetAwaiter().GetResult();
if (response.IsSuccessStatusCode)
@@ -192,24 +192,42 @@
OrderId = womdaa.Id,
OrderNo = womdaa.Daa001,
EditDate = editDate,
- Qty = mesReporting == null ? 0 : Int64.Parse(mesReporting.DyQty),
+ Qty = mesReporting == null ? 0 : (long?)(mesReporting.DyQty ?? 0),
InitialValue = mesNumerical == null ? 0 : mesNumerical.CjNum
};
Db.Insertable<MesAnchors>(eAnchors)
.ExecuteCommand();
+
+
// 鏂板閫昏緫锛氶�佹鏃堕棿鏈夊�兼椂锛屽垽鏂渶鏂伴妫�鍗曟槸鍚﹀悎鏍硷紝鍚堟牸鍒欏啓鍏ヨ皟鏈哄畬鎴愭椂闂翠负褰撳墠鏃堕棿
if (!string.IsNullOrEmpty(entity.MaShoutTime))
{
- // 鏌ユ壘璇ュ伐鍗曞彿涓嬫渶鏂扮殑棣栨鍗�
- var sjRecord = Db.Queryable<MesQaItemsDetect02>()
- .Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "棣栨")
- .OrderBy(x => x.CreateDate, OrderByType.Desc)
- .First();
-
- if (sjRecord != null && sjRecord.FcheckResu == "鍚堟牸")
+ //閫佹鍛煎彨鏃堕棿蹇呴』澶т簬鎴栫瓑浜庤皟鏈哄紑濮嬫椂闂达紝浠ユ鏉ョ瓫閫夐妫�鍗�
+ if (DateTime.TryParse(entity.MaShoutTime, out var sjTime) && DateTime.TryParse(entity.MaStartTime, out var startTime))
{
- entity.MaEndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ if (sjTime >= startTime)
+ {
+ // 鏌ユ壘璇ュ伐鍗曞彿涓嬫渶鏂扮殑棣栨鍗�
+ var sjRecord = Db.Queryable<MesQaItemsDetect02>()
+ .Where(x => x.Aufnr == womdaa.Daa001 && x.Ftype == "棣栨")
+ .OrderBy(x => x.CreateDate, OrderByType.Desc)
+ .First();
+
+ if (sjRecord != null && sjRecord.FcheckResu == "鍚堟牸")
+ {
+ // 浣跨敤QualifiedInspection鏂规硶鏇存柊宸ュ崟鐘舵��
+ QualifiedInspection(new OrderMachineDto
+ {
+ OrderId = entity.OrderId,
+ orderNo = entity.OrderNo,
+ machineNo = entity.MachineNo
+ });
+ //灏嗛�佹鏃堕棿鍐欏叆寮�宸ユ椂闂�
+ entity.StartTime = entity.MaShoutTime;
+ entity.MaEndTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+ }
+ }
}
}
@@ -224,6 +242,9 @@
// 濡傛灉鏈夎皟鏈哄畬鎴愭椂闂村垯鏇存柊
.SetColumnsIF(entity.MaEndTime != null,
s => s.MaEndTime == entity.MaEndTime)
+ // 濡傛灉鏈夊紑宸ユ椂闂村垯鏇存柊
+ .SetColumnsIF(entity.StartTime != null,
+ s => s.StartTime == entity.StartTime)
// 濡傛灉鏍囪涓�1鍒欐洿鏂板娉ㄤ俊鎭�
.SetColumnsIF(entity.Flag == 1,
s => s.remark == "浜�" + entity.MaShoutTime + "鏃堕棿鏈変竴娆￠�佹")
@@ -487,12 +508,12 @@
MachineNo = womdaa.MachineNo,
// BfQty = reportingOkQty,
BfQty = 0,
- BlQty = reportingOkQty.ToString(),
+ BlQty = reportingOkQty,
OkQty = 0,
ItemNo = womdaa.Daa002,
BillNo = womdaa.Daa001,
- CjQty = CjQty.ToString(),
- DyQty = reporting.OkQty.ToString()
+ CjQty = CjQty,
+ DyQty = reporting.OkQty
};
// 鎻掑叆鎶ュ伐璁板綍
--
Gitblit v1.9.3