From b2be3b6939b4382f9165c78857a072f1aa7b01d0 Mon Sep 17 00:00:00 2001
From: zyf <1071160500@qq.com>
Date: 星期六, 12 四月 2025 12:34:02 +0800
Subject: [PATCH] 更新平板功能，首检页面生成巡检单
---
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Debug/net8.0/log/2025041114.log | 9
MES.Service/service/QC/SJService.cs | 48 ++
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
MES.Service/service/WomcaaManager.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Dto/service/SJPageResult.cs | 9
MES.Service/Modes/ExZzCaaFiled.cs | 29 +
MESApplication/bin/Debug/net8.0/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/MES.Service.dll | 0
MESApplication/bin/Release/net8.0/MESApplication.dll | 0
MES.Service/Modes/Womcaa.cs | 516 +++++++++++++---------------
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/Modes/QsItemOqcReq.cs | 4
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/Modes/Womdaa.cs | 373 +++++++++++---------
MES.Service/service/QC/XJService.cs | 20
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/QC/SJController.cs | 25 +
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/QsQaItemXj.cs | 8
MES.Service/service/QC/RKJService.cs | 22
MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user | 2
MESApplication/bin/Debug/net8.0/MESApplication.exe | 0
MES.Service/bin/Release/net8.0/MES.Service.dll | 0
MES.Service/bin/Release/net8.0/MES.Service.pdb | 0
32 files changed, 598 insertions(+), 469 deletions(-)
diff --git a/MES.Service/Dto/service/SJPageResult.cs b/MES.Service/Dto/service/SJPageResult.cs
index 25b1271..fc55d2b 100644
--- a/MES.Service/Dto/service/SJPageResult.cs
+++ b/MES.Service/Dto/service/SJPageResult.cs
@@ -82,6 +82,15 @@
/// </summary>
[SugarColumn(ColumnName = "DAA008")]
public decimal? Daa008 { get; set; }
+
+ [SugarColumn(ColumnName = "CAA015")]
+ public string? Caa015 { get; set; }
+
+ [SugarColumn(ColumnName = "CUST")]
+ public string? Cust { get; set; }
+
+ [SugarColumn(ColumnName = "XJ_GEN_FLAG")]
+ public int? XjGenFlag { get; set; }
[SugarColumn(IsIgnore = true)] public string? SearchValue { get; set; }
diff --git a/MES.Service/Modes/ExZzCaaFiled.cs b/MES.Service/Modes/ExZzCaaFiled.cs
new file mode 100644
index 0000000..e0c1c37
--- /dev/null
+++ b/MES.Service/Modes/ExZzCaaFiled.cs
@@ -0,0 +1,29 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using SqlSugar;
+namespace MES.Service.Modes
+{
+ /// <summary>
+ /// 鎬昏浠诲姟鍗曚笓灞炲瓧娈佃〃
+ ///</summary>
+ [SugarTable("EX_ZZ_CAA_FILED")]
+ public class ExZzCaaFiled
+ {
+ /// <summary>
+ /// 浠诲姟鍗旹RPID
+ ///</summary>
+ [SugarColumn(ColumnName="ERPID" )]
+ public decimal? Erpid { get; set; }
+ /// <summary>
+ /// 瀹㈡埛
+ ///</summary>
+ [SugarColumn(ColumnName="CUST" )]
+ public string? Cust { get; set; }
+ /// <summary>
+ /// 鎵撴爣棰嗘枡浜�
+ ///</summary>
+ [SugarColumn(ColumnName="DB_PICKER" )]
+ public string? DbPicker { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/QsItemOqcReq.cs b/MES.Service/Modes/QsItemOqcReq.cs
index 03c56fe..c1513b3 100644
--- a/MES.Service/Modes/QsItemOqcReq.cs
+++ b/MES.Service/Modes/QsItemOqcReq.cs
@@ -135,4 +135,8 @@
[SugarColumn(IsIgnore = true)] public decimal? ItemInId { get; set; }
[SugarColumn(IsIgnore = true)] public string? Bgr { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Caa015 { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? cust { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/QsQaItemXj.cs b/MES.Service/Modes/QsQaItemXj.cs
index 28c435a..23018cd 100644
--- a/MES.Service/Modes/QsQaItemXj.cs
+++ b/MES.Service/Modes/QsQaItemXj.cs
@@ -20,6 +20,10 @@
ColumnName = "ID")] //鐢ㄤ簬SqlSugar
public decimal? Id { get; set; }
+
+ [SugarColumn(ColumnName = "SJID")]
+ public decimal? Sjid { get; set; }
+
/// <summary>
/// 妫�楠屽崟鍙�
/// </summary>
@@ -130,4 +134,8 @@
[SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
[SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Caa015 { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? cust { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index fc5e544..634dcf6 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -1,282 +1,242 @@
锘縰sing SqlSugar;
-
-namespace MES.Service.Modes;
-
-/// <summary>
-/// 宸ュ崟琛�
-/// </summary>
-[SugarTable("WOMCAA")]
-public class Womcaa
+namespace MES.Service.Modes
{
/// <summary>
- /// 鑷鍒� SEQ_AOI
- /// </summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true,
+ /// 浠诲姟鍗曡〃
+ ///</summary>
+ [SugarTable("WOMCAA")]
+ public class Womcaa
+ {
+ /// <summary>
+ /// 鑷鍒�
+ ///</summary>
+ [SugarColumn(ColumnName="ID", IsPrimaryKey = true,
OracleSequenceName = "SEQ_AOI")]
- public decimal? Id { get; set; }
-
- /// <summary>
- /// ERPID
- /// </summary>
- [SugarColumn(ColumnName = "ERPID")]
- public decimal? Erpid { get; set; }
-
- /// <summary>
- /// 鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA001")]
- public string? Caa001 { get; set; }
-
- /// <summary>
- /// 鍗曟嵁绫诲瀷 1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� SCDD03_SYS2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 SCDD04_SYS3銆佸伐搴忔眹鎶�-鏅�氱敓浜�
- /// SCDD01_SYS4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇 SCDD02_SYS
- /// </summary>
- [SugarColumn(ColumnName = "CAA004")]
- public string? Caa004 { get; set; }
-
- /// <summary>
- /// 寮�鍗曟棩鏈�
- /// </summary>
- [SugarColumn(ColumnName = "CAA005")]
- public string? Caa005 { get; set; }
-
- /// <summary>
- /// 浜у搧缂栫爜
- /// </summary>
- [SugarColumn(ColumnName = "CAA006")]
- public string? Caa006 { get; set; }
-
- /// <summary>
- /// 鍗曚綅
- /// </summary>
- [SugarColumn(ColumnName = "CAA009")]
- public string? Caa009 { get; set; }
-
- /// <summary>
- /// 棰勮寮�宸ユ椂闂�
- /// </summary>
- [SugarColumn(ColumnName = "CAA010")]
- public string? Caa010 { get; set; }
-
- /// <summary>
- /// 棰勮瀹屽伐鏃堕棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA011")]
- public string? Caa011 { get; set; }
-
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA012")]
- public decimal? Caa012 { get; set; }
-
- /// <summary>
- /// BOM鐗堟
- /// </summary>
- [SugarColumn(ColumnName = "CAA013")]
- public string? Caa013 { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曞彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA015")]
- public string? Caa015 { get; set; }
-
- /// <summary>
- /// 澶囨敞
- /// </summary>
- [SugarColumn(ColumnName = "CAA016")]
- public string? Caa016 { get; set; }
-
- /// <summary>
- /// 宸叉帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA017")]
- public decimal? Caa017 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟ID
- /// </summary>
- [SugarColumn(ColumnName = "CAA018")]
- public decimal? Caa018 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "CAA019")]
- public decimal? Caa019 { get; set; }
-
- /// <summary>
- /// ERP婧愬崟鍗曞彿(浠诲姟鍗曞彿)
- /// </summary>
- [SugarColumn(ColumnName = "CAA020")]
- public string? Caa020 { get; set; }
-
- /// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
- [SugarColumn(ColumnName = "CAA021")]
- public string? Caa021 { get; set; }
-
- /// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FSTATUS")]
- public decimal? Fstatus { get; set; }
-
- /// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_DATE")]
- public DateTime? CheckDate { get; set; }
-
- /// <summary>
- /// 瀹℃牳浜�
- /// </summary>
- [SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
-
- /// <summary>
- /// 鏈帓鏁伴噺
- /// </summary>
- [SugarColumn(ColumnName = "CAA022")]
- public decimal? Caa022 { get; set; }
-
- /// <summary>
- /// 鐘舵�� 瀹屽伐锛屾湭瀹屽伐
- /// </summary>
- [SugarColumn(ColumnName = "CAA023")]
- public string? Caa023 { get; set; }
-
- /// <summary>
- /// 宸插叆搴撴暟閲�
- /// </summary>
- [SugarColumn(ColumnName = "CAA024")]
- public decimal? Caa024 { get; set; }
-
- /// <summary>
- /// 宸ヨ壓璺嚎
- /// </summary>
- [SugarColumn(ColumnName = "ROUTING_ID")]
- public string? RoutingId { get; set; }
-
- /// <summary>
- /// 浜х嚎
- /// </summary>
- [SugarColumn(ColumnName = "WORK_SHOP_ID")]
- public string? WorkShopId { get; set; }
-
- /// <summary>
- /// 浠撳簱
- /// </summary>
- [SugarColumn(ColumnName = "DEPOT_CODE")]
- public string? DepotCode { get; set; }
-
- /// <summary>
- /// 鍗曟嵁鏃ユ湡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_DATE")]
- public string? CreateDate { get; set; }
-
- /// <summary>
- /// 璁″垝缁�
- /// </summary>
- [SugarColumn(ColumnName = "WORK_GROUP_ID")]
- public string? WorkGroupId { get; set; }
-
- /// <summary>
- /// 璁″垝鍛�
- /// </summary>
- [SugarColumn(ColumnName = "PLAN_ID")]
- public string? PlanId { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓婇檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITH")]
- public string? StockInlimith { get; set; }
-
- /// <summary>
- /// 鍏ュ簱涓嬮檺
- /// </summary>
- [SugarColumn(ColumnName = "STOCK_INLIMITL")]
- public string? StockInlimitl { get; set; }
-
- /// <summary>
- /// 璁″垝璺熻釜鍙�
- /// </summary>
- [SugarColumn(ColumnName = "MTONO")]
- public string? Mtono { get; set; }
-
- /// <summary>
- /// 鎵瑰彿
- /// </summary>
- [SugarColumn(ColumnName = "LOT")]
- public string? Lot { get; set; }
-
- /// <summary>
- /// 閿�鍞鍗曡鍙�
- /// </summary>
- [SugarColumn(ColumnName = "CAA015_HEAD")]
- public string? Caa015Head { get; set; }
-
- /// <summary>
- /// 鐢熸垚鏂瑰紡
- /// </summary>
- [SugarColumn(ColumnName = "CREATE_TYPE")]
- public string? CreateType { get; set; }
-
- /// <summary>
- /// 婧愬崟绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
- public string? SrcBillType { get; set; }
-
- /// <summary>
- /// 婧愬崟缂栧彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILL_NO")]
- public string? SrcBillNo { get; set; }
-
- /// <summary>
- /// 婧愬崟鍒嗗綍琛屽彿
- /// </summary>
- [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
- public string? SrcBillentryseq { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹彿
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_NO")]
- public string? SaleOrderNo { get; set; }
-
- /// <summary>
- /// 闇�姹傚崟鎹鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
- public string? SaleOrderEntryseq { get; set; }
-
- /// <summary>
- /// 缁撴浜�
- /// </summary>
- [SugarColumn(ColumnName = "FORCE_CLOSERID")]
- public string? ForceCloserid { get; set; }
-
- /// <summary>
- /// 缁撴绫诲瀷
- /// </summary>
- [SugarColumn(ColumnName = "CLOSE_TYPE")]
- public string? CloseType { get; set; }
-
- /// <summary>
- /// 婧愭媶鍒嗚鍗曠紪鍙�
- /// </summary>
- [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
- public string? SrcSplitBillno { get; set; }
-
- /// <summary>
- /// 鐢熶骇璁㈠崟琛屽唴鐮�
- /// </summary>
- [SugarColumn(ColumnName = "FMOENTRYID")]
- public decimal? FMOENTRYID { get; set; }
-}
\ No newline at end of file
+ public decimal? Id { get; set; }
+ /// <summary>
+ /// ERPID
+ ///</summary>
+ [SugarColumn(ColumnName="ERPID" )]
+ public decimal? Erpid { get; set; }
+ /// <summary>
+ /// 鍗曟嵁缂栧彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA001" )]
+ public string? Caa001 { get; set; }
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="CAA004" )]
+ public string? Caa004 { get; set; }
+ /// <summary>
+ /// 璁″垝涓嬭揪鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CAA005" )]
+ public string? Caa005 { get; set; }
+ /// <summary>
+ /// 浜у搧缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="CAA006" )]
+ public string? Caa006 { get; set; }
+ /// <summary>
+ /// 鍗曚綅
+ ///</summary>
+ [SugarColumn(ColumnName="CAA009" )]
+ public string? Caa009 { get; set; }
+ /// <summary>
+ /// 棰勮寮�宸ユ椂闂�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA010" )]
+ public string? Caa010 { get; set; }
+ /// <summary>
+ /// 棰勮瀹屽伐鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA011" )]
+ public string? Caa011 { get; set; }
+ /// <summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName="CAA012" )]
+ public decimal? Caa012 { get; set; }
+ /// <summary>
+ /// BOM鐗堟
+ ///</summary>
+ [SugarColumn(ColumnName="CAA013" )]
+ public string? Caa013 { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA015" )]
+ public string? Caa015 { get; set; }
+ /// <summary>
+ /// 澶囨敞
+ ///</summary>
+ [SugarColumn(ColumnName="CAA016" )]
+ public string? Caa016 { get; set; }
+ /// <summary>
+ /// 宸叉帓鏁伴噺锛堝純鐢級
+ ///</summary>
+ [SugarColumn(ColumnName="CAA017" )]
+ public decimal? Caa017 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟ID
+ ///</summary>
+ [SugarColumn(ColumnName="CAA018" )]
+ public decimal? Caa018 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟搴忓彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA019" )]
+ public decimal? Caa019 { get; set; }
+ /// <summary>
+ /// ERP鐢熶骇璁㈠崟鍗曞彿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA020" )]
+ public string? Caa020 { get; set; }
+ /// <summary>
+ /// 鐢熶骇杞﹂棿
+ ///</summary>
+ [SugarColumn(ColumnName="CAA021" )]
+ public string? Caa021 { get; set; }
+ /// <summary>
+ /// 瀹℃牳鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="FSTATUS" )]
+ public decimal? Fstatus { get; set; }
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_DATE" )]
+ public DateTime? CheckDate { get; set; }
+ /// <summary>
+ /// 瀹℃牳浜�
+ ///</summary>
+ [SugarColumn(ColumnName="CHECK_USER" )]
+ public string? CheckUser { get; set; }
+ /// <summary>
+ /// 鏈帓鏁伴噺锛堝純鐢級
+ ///</summary>
+ [SugarColumn(ColumnName="CAA022" )]
+ public decimal? Caa022 { get; set; }
+ /// <summary>
+ /// "宸ュ崟鐘舵�� 1銆佽鍒� 2銆佽鍒掔‘璁� 3銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗� 7銆佺粨绠�"
+ ///</summary>
+ [SugarColumn(ColumnName="CAA023" )]
+ public string? Caa023 { get; set; }
+ /// <summary>
+ /// 宸插叆搴撴暟閲�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA024" )]
+ public decimal? Caa024 { get; set; }
+ /// <summary>
+ /// 宸ヨ壓璺嚎
+ ///</summary>
+ [SugarColumn(ColumnName="ROUTING_ID" )]
+ public string? RoutingId { get; set; }
+ /// <summary>
+ /// 浜х嚎
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_SHOP_ID" )]
+ public string? WorkShopId { get; set; }
+ /// <summary>
+ /// 浠撳簱
+ ///</summary>
+ [SugarColumn(ColumnName="DEPOT_CODE" )]
+ public string? DepotCode { get; set; }
+ /// <summary>
+ /// 鍗曟嵁鏃ユ湡
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_DATE" )]
+ public string? CreateDate { get; set; }
+ /// <summary>
+ /// 璁″垝缁�
+ ///</summary>
+ [SugarColumn(ColumnName="WORK_GROUP_ID" )]
+ public string? WorkGroupId { get; set; }
+ /// <summary>
+ /// 璁″垝鍛�
+ ///</summary>
+ [SugarColumn(ColumnName="PLAN_ID" )]
+ public string? PlanId { get; set; }
+ /// <summary>
+ /// 鍏ュ簱涓婇檺
+ ///</summary>
+ [SugarColumn(ColumnName="STOCK_INLIMITH" )]
+ public string? StockInlimith { get; set; }
+ /// <summary>
+ /// 鍏ュ簱涓嬮檺
+ ///</summary>
+ [SugarColumn(ColumnName="STOCK_INLIMITL" )]
+ public string? StockInlimitl { get; set; }
+ /// <summary>
+ /// 璁″垝璺熻釜鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="MTONO" )]
+ public string? Mtono { get; set; }
+ /// <summary>
+ /// 鎵瑰彿
+ ///</summary>
+ [SugarColumn(ColumnName="LOT" )]
+ public string? Lot { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曡鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="CAA015_HEAD" )]
+ public string? Caa015Head { get; set; }
+ /// <summary>
+ /// 鐢熸垚鏂瑰紡
+ ///</summary>
+ [SugarColumn(ColumnName="CREATE_TYPE" )]
+ public string? CreateType { get; set; }
+ /// <summary>
+ /// 婧愬崟绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILL_TYPE" )]
+ public string? SrcBillType { get; set; }
+ /// <summary>
+ /// 婧愬崟缂栫爜
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILL_NO" )]
+ public string? SrcBillNo { get; set; }
+ /// <summary>
+ /// 婧愬崟鍒嗗綍琛屽彿
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_BILLENTRYSEQ" )]
+ public string? SrcBillentryseq { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹彿
+ ///</summary>
+ [SugarColumn(ColumnName="SALE_ORDER_NO" )]
+ public string? SaleOrderNo { get; set; }
+ /// <summary>
+ /// 闇�姹傚崟鎹鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="SALE_ORDER_ENTRYSEQ" )]
+ public string? SaleOrderEntryseq { get; set; }
+ /// <summary>
+ /// 缁撴浜�
+ ///</summary>
+ [SugarColumn(ColumnName="FORCE_CLOSERID" )]
+ public string? ForceCloserid { get; set; }
+ /// <summary>
+ /// 缁撴绫诲瀷
+ ///</summary>
+ [SugarColumn(ColumnName="CLOSE_TYPE" )]
+ public string? CloseType { get; set; }
+ /// <summary>
+ /// 婧愭媶鍒嗚鍗曠紪鍙�
+ ///</summary>
+ [SugarColumn(ColumnName="SRC_SPLIT_BILLNO" )]
+ public string? SrcSplitBillno { get; set; }
+ /// <summary>
+ /// 鐢熶骇璁㈠崟琛屽唴鐮�
+ ///</summary>
+ [SugarColumn(ColumnName="FMOENTRYID" )]
+ public decimal? Fmoentryid { get; set; }
+ /// <summary>
+ /// 鎺掍骇绾垮埆
+ ///</summary>
+ [SugarColumn(ColumnName="PROD_LINE" )]
+ public string? ProdLine { get; set; }
+ }
+}
diff --git a/MES.Service/Modes/Womdaa.cs b/MES.Service/Modes/Womdaa.cs
index 1f81fa9..a5cad76 100644
--- a/MES.Service/Modes/Womdaa.cs
+++ b/MES.Service/Modes/Womdaa.cs
@@ -13,304 +13,335 @@
/// </summary>
[SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
public decimal? Id { get; set; }
-
/// <summary>
- /// 鎺掍骇ID
- /// </summary>
+ /// 鎺掍骇ID
+ ///</summary>
[SugarColumn(ColumnName = "PID")]
public decimal? Pid { get; set; }
-
/// <summary>
- /// 鍗曞彿
- /// </summary>
+ /// 鍗曞彿
+ ///</summary>
[SugarColumn(ColumnName = "DAA001")]
- public string? Daa001 { get; set; }
-
+ public string Daa001 { get; set; }
/// <summary>
- /// 浜у搧ID
- /// </summary>
+ /// 浜у搧ID
+ ///</summary>
[SugarColumn(ColumnName = "DAA002")]
- public string? Daa002 { get; set; }
-
+ public string Daa002 { get; set; }
/// <summary>
- /// 浜у搧鍚嶇О
- /// </summary>
+ /// 浜у搧鍚嶇О
+ ///</summary>
[SugarColumn(ColumnName = "DAA003")]
- public string? Daa003 { get; set; }
-
+ public string Daa003 { get; set; }
/// <summary>
- /// 浜у搧瑙勬牸
- /// </summary>
+ /// 浜у搧瑙勬牸
+ ///</summary>
[SugarColumn(ColumnName = "DAA004")]
- public string? Daa004 { get; set; }
-
+ public string Daa004 { get; set; }
/// <summary>
- /// 鍗曚綅
- /// </summary>
+ /// 鍗曚綅
+ ///</summary>
[SugarColumn(ColumnName = "DAA005")]
- public string? Daa005 { get; set; }
-
+ public string Daa005 { get; set; }
/// <summary>
- /// ERP棰勮寮�宸ユ椂闂�
- /// </summary>
+ /// ERP棰勮寮�宸ユ椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "DAA006")]
public DateTime? Daa006 { get; set; }
-
/// <summary>
- /// ERP棰勮瀹屽伐鏃堕棿
- /// </summary>
+ /// ERP棰勮瀹屽伐鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "DAA007")]
public DateTime? Daa007 { get; set; }
-
/// <summary>
- /// 宸ュ崟鏁伴噺
- /// </summary>
+ /// 宸ュ崟鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "DAA008")]
public decimal? Daa008 { get; set; }
-
/// <summary>
- /// 澶囨敞
- /// </summary>
+ /// 澶囨敞
+ ///</summary>
[SugarColumn(ColumnName = "DAA009")]
- public string? Daa009 { get; set; }
-
+ public string Daa009 { get; set; }
/// <summary>
- /// 鍏ュ簱鏁伴噺
- /// </summary>
+ /// 鍏ュ簱鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "DAA010")]
public decimal? Daa010 { get; set; }
-
/// <summary>
- /// 宸茬敓浜ч噺
- /// </summary>
+ /// 宸茬敓浜ч噺
+ ///</summary>
[SugarColumn(ColumnName = "DAA011")]
public decimal? Daa011 { get; set; }
-
/// <summary>
- /// 鎶ュ簾鏁伴噺
- /// </summary>
+ /// 鎶ュ簾鏁伴噺
+ ///</summary>
[SugarColumn(ColumnName = "DAA012")]
public decimal? Daa012 { get; set; }
-
/// <summary>
- /// 宸ヤ綔杞﹂棿
- /// </summary>
+ /// 宸ヤ綔杞﹂棿
+ ///</summary>
[SugarColumn(ColumnName = "DAA013")]
- public string? Daa013 { get; set; }
-
+ public string Daa013 { get; set; }
/// <summary>
- /// 鎶曟枡鍗曞崟鍙�
- /// </summary>
+ /// 鎶曟枡鍗曞崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "DAA014")]
- public string? Daa014 { get; set; }
-
+ public string Daa014 { get; set; }
/// <summary>
- /// 鐢熶骇绾垮埆
- /// </summary>
+ /// 鐢熶骇绾垮埆
+ ///</summary>
[SugarColumn(ColumnName = "DAA015")]
- public string? Daa015 { get; set; }
-
+ public string Daa015 { get; set; }
/// <summary>
- /// 瀹為檯寮�宸ユ棩
- /// </summary>
+ /// 瀹為檯寮�宸ユ棩
+ ///</summary>
[SugarColumn(ColumnName = "DAA016")]
public DateTime? Daa016 { get; set; }
-
/// <summary>
- /// 瀹為檯瀹屽伐鏃�
- /// </summary>
+ /// 瀹為檯瀹屽伐鏃�
+ ///</summary>
[SugarColumn(ColumnName = "DAA017")]
public DateTime? Daa017 { get; set; }
-
/// <summary>
- /// 宸ュ崟鐘舵��
- /// </summary>
+ /// 宸ュ崟鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "DAA018")]
- public string? Daa018 { get; set; }
-
+ public string Daa018 { get; set; }
/// <summary>
- /// 榻愬鐘舵��
- /// </summary>
+ /// 榻愬鐘舵��
+ ///</summary>
[SugarColumn(ColumnName = "DAA019")]
- public string? Daa019 { get; set; }
-
+ public string Daa019 { get; set; }
/// <summary>
- /// 瀹℃牳鐮�
- /// </summary>
+ /// 瀹℃牳鐮�
+ ///</summary>
[SugarColumn(ColumnName = "FSTATUS")]
public decimal? Fstatus { get; set; }
-
/// <summary>
- /// 瀹℃牳鏃ユ湡
- /// </summary>
+ /// 瀹℃牳鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_DATE")]
public DateTime? CheckDate { get; set; }
-
/// <summary>
- /// 瀹℃牳浜�
- /// </summary>
+ /// 瀹℃牳浜�
+ ///</summary>
[SugarColumn(ColumnName = "CHECK_USER")]
- public string? CheckUser { get; set; }
-
+ public string CheckUser { get; set; }
/// <summary>
- /// 绾垮埆缂栫爜
- /// </summary>
+ /// 绾垮埆缂栫爜
+ ///</summary>
[SugarColumn(ColumnName = "DAA020")]
- public string? Daa020 { get; set; }
-
+ public string Daa020 { get; set; }
/// <summary>
- /// 浠诲姟鍗曞崟鍙�
- /// </summary>
+ /// 浠诲姟鍗曞崟鍙�
+ ///</summary>
[SugarColumn(ColumnName = "DAA021")]
- public string? Daa021 { get; set; }
-
+ public string Daa021 { get; set; }
/// <summary>
- /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
- /// </summary>
+ /// 閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
+ ///</summary>
[SugarColumn(ColumnName = "DAA022")]
public decimal? Daa022 { get; set; }
-
/// <summary>
- /// 鐢熶骇搴忓彿
- /// </summary>
+ /// 鐢熶骇搴忓彿
+ ///</summary>
[SugarColumn(ColumnName = "DAA023")]
public decimal? Daa023 { get; set; }
-
/// <summary>
- /// 鎺掍骇鏃ユ湡
- /// </summary>
+ /// 鎺掍骇鏃ユ湡
+ ///</summary>
[SugarColumn(ColumnName = "DAA024")]
- public string? Daa024 { get; set; }
-
+ public string Daa024 { get; set; }
/// <summary>
- /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
- /// </summary>
+ /// 棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
+ ///</summary>
[SugarColumn(ColumnName = "DAA025")]
- public string? Daa025 { get; set; }
-
+ public string Daa025 { get; set; }
/// <summary>
- /// 棣栦欢妫�楠岀粨鏋�
- /// </summary>
+ /// 棣栦欢妫�楠岀粨鏋�
+ ///</summary>
[SugarColumn(ColumnName = "DAA026")]
- public string? Daa026 { get; set; }
-
+ public string Daa026 { get; set; }
/// <summary>
- /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
- /// </summary>
+ /// 宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
+ ///</summary>
[SugarColumn(ColumnName = "IS_REPORTCHECK")]
public decimal? IsReportcheck { get; set; }
-
/// <summary>
- /// 鎶ユ浜�
- /// </summary>
+ /// 鎶ユ浜�
+ ///</summary>
[SugarColumn(ColumnName = "USNAME")]
- public string? Usname { get; set; }
-
+ public string Usname { get; set; }
/// <summary>
- /// 鎶ユ鏃堕棿
- /// </summary>
+ /// 鎶ユ鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "REPORTTIME")]
public DateTime? Reporttime { get; set; }
-
/// <summary>
- /// 鏈哄彴缂栧彿
- /// </summary>
+ /// 鏈哄彴缂栧彿
+ ///</summary>
[SugarColumn(ColumnName = "MACHINE_NO")]
- public string? MachineNo { get; set; }
-
+ public string MachineNo { get; set; }
/// <summary>
- /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
- /// </summary>
+ /// 澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
+ ///</summary>
[SugarColumn(ColumnName = "DAA027")]
public decimal? Daa027 { get; set; }
-
/// <summary>
- /// 澶囨枡瀹屾垚鏃堕棿
- /// </summary>
+ /// 澶囨枡瀹屾垚鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "DAA028")]
- public string? Daa028 { get; set; }
-
+ public string Daa028 { get; set; }
/// <summary>
- /// 鏍囧噯宸ユ椂
- /// </summary>
+ /// 鏍囧噯宸ユ椂
+ ///</summary>
[SugarColumn(ColumnName = "PROD_HOUR")]
public decimal? ProdHour { get; set; }
-
/// <summary>
- /// 鍗曚汉灏忔椂浜ц兘
- /// </summary>
+ /// 鍗曚汉灏忔椂浜ц兘
+ ///</summary>
[SugarColumn(ColumnName = "PERSON_HOUR_CAPACITY")]
public decimal? PersonHourCapacity { get; set; }
-
/// <summary>
- /// 鐞嗚鏍囦骇
- /// </summary>
+ /// 鐞嗚鏍囦骇
+ ///</summary>
[SugarColumn(ColumnName = "THE_CAPACITY")]
public decimal? TheCapacity { get; set; }
-
/// <summary>
- /// 璁″垝鐢ㄤ汉鏁�
- /// </summary>
+ /// 璁″垝鐢ㄤ汉鏁�
+ ///</summary>
[SugarColumn(ColumnName = "PLAN_PERSONNEL")]
public decimal? PlanPersonnel { get; set; }
-
/// <summary>
- /// 璁″垝鏍囧噯浜ц兘
- /// </summary>
+ /// 璁″垝鏍囧噯浜ц兘
+ ///</summary>
[SugarColumn(ColumnName = "PLAN_CAPACITY")]
public decimal? PlanCapacity { get; set; }
-
/// <summary>
- /// 鐞嗚鐢ㄦ椂/M
- /// </summary>
+ /// 鐞嗚鐢ㄦ椂/M
+ ///</summary>
[SugarColumn(ColumnName = "THE_MIN")]
public decimal? TheMin { get; set; }
-
/// <summary>
- /// 鐞嗚鐢ㄦ椂/H
- /// </summary>
+ /// 鐞嗚鐢ㄦ椂/H
+ ///</summary>
[SugarColumn(ColumnName = "THE_HOUR")]
public decimal? TheHour { get; set; }
-
/// <summary>
- /// 绾夸綋绫诲埆
- /// </summary>
+ /// 绾夸綋绫诲埆
+ ///</summary>
[SugarColumn(ColumnName = "LINE_TYPE")]
- public string? LineType { get; set; }
-
+ public string LineType { get; set; }
/// <summary>
- /// 鏍囧噯浜烘暟
- /// </summary>
+ /// 鏍囧噯浜烘暟
+ ///</summary>
[SugarColumn(ColumnName = "PERSONNEL")]
public decimal? Personnel { get; set; }
-
/// <summary>
- /// 鎹㈢嚎鏃堕棿
- /// </summary>
+ /// 鎹㈢嚎鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "CHANGE_LINE_TIME")]
public decimal? ChangeLineTime { get; set; }
-
/// <summary>
- /// 浼戞伅鏃堕棿
- /// </summary>
+ /// 浼戞伅鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "REST_TIME")]
public decimal? RestTime { get; set; }
-
/// <summary>
- /// 鎺掍骇搴忓彿
- /// </summary>
+ /// 鎺掍骇搴忓彿
+ ///</summary>
[SugarColumn(ColumnName = "SCHEDULE_ORDER")]
public decimal? ScheduleOrder { get; set; }
-
/// <summary>
- /// MES棰勮寮�宸ユ椂闂�
- /// </summary>
+ /// MES棰勮寮�宸ユ椂闂�
+ ///</summary>
[SugarColumn(ColumnName = "MES_START_PROD")]
public DateTime? MesStartProd { get; set; }
-
/// <summary>
- /// MES棰勮瀹屽伐鏃堕棿
- /// </summary>
+ /// MES棰勮瀹屽伐鏃堕棿
+ ///</summary>
[SugarColumn(ColumnName = "MES_END_PROD")]
public DateTime? MesEndProd { get; set; }
+ /// <summary>
+ /// 鎺掍骇鎺ㄩ�佹爣璇�
+ ///</summary>
+ [SugarColumn(ColumnName = "PRODTS")]
+ public decimal? Prodts { get; set; }
+ /// <summary>
+ /// 棰勮澶囨枡鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "PREPARE_TIME")]
+ public DateTime? PrepareTime { get; set; }
+ /// <summary>
+ /// 鎻掍欢鎶曞叆浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName = "CJ_WORKER")]
+ public decimal? CjWorker { get; set; }
+ /// <summary>
+ /// 鎻掍欢璁″垝鎶曞叆浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName = "P_CJ_WORKER")]
+ public decimal? PCjWorker { get; set; }
+ /// <summary>
+ /// 鎻掍欢鏃ヤ骇閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "CJ_DAILY_OUT")]
+ public decimal? CjDailyOut { get; set; }
+ /// <summary>
+ /// 鎻掍欢鏍囧噯宸ユ椂
+ ///</summary>
+ [SugarColumn(ColumnName = "CJ_STD_HOUR")]
+ public decimal? CjStdHour { get; set; }
+ /// <summary>
+ /// 閿＄剨鎶曞叆浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName = "HX_WORKER")]
+ public decimal? HxWorker { get; set; }
+ /// <summary>
+ /// 閿＄剨璁″垝鎶曞叆浜烘暟
+ ///</summary>
+ [SugarColumn(ColumnName = "P_HX_WORKER")]
+ public decimal? PHxWorker { get; set; }
+ /// <summary>
+ /// 閿＄剨鏃ヤ骇閲�
+ ///</summary>
+ [SugarColumn(ColumnName = "HX_DAILY_OUT")]
+ public decimal? HxDailyOut { get; set; }
+ /// <summary>
+ /// 閿＄剨鏍囧噯宸ユ椂
+ ///</summary>
+ [SugarColumn(ColumnName = "HX_STD_HOUR")]
+ public decimal? HxStdHour { get; set; }
+ /// <summary>
+ /// 鎻掍欢鏁伴噺
+ ///</summary>
+ [SugarColumn(ColumnName = "CJ_NUM")]
+ public decimal? CjNum { get; set; }
+ /// <summary>
+ /// 瀹㈡埛
+ ///</summary>
+ [SugarColumn(ColumnName = "CUST")]
+ public string Cust { get; set; }
+ /// <summary>
+ /// 鎬昏宸ュ簭 1鎵撴爣 4鍔犲伐 2缁勮 3鍖呰
+ ///</summary>
+ [SugarColumn(ColumnName = "ZZ_GX")]
+ public decimal? ZzGx { get; set; }
+ /// <summary>
+ /// 閫氱煡澶囨枡鏃堕棿
+ ///</summary>
+ [SugarColumn(ColumnName = "DAA029")]
+ public DateTime? Daa029 { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿锛堢洰鍓嶄笁妤煎琛ヤ娇鐢級
+ ///</summary>
+ [SugarColumn(ColumnName = "XSDDH")]
+ public string Xsddh { get; set; }
+ /// <summary>
+ ///
+ ///</summary>
+ [SugarColumn(ColumnName = "TEST")]
+ public decimal? Test { get; set; }
+
}
\ No newline at end of file
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.dll b/MES.Service/bin/Debug/net8.0/MES.Service.dll
index d4c00e1..dc526d3 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Debug/net8.0/MES.Service.pdb b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
index e732088..5ab6e83 100644
--- a/MES.Service/bin/Debug/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.dll b/MES.Service/bin/Release/net8.0/MES.Service.dll
index 256e9c0..763e688 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.dll
+++ b/MES.Service/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MES.Service/bin/Release/net8.0/MES.Service.pdb b/MES.Service/bin/Release/net8.0/MES.Service.pdb
index 7b6acd5..446c31e 100644
--- a/MES.Service/bin/Release/net8.0/MES.Service.pdb
+++ b/MES.Service/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MES.Service/service/QC/RKJService.cs b/MES.Service/service/QC/RKJService.cs
index a2749ff..8dfeb26 100644
--- a/MES.Service/service/QC/RKJService.cs
+++ b/MES.Service/service/QC/RKJService.cs
@@ -599,8 +599,8 @@
var qsItemOqcReqs = db
.Queryable<QsItemOqcReq, MesItems, MesInvItemIns, MesInvTransaction,
- RKJDaa001, Womdaa, VLineUser,MesDeptUser>(
- (a, b, c, ca, m, da, z,d) => new JoinQueryInfos(
+ RKJDaa001, Womdaa, VLineUser,MesDeptUser, Womcaa, ExZzCaaFiled>(
+ (a, b, c, ca, m, da, z,d, caa,zf) => new JoinQueryInfos(
JoinType.Left, a.ItemNo == b.ItemNo,
JoinType.Left, a.BillNo == c.BillNo,
JoinType.Left,
@@ -610,28 +610,30 @@
JoinType.Left, c.Id == m.ItemInId && a.ItemNo == m.ItemNo,
JoinType.Left, da.Daa001 == c.RbillNo,
JoinType.Left, da.Daa015 == z.LineNo,
- JoinType.Left,c.Bgr == d.UserNo
+ JoinType.Left,c.Bgr == d.UserNo,
+ JoinType.Left, da.Daa021 == caa.Caa020,
+ JoinType.Left, caa.Erpid == zf.Erpid
))
// .WhereIF(lineNo != null && lineNo.Length > 0,
// (a, b, c, ca, m, da) => lineNo.Contains(da.Daa015))
.WhereIF(!"PL017".Equals(queryObj.createUser),
- (a, b, c, ca, m, da, z,d) => lineNo.Contains(da.Daa015))
+ (a, b, c, ca, m, da, z, d, caa, zf) => lineNo.Contains(da.Daa015))
.WhereIF(!string.IsNullOrEmpty(queryObj.id),
- (a, b, c, ca, m, da, z,d) => a.Id.ToString() == queryObj.id)
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.Id.ToString() == queryObj.id)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, ca, m, da, z,d) => a.FcheckResu == null)
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (a, b, c, ca, m, da, z,d) => a.FcheckResu != null)
+ (a, b, c, ca, m, da, z, d, caa, zf) => a.FcheckResu != null)
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
- (a, b, c, ca, m, da, z, d) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ (a, b, c, ca, m, da, z, d, caa, zf) => b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
|| a.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower()))
- .Select((a, b, c, ca, m, da, z,d) => new QsItemOqcReq
+ .Select((a, b, c, ca, m, da, z, d, caa, zf) => new QsItemOqcReq
{
BillNo = a.BillNo,
Fsubmit = a.Fsubmit,
@@ -651,6 +653,8 @@
Daa015 = da.Daa015,
LineNo = c.LineNo,
Quantity = m.Quantity,
+ Caa015 = caa.Caa015,
+ cust = da.Cust == null ? zf.Cust : da.Cust,
Bgr = d.UserName
})
.OrderBy(a => a.CreateDate, OrderByType.Desc)
diff --git a/MES.Service/service/QC/SJService.cs b/MES.Service/service/QC/SJService.cs
index 0dd735c..268d7ae 100644
--- a/MES.Service/service/QC/SJService.cs
+++ b/MES.Service/service/QC/SJService.cs
@@ -3,6 +3,8 @@
using MES.Service.Modes;
using MES.Service.util;
using SqlSugar;
+using System.Data;
+using DbType = System.Data.DbType;
namespace MES.Service.service.QC;
@@ -468,4 +470,50 @@
return withOracle;
}
+
+ public bool QaSubmit(LLJDto dto)
+ {
+
+ try
+ {
+ // 瀹氫箟杈撳嚭鍙傛暟
+ var outputResult = new SugarParameter("C_RES", null,
+ DbType.Int32, ParameterDirection.Output,
+ 4000);
+
+ var outputMessage = new SugarParameter("C_MSG", null,DbType.String,
+ ParameterDirection.Output, 4000);
+
+ // 瀹氫箟杈撳叆鍙傛暟
+ var parameters = new List<SugarParameter>
+ {
+
+ new("P_ID", dto.id, DbType.String,
+ ParameterDirection.Input),
+ new("P_USER", dto.userNo, DbType.String,
+ ParameterDirection.Input),
+ outputResult,
+ outputMessage
+ };
+
+ var db = SqlSugarHelper.GetInstance();
+
+ // 浣跨敤 SqlSugar 鎵ц瀛樺偍杩囩▼
+ db.Ado.ExecuteCommand(
+ "BEGIN PRC_FPI_OK_GEN_IPI(:P_ID, :P_USER, :C_RES, :C_MSG); END;",
+ parameters.ToArray());
+
+ // 鑾峰彇杈撳嚭鍙傛暟鐨勫��
+ var resultValue = outputResult.Value?.ToString();
+ var messageValue = outputMessage.Value?.ToString();
+
+ if ("1".Equals(resultValue)) throw new Exception(messageValue);
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ }
}
\ No newline at end of file
diff --git a/MES.Service/service/QC/XJService.cs b/MES.Service/service/QC/XJService.cs
index 6bf77a2..e4b32e3 100644
--- a/MES.Service/service/QC/XJService.cs
+++ b/MES.Service/service/QC/XJService.cs
@@ -119,30 +119,32 @@
return db
.Queryable<QsQaItemXj, Womdaa, MesLine,
- MesItems>((s, a, c, b) =>
+ MesItems,Womcaa, ExZzCaaFiled>((s, a, c, b,ca,zf) =>
new JoinQueryInfos(
JoinType.Inner, s.BillNo == a.Daa001,
JoinType.Left, a.Daa015 == c.LineNo,
- JoinType.Left, s.ItemId == b.Id
+ JoinType.Left, s.ItemId == b.Id,
+ JoinType.Left, a.Daa021 == ca.Caa020,
+ JoinType.Left, ca.Erpid == zf.Erpid
)
)
.WhereIF(lineNo != null && lineNo.Length > 0,
- (s, a, c, b) => lineNo.Contains(c.LineNo))
+ (s, a, c, b, ca, zf) => lineNo.Contains(c.LineNo))
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
"鏈畬鎴�".Equals(queryObj.result),
- (s, a, c, b) => s.FcheckResu == null)
+ (s, a, c, b, ca, zf) => s.FcheckResu == null)
.WhereIF(
StringUtil.IsNotNullOrEmpty(queryObj.result) &&
!"鏈畬鎴�".Equals(queryObj.result),
- (s, a, c, b) => s.FcheckResu != null)
- .WhereIF(id > 0, (s, a, c, b) => s.Id == id)
+ (s, a, c, b, ca, zf) => s.FcheckResu != null)
+ .WhereIF(id > 0, (s, a, c, b, ca, zf) => s.Id == id)
//鍔犵瓫閫夋潯浠�,鏍规嵁渚涘簲鍟嗭紝鐗╂枡缂栫爜锛岀墿鏂欏悕绉版悳绱�
//.WhereIF(queryObj.SearchValue!=null && queryObj.SearchValue!="", (a) => a.SuppName == queryObj.SearchValue|| a.ItemName == queryObj.SearchValue || a.ItemNo == queryObj.SearchValue )
.WhereIF(queryObj.SearchValue != null && queryObj.SearchValue != "",
- (s,a,c,b) => (b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
+ (s, a, c, b, ca, zf) => (b.ItemName.ToLower().Contains(queryObj.SearchValue.ToLower())
|| b.ItemNo.ToLower().Contains(queryObj.SearchValue.ToLower())))
- .Select((s, a, c, b) => new QsQaItemXj
+ .Select((s, a, c, b, ca, zf) => new QsQaItemXj
{
Daa020 = c.LineNo,
Id = s.Id,
@@ -156,6 +158,8 @@
ItemModel = b.ItemModel,
FcheckBy = s.FcheckBy,
FcheckResu = s.FcheckResu,
+ Caa015 = ca.Caa015,
+ cust = a.Cust == null ? zf.Cust : a.Cust,
Remarks = s.Remarks
}).OrderBy(s => s.CreateDate, OrderByType.Desc)
.ToPageList(queryObj.PageIndex, queryObj.Limit);
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index e9cb774..ec9d718 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -125,7 +125,7 @@
Caa018 = Convert.ToDecimal(dto.planId),
Caa019 = Convert.ToDecimal(dto.planSeq),
Caa020 = dto.planNum,
- FMOENTRYID = Convert.ToDecimal(dto.FMOENTRYID)
+ Fmoentryid = Convert.ToDecimal(dto.FMOENTRYID)
};
var single = base.GetSingle(it => it.Erpid == entity.Erpid);
diff --git a/MESApplication/Controllers/QC/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
index 3862406..ab77e77 100644
--- a/MESApplication/Controllers/QC/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -63,7 +63,7 @@
public ResponseResult SetQSItems([FromBody] JObject data)
{
var itemNo = data["itemNo"].ToString();
- var lineNo = data["lineNo"].ToString();
+ var lineNo = data["lineNo"]?.ToString();
try
{
dynamic resultInfos = new ExpandoObject();
@@ -320,4 +320,27 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ //QaSubmit
+ [HttpPost("qaSubmit")]
+ public ResponseResult qaSubmit([FromBody] LLJDto dto)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ var tbBillList =
+ new SJService().QaSubmit(dto);
+ resultInfos.tbBillList = tbBillList;
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
}
\ No newline at end of file
diff --git a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
index 05714f0..2a3c938 100644
--- a/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
+++ b/MESApplication/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -5,7 +5,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>C:\Users\qewqer\Desktop\MES\SG\StandardPda\MESApplication\bin\Release\net8.0\publish\</_PublishTargetUrl>
- <History>True|2025-03-20T09:58:14.2077893Z||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
+ <History>True|2025-04-12T04:05:38.9937329Z||;True|2025-04-11T16:26:37.5266569+08:00||;True|2025-03-20T17:58:14.2077893+08:00||;True|2025-03-15T00:59:39.9999573+08:00||;True|2025-03-07T15:42:21.8276566+08:00||;True|2025-02-27T10:43:45.2314689+08:00||;True|2025-02-21T16:39:35.2452658+08:00||;True|2025-01-13T15:35:48.6521519+08:00||;True|2025-01-08T16:15:03.8764923+08:00||;True|2024-12-30T15:00:59.8090011+08:00||;True|2024-12-06T16:11:01.2090466+08:00||;True|2024-11-26T09:07:33.5654976+08:00||;True|2024-11-20T15:49:27.1100474+08:00||;True|2024-11-16T18:18:42.4224922+08:00||;True|2024-11-15T09:32:12.6287354+08:00||;True|2024-11-13T10:19:32.3283327+08:00||;True|2024-09-06T14:40:56.3762241+08:00||;True|2024-08-20T17:12:00.2924570+08:00||;True|2024-08-17T10:57:05.6670396+08:00||;True|2024-08-17T10:56:46.8068041+08:00||;True|2024-08-16T14:09:17.0526491+08:00||;True|2024-08-15T08:40:32.8134665+08:00||;True|2024-08-14T10:00:27.7017207+08:00||;True|2024-08-14T08:54:44.8284031+08:00||;True|2024-08-07T10:32:10.3689256+08:00||;True|2024-08-05T15:45:03.0864530+08:00||;True|2024-08-03T09:59:13.7916520+08:00||;True|2024-07-31T17:27:28.1965929+08:00||;True|2024-07-31T15:27:34.7943845+08:00||;True|2024-07-30T15:04:50.5849235+08:00||;True|2024-07-30T14:09:06.2877325+08:00||;True|2024-07-29T16:11:30.4493940+08:00||;True|2024-07-23T14:30:34.4591002+08:00||;True|2024-07-22T14:17:39.8186158+08:00||;True|2024-04-10T12:55:31.3963752+08:00||;True|2024-04-08T13:59:25.5487203+08:00||;True|2024-04-06T09:30:09.5350539+08:00||;True|2024-04-06T08:46:05.8814658+08:00||;True|2024-04-05T14:06:52.0448024+08:00||;True|2024-04-05T12:47:46.0561601+08:00||;True|2024-02-26T08:46:22.0988887+08:00||;True|2024-02-24T19:17:13.6770376+08:00||;True|2024-02-24T14:32:37.4450337+08:00||;True|2024-02-23T10:22:06.5150173+08:00||;True|2024-02-22T13:19:56.6997993+08:00||;True|2024-02-22T10:53:17.7929585+08:00||;True|2024-02-21T17:08:06.5553444+08:00||;True|2024-02-19T16:24:37.4912012+08:00||;True|2024-02-02T10:07:23.2726075+08:00||;True|2024-02-02T08:36:49.2904460+08:00||;True|2024-01-29T17:44:43.6800769+08:00||;True|2024-01-23T09:47:26.7811926+08:00||;True|2024-01-18T16:23:30.3373836+08:00||;True|2024-01-17T14:22:04.2552286+08:00||;True|2024-01-16T16:54:42.2316892+08:00||;True|2024-01-16T16:37:23.8028858+08:00||;True|2024-01-16T09:25:24.4007775+08:00||;True|2024-01-15T10:18:57.3362616+08:00||;True|2024-01-15T10:07:14.2044763+08:00||;True|2024-01-10T14:03:36.4451130+08:00||;True|2024-01-09T16:45:32.9601815+08:00||;True|2024-01-06T14:16:34.2732220+08:00||;True|2024-01-06T14:11:45.2134717+08:00||;True|2024-01-06T11:30:58.9198887+08:00||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
\ No newline at end of file
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index d4c00e1..dc526d3 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.pdb b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
index e732088..5ab6e83 100644
--- a/MESApplication/bin/Debug/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Debug/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.dll b/MESApplication/bin/Debug/net8.0/MESApplication.dll
index c233bd1..d5ecea4 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.exe b/MESApplication/bin/Debug/net8.0/MESApplication.exe
index bb653ba..685bd9f 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/MESApplication.pdb b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
index 65d7ab9..5288511 100644
--- a/MESApplication/bin/Debug/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Debug/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Debug/net8.0/log/2025041114.log b/MESApplication/bin/Debug/net8.0/log/2025041114.log
new file mode 100644
index 0000000..16f1a3b
--- /dev/null
+++ b/MESApplication/bin/Debug/net8.0/log/2025041114.log
@@ -0,0 +1,9 @@
+2025-04-11 14:01:00:726 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method191(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-04-11 14:01:00:732 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-04-11 14:02:16:421 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method191(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ActionMethodExecutor.SyncObjectResultExecutor.Execute(ActionContext actionContext, IActionResultTypeMapper mapper, ObjectMethodExecutor executor, Object controller, Object[] arguments)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-04-11 14:02:16:422 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
+2025-04-11 14:03:06:811 鎺ュ彛寮傚父锛歿"ClassName":"System.NullReferenceException","Message":"Object reference not set to an instance of an object.","Data":null,"InnerException":null,"HelpURL":null,"StackTraceString":" at MESApplication.Controllers.QC.SJController.SetQSItems(JObject data) in C:\\Users\\qewqer\\Desktop\\MES\\SG\\StandardPda\\MESApplication\\Controllers\\QC\\SJController.cs:line 66\r\n at lambda_method191(Closure, Object, Object[])\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeActionMethodAsync()\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.Next(State& next, Scope& scope, Object& state, Boolean& isCompleted)\r\n at Microsoft.AspNetCore.Mvc.Infrastructure.ControllerActionInvoker.InvokeNextActionFilterAsync()","RemoteStackTraceString":null,"RemoteStackIndex":0,"ExceptionMethod":null,"HResult":-2147467261,"Source":"MESApplication","WatsonBuckets":null}
+2025-04-11 14:03:06:811 寮傚父鎻愮ず淇℃伅锛�"Object reference not set to an instance of an object."
+==================================================================================================================================
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 256e9c0..763e688 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MES.Service.pdb b/MESApplication/bin/Release/net8.0/MES.Service.pdb
index 7b6acd5..446c31e 100644
--- a/MESApplication/bin/Release/net8.0/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.dll b/MESApplication/bin/Release/net8.0/MESApplication.dll
index 1b57541..408efc8 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.exe b/MESApplication/bin/Release/net8.0/MESApplication.exe
index bb653ba..685bd9f 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/MESApplication.pdb b/MESApplication/bin/Release/net8.0/MESApplication.pdb
index 6df92ac..614e5bb 100644
--- a/MESApplication/bin/Release/net8.0/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/MESApplication.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
index 256e9c0..763e688 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
index 7b6acd5..446c31e 100644
--- a/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MES.Service.pdb
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
index 1b57541..408efc8 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.dll
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
index bb653ba..685bd9f 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.exe
Binary files differ
diff --git a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
index 6df92ac..614e5bb 100644
--- a/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
+++ b/MESApplication/bin/Release/net8.0/publish/MESApplication.pdb
Binary files differ
--
Gitblit v1.9.3