From 687c7eb08e7c3a803a3b60dedc9c394dbb6ba411 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 24 七月 2024 10:46:07 +0800
Subject: [PATCH] 增加采购验退，调整代码结构
---
MESApplication/Controllers/Warehouse/PurdkbController.cs | 14
MESApplication/bin/Release/net8.0/publish/MESApplication.pdb | 0
MESApplication/bin/Release/net8.0/publish/MESApplication.dll | 0
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
MESApplication/bin/Release/net8.0/publish/MES.Service.pdb | 0
MES.Service/Modes/MesInvItemArn.cs | 243 +++++++
MESApplication/bin/Release/net8.0/MES.Service.pdb | 0
MESApplication/Controllers/Base/MessageCenterController.cs | 2
MESApplication/bin/Release/net8.0/MESApplication.pdb | 0
MESApplication/Controllers/QC/MesLineUserController.cs | 2
MES.Service/bin/Debug/net8.0/MES.Service.pdb | 0
MESApplication/bin/Release/net8.0/publish/MES.Service.dll | 0
MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs | 162 +++++
MES.Service/Dto/service/Material.cs | 14
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
MES.Service/Dto/service/WarehouseQuery.cs | 10
MES.Service/service/BasicData/MesItemsManager.cs | 2
MESApplication/Controllers/Warehouse/MesInvItemArnController.cs | 35
MES.Service/service/Warehouse/PurdkbManager.cs | 12
MESApplication/bin/Release/net8.0/MESApplication.exe | 0
MESApplication/Controllers/Warehouse/PurdkaController.cs | 14
MESApplication/Controllers/Base/LoginController.cs | 2
MESApplication/bin/Debug/net8.0/MES.Service.pdb | 0
MES.Service/service/Warehouse/PurdhbManager.cs | 14
MES.Service/service/WomcaaManager.cs | 5
MESApplication/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs | 78 ++
MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs | 15
MES.Service/Modes/Purdhb.cs | 274 ++++++++
MESApplication/Controllers/Warehouse/PurdhbController.cs | 14
MESApplication/bin/Release/net8.0/publish/MESApplication.exe | 0
MESApplication/Controllers/QC/BaseController.cs | 2
MES.Service/Modes/Purdka.cs | 130 ++++
MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs | 55 -
MES.Service/Dto/webApi/ErpCAA.cs | 6
MESApplication/bin/Debug/net8.0/MESApplication.dll | 0
MESApplication/Controllers/QC/SJController.cs | 2
MES.Service/bin/Debug/net8.0/MES.Service.dll | 0
MES.Service/Modes/MesItems.cs | 2
MES.Service/Modes/MesQaItemsDetect01.cs | 331 ++++++++++
MES.Service/Modes/MesInvItemArnDetail.cs | 219 ++++++
MESApplication/Controllers/WomcaaController.cs | 3
MESApplication/Startup.cs | 5
MESApplication/Controllers/QC/XJController.cs | 2
MESApplication/Controllers/Base/DemoController.cs | 2
MES.Service/service/Warehouse/MesInvItemArnManager.cs | 52 +
MESApplication/Controllers/QC/RKJController.cs | 2
MES.Service/Modes/Purdkb.cs | 142 ++++
MESApplication/Controllers/QC/SuspendController.cs | 2
MES.Service/service/Warehouse/PurdkaManager.cs | 13
54 files changed, 1,793 insertions(+), 89 deletions(-)
diff --git a/MES.Service/Dto/service/Material.cs b/MES.Service/Dto/service/Material.cs
new file mode 100644
index 0000000..54cefc1
--- /dev/null
+++ b/MES.Service/Dto/service/Material.cs
@@ -0,0 +1,14 @@
+锘縩amespace MES.Service.Dto.service;
+
+public class Material
+{
+ public string? FmrMode { get; set; }
+ public string? FngDesc { get; set; }
+ public decimal? FsrcEntryId { get; set; }
+ public decimal? FrmRealQty { get; set; }
+ public string? FmaterialId { get; set; }
+ public string? FstockId { get; set; }
+ public string? Funit { get; set; }
+ public decimal? FmesEntryId { get; set; }
+ public decimal? Mid { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/service/WarehouseQuery.cs b/MES.Service/Dto/service/WarehouseQuery.cs
new file mode 100644
index 0000000..1df3b92
--- /dev/null
+++ b/MES.Service/Dto/service/WarehouseQuery.cs
@@ -0,0 +1,10 @@
+锘縰sing MES.Service.Dto.@base;
+
+namespace MES.Service.Dto.service;
+
+public class WarehouseQuery : Page
+{
+ public decimal? id { get; set; }
+
+ public decimal[]? ItemArnDetailIds { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Dto/webApi/ErpCAA.cs b/MES.Service/Dto/webApi/ErpCAA.cs
index 4c02d46..523cdaf 100644
--- a/MES.Service/Dto/webApi/ErpCAA.cs
+++ b/MES.Service/Dto/webApi/ErpCAA.cs
@@ -4,6 +4,8 @@
{
public string Id { get; set; }
public string? Type { get; set; }
+
+ public string? FBILLTYPE { get; set; }
public string? FBillNo { get; set; }
public string? FWorkShopID0 { get; set; }
public string? FRoutingId { get; set; }
@@ -36,4 +38,8 @@
public string? FCloseType { get; set; }
public string? FSrcSplitBillNo { get; set; }
public string? FMemoItem { get; set; }
+
+ public string? planId { get; set; }
+ public string? planSeq { get; set; }
+ public string? planNum { get; set; }
}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArn.cs b/MES.Service/Modes/MesInvItemArn.cs
new file mode 100644
index 0000000..bf0d207
--- /dev/null
+++ b/MES.Service/Modes/MesInvItemArn.cs
@@ -0,0 +1,243 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 鐗╂枡鍏ュ簱涓昏〃
+/// </summary>
+[SugarTable("MES_INV_ITEM_ARN")]
+public class MesInvItemArn
+{
+ /// <summary>
+ /// ID(SEQ_INV_ID)
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_NO")]
+ public string BillNo { get; set; }
+
+ /// <summary>
+ /// 鐘舵�亅0-鏈鏍�1-瀹℃牳鍏ュ簱\缁撴
+ /// </summary>
+ [SugarColumn(ColumnName = "STATUS")]
+ public short? Status { get; set; }
+
+ /// <summary>
+ /// 鍘熷洜
+ /// </summary>
+ [SugarColumn(ColumnName = "REASON")]
+ public string Reason { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ /// 鍗曟嵁绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "BILL_TYPE_ID")]
+ public decimal? BillTypeId { get; set; }
+
+ /// <summary>
+ /// 浜嬪姟绫诲瀷ID
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSACTION_ID")]
+ public decimal? TransactionId { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "REMARK")]
+ public string Remark { get; set; }
+
+ /// <summary>
+ /// 閫佽揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PAPER_BILL_NO")]
+ public string PaperBillNo { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欎汉宸ュ彿
+ /// </summary>
+ [SugarColumn(ColumnName = "USER_NO_BACK")]
+ public string UserNoBack { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
+ public string CheckUser { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
+ public DateTime? InsDate { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
+ public string CheckRes { get; set; }
+
+ /// <summary>
+ /// 宸叉崱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
+ public decimal? CheckQty { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOTS_CODE")]
+ public string DepotsCode { get; set; }
+
+ /// <summary>
+ /// 浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "TRANSCTION_NO")]
+ public string TransctionNo { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗙紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string SuppNo { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTATUS")]
+ public short? Fstatus { get; set; }
+
+ /// <summary>
+ /// 宸ュ巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// 鏄惁宸插洖鍐橲AP
+ /// </summary>
+ [SugarColumn(ColumnName = "SAPSTATUS")]
+ public short? Sapstatus { get; set; }
+
+ /// <summary>
+ /// 纭鍏ュ簱鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "INS_DATE")]
+ public DateTime? Insdate { get; set; }
+
+ /// <summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
+ public decimal? Ischeck { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "INSBY")]
+ public string Insby { get; set; }
+
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
+
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+ public short? UrgentFlag { get; set; }
+
+ /// <summary>
+ /// 鍐查攢浜嬪姟绫诲瀷缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "MTTRANSCTION_NO")]
+ public decimal? MttransctionNo { get; set; }
+
+ /// <summary>
+ /// IQC妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "IQC_RELEASE_NO")]
+ public string IqcReleaseNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鏄剧ず
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_VISUAL")]
+ public decimal? IsVisual { get; set; }
+
+ /// <summary>
+ /// 0=閲囪喘锛�1=濮斿
+ /// </summary>
+ [SugarColumn(ColumnName = "F_TYPE")]
+ public decimal? FType { get; set; }
+
+ /// <summary>
+ /// ERP鍒拌揣鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
+ public string EbelnK3id { get; set; }
+
+ /// <summary>
+ /// 鏉＄爜鏉″嵃杩涘害
+ /// </summary>
+ [SugarColumn(ColumnName = "BARCODE_RATIO")]
+ public decimal? BarcodeRatio { get; set; }
+
+ /// <summary>
+ /// ERP鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPNO")]
+ public string Erpno { get; set; }
+
+ /// <summary>
+ /// 鏄惁宸查��璐�0-鏈��璐э紝1-閫�璐�
+ /// </summary>
+ [SugarColumn(ColumnName = "THSTATUS")]
+ public short? Thstatus { get; set; }
+
+ /// <summary>
+ /// ERP閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPTHNO")]
+ public string Erpthno { get; set; }
+
+
+ [SugarColumn(IsIgnore = true)] public string? DepotName { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? SuppName { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesInvItemArnDetail.cs b/MES.Service/Modes/MesInvItemArnDetail.cs
new file mode 100644
index 0000000..530aeb5
--- /dev/null
+++ b/MES.Service/Modes/MesInvItemArnDetail.cs
@@ -0,0 +1,219 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// </summary>
+[SugarTable("MES_INV_ITEM_ARN_DETAIL")]
+public class MesInvItemArnDetail
+{
+ /// <summary>
+ /// SEQ_INV_ID
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 涓昏〃ID
+ /// </summary>
+ [SugarColumn(ColumnName = "MID")]
+ public decimal? Mid { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN")]
+ public string Ebeln { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_LINE")]
+ public decimal? EbelnLine { get; set; }
+
+ /// <summary>
+ /// 閲囪喘璁㈠崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_QTY")]
+ public decimal? EbelnQty { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string ItemNo { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY")]
+ public decimal? Quantity { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂颁汉
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏈�鍚庢洿鏂版椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ /// 鍒嗗巶缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// 鍏徃浠ｇ爜
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗旾D
+ /// </summary>
+ [SugarColumn(ColumnName = "EBELN_K3ID")]
+ public decimal? EbelnK3id { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "LINE_K3ID")]
+ public decimal? LineK3id { get; set; }
+
+ /// <summary>
+ /// 鏈搴旀敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SUB_QTY")]
+ public decimal? SubQty { get; set; }
+
+ /// <summary>
+ /// 浣欓噺
+ /// </summary>
+ [SugarColumn(ColumnName = "MARGIN_QTY")]
+ public decimal? MarginQty { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
+ public string WorkNo { get; set; }
+
+ /// <summary>
+ /// 鎬ユ枡鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "URGENT_FLAG")]
+ public decimal? UrgentFlag { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "MEMO")]
+ public string Memo { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_RES")]
+ public string CheckRes { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀姸鎬� 锛堝緟妫�銆佸垎閫夈�佺壒閲囥�佸凡妫�锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_STATES")]
+ public string CheckStates { get; set; }
+
+ /// <summary>
+ /// 鏀惰揣浣欓噺
+ /// </summary>
+ [SugarColumn(ColumnName = "QUANTITY_M")]
+ public decimal? QuantityM { get; set; }
+
+ /// <summary>
+ /// 鏈搴旀敹浣欓噺
+ /// </summary>
+ [SugarColumn(ColumnName = "SUB_MQTY")]
+ public decimal? SubMqty { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
+ public DateTime? CheckDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁妫�楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
+ public short? Ischeck { get; set; }
+
+ /// <summary>
+ /// 宸叉敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "OK_QTY")]
+ public decimal? OkQty { get; set; }
+
+ /// <summary>
+ /// 宸叉敹浣欓噺
+ /// </summary>
+ [SugarColumn(ColumnName = "OK_MQTY")]
+ public decimal? OkMqty { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+ public string BoardStyle { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_LINE")]
+ public decimal? WorkLine { get; set; }
+
+ /// <summary>
+ /// 0銆侀噰璐崟锛�1銆佸澶栧崟
+ /// </summary>
+ [SugarColumn(ColumnName = "F_TYPE")]
+ public decimal? FType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏ュ簱
+ /// </summary>
+ [SugarColumn(ColumnName = "ISDEPS_IN")]
+ public short? IsdepsIn { get; set; }
+
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHA001")]
+ public string Dha001 { get; set; }
+
+ /// <summary>
+ /// 宸插叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "OK_RKQTY")]
+ public decimal? OkRkqty { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? itemModel { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? itemName { get; set; }
+
+ [SugarColumn(IsIgnore = true)] public string? Fname { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/MesItems.cs b/MES.Service/Modes/MesItems.cs
index 809dcb8..c12394c 100644
--- a/MES.Service/Modes/MesItems.cs
+++ b/MES.Service/Modes/MesItems.cs
@@ -216,7 +216,7 @@
/// 閲囪喘鍗曚綅
/// </summary>
[SugarColumn(ColumnName = "FPURCHASEUNITID")]
- public string? Fpurchaseunitid { get; set; }
+ public decimal? Fpurchaseunitid { get; set; }
/// <summary>
/// 鑷畾涔夊瓧娈�1
diff --git a/MES.Service/Modes/MesQaItemsDetect01.cs b/MES.Service/Modes/MesQaItemsDetect01.cs
new file mode 100644
index 0000000..14760fb
--- /dev/null
+++ b/MES.Service/Modes/MesQaItemsDetect01.cs
@@ -0,0 +1,331 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 鏉ユ枡鍏ュ簱妫�楠岃〃澶�
+/// </summary>
+[SugarTable("MES_QA_ITEMS_DETECT_01")]
+public class MesQaItemsDetect01
+{
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ID", IsPrimaryKey = true)]
+ public decimal Id { get; set; }
+
+ /// <summary>
+ /// 妫�楠屽崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "RELEASE_NO")]
+ public string ReleaseNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_DATE")]
+ public DateTime? FcheckDate { get; set; }
+
+ /// <summary>
+ /// 妫�楠屼汉鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_BY")]
+ public string FcheckBy { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_NO")]
+ public string ItemNo { get; set; }
+
+ /// <summary>
+ /// 鏉ユ枡鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FBATCH_QTY")]
+ public decimal? FbatchQty { get; set; }
+
+ /// <summary>
+ /// 鍒ゅ畾缁撴灉
+ /// </summary>
+ [SugarColumn(ColumnName = "FRECE_QTY")]
+ public string FreceQty { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPP_NO")]
+ public string SuppNo { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_DESC")]
+ public string FngDesc { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_RESU")]
+ public string FcheckResu { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FREVIEW")]
+ public string Freview { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾按鍑�
+ /// </summary>
+ [SugarColumn(ColumnName = "SAMPLE_SIZE_NO")]
+ public string SampleSizeNo { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾按骞�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_LEVEL")]
+ public string FcheckLevel { get; set; }
+
+ /// <summary>
+ /// 鎷掓敹姘村钩
+ /// </summary>
+ [SugarColumn(ColumnName = "FAC_LEVEL")]
+ public string FacLevel { get; set; }
+
+ /// <summary>
+ /// 鎶芥鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_QTY")]
+ public string CheckQty { get; set; }
+
+ /// <summary>
+ /// 鎵规鍙� --鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO")]
+ public string LotNo { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎺ㄩ��
+ /// </summary>
+ [SugarColumn(ColumnName = "FMOVE")]
+ public string Fmove { get; set; }
+
+ /// <summary>
+ /// 鏄惁澶勭悊
+ /// </summary>
+ [SugarColumn(ColumnName = "FHANDLE")]
+ public string Fhandle { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_BY")]
+ public string CreateBy { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
+ public DateTime? CreateDate { get; set; }
+
+ /// <summary>
+ /// 鏇存柊浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+ public string LastupdateBy { get; set; }
+
+ /// <summary>
+ /// 鏇存柊鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+ public DateTime? LastupdateDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG")]
+ public decimal? Modify1Flag { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY")]
+ public string Modify1By { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE")]
+ public DateTime? Modify1Date { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FACTORY")]
+ public string Factory { get; set; }
+
+ /// <summary>
+ /// XRF娴嬭瘯鎶ュ憡缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_REPNO")]
+ public string FcheckRepno { get; set; }
+
+ /// <summary>
+ /// 绗笁鏂规姤鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "FTHIRD_REP")]
+ public string FthirdRep { get; set; }
+
+ /// <summary>
+ /// 鏄惁浣滃簾
+ /// </summary>
+ [SugarColumn(ColumnName = "FCANCEL")]
+ public decimal? Fcancel { get; set; }
+
+ /// <summary>
+ /// 鎻愪氦鏍囪瘑
+ /// </summary>
+ [SugarColumn(ColumnName = "FSUBMIT")]
+ public decimal? Fsubmit { get; set; }
+
+ /// <summary>
+ /// 妫�楠屼緷鎹�
+ /// </summary>
+ [SugarColumn(ColumnName = "FCHECK_ACCORD")]
+ public string FcheckAccord { get; set; }
+
+ /// <summary>
+ /// 绫诲瀷(0 鏉ユ枡 1 鍦ㄥ簱)
+ /// </summary>
+ [SugarColumn(ColumnName = "FTYPE")]
+ public short? Ftype { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "ITEM_UNIT")]
+ public string ItemUnit { get; set; }
+
+ /// <summary>
+ /// 鍑鸿揣鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "OUT_DATE")]
+ public string OutDate { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍏嶆
+ /// </summary>
+ [SugarColumn(ColumnName = "FEXEMPTION")]
+ public decimal? Fexemption { get; set; }
+
+ /// <summary>
+ /// 妗ｄ綅鏍囧噯
+ /// </summary>
+ [SugarColumn(ColumnName = "FGEAR_STAND")]
+ public string FgearStand { get; set; }
+
+ /// <summary>
+ /// 涓嶈壇澶勭悊鏂规硶
+ /// </summary>
+ [SugarColumn(ColumnName = "FNG_HANDLE")]
+ public string FngHandle { get; set; }
+
+ /// <summary>
+ /// 绠＄悊缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FMANAGE_NO")]
+ public string FmanageNo { get; set; }
+
+ /// <summary>
+ /// 杞崲鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "FCOVERT_QTY")]
+ public string FcovertQty { get; set; }
+
+ /// <summary>
+ /// 鐗堟湰
+ /// </summary>
+ [SugarColumn(ColumnName = "FVERSION")]
+ public decimal? Fversion { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "COMPANY")]
+ public string Company { get; set; }
+
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FSECOND_RESU")]
+ public string FsecondResu { get; set; }
+
+ /// <summary>
+ /// 鏈�澶ф娊妫�鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAX_CHECK_QTY")]
+ public decimal? MaxCheckQty { get; set; }
+
+ /// <summary>
+ /// 鐗瑰畾淇敼鏄惁瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_FLAG1")]
+ public decimal? Modify1Flag1 { get; set; }
+
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_BY1")]
+ public string Modify1By1 { get; set; }
+
+ /// <summary>
+ /// 鐗瑰畾淇敼瀹℃牳鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFY1_DATE1")]
+ public DateTime? Modify1Date1 { get; set; }
+
+ /// <summary>
+ /// 灏忔壒娆″彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO1")]
+ public string LotNo1 { get; set; }
+
+ /// <summary>
+ /// 閲囪喘鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT_NO2")]
+ public string LotNo2 { get; set; }
+
+ /// <summary>
+ /// 浜у搧鍨嬪彿
+ /// </summary>
+ [SugarColumn(ColumnName = "BOARD_STYLE")]
+ public string BoardStyle { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_NO")]
+ public string WorkNo { get; set; }
+
+ /// <summary>
+ /// 鍒拌揣鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHA018")]
+ public string Dha018 { get; set; }
+
+ /// <summary>
+ /// 琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
+ public decimal? Dhb002 { get; set; }
+
+ /// <summary>
+ /// 鍒拌揣鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
+ public string Dhb001 { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "LIFNR")]
+ public string Lifnr { get; set; }
+
+ /// <summary>
+ /// 閫�鏂欐柟寮�
+ /// </summary>
+ [SugarColumn(ColumnName = "FMRMODE")]
+ public string Fmrmode { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdhb.cs b/MES.Service/Modes/Purdhb.cs
new file mode 100644
index 0000000..b8de0cc
--- /dev/null
+++ b/MES.Service/Modes/Purdhb.cs
@@ -0,0 +1,274 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閲囪喘鍒拌揣鍗曡〃韬�
+/// </summary>
+[SugarTable("PURDHB")]
+public class Purdhb
+{
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB001")]
+ public string Dhb001 { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB002")]
+ public string Dhb002 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB003")]
+ public string Dhb003 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB004")]
+ public string Dhb004 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB005")]
+ public string Dhb005 { get; set; }
+
+ /// <summary>
+ /// 浜よ揣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB006")]
+ public decimal? Dhb006 { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB007")]
+ public string Dhb007 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB008")]
+ public string Dhb008 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB009")]
+ public string Dhb009 { get; set; }
+
+ /// <summary>
+ /// 鎵瑰彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB010")]
+ public string Dhb010 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB011")]
+ public string Dhb011 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB012")]
+ public decimal? Dhb012 { get; set; }
+
+ /// <summary>
+ /// 娓呯偣鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB013")]
+ public decimal? Dhb013 { get; set; }
+
+ /// <summary>
+ /// 鍒板巶鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB014")]
+ public string Dhb014 { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB015")]
+ public decimal? Dhb015 { get; set; }
+
+ /// <summary>
+ /// 楠岄��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB016")]
+ public decimal? Dhb016 { get; set; }
+
+ /// <summary>
+ /// 杩涜揣鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB017")]
+ public decimal? Dhb017 { get; set; }
+
+ /// <summary>
+ /// 杩涜揣閲戦
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB018")]
+ public decimal? Dhb018 { get; set; }
+
+ /// <summary>
+ /// 瀹㈡埛鏂欏彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB019")]
+ public string Dhb019 { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB020")]
+ public string Dhb020 { get; set; }
+
+ /// <summary>
+ /// 璧犲搧鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB021")]
+ public decimal? Dhb021 { get; set; }
+
+ /// <summary>
+ /// 鏇存柊ERP
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB022")]
+ public string Dhb022 { get; set; }
+
+ /// <summary>
+ /// 妫�楠岀姸鎬�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB023")]
+ public string Dhb023 { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB024")]
+ public string Dhb024 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
+ public decimal? Auditing { get; set; }
+
+ /// <summary>
+ /// ERP閲囪喘鍗曞彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB026")]
+ public decimal? Dhb026 { get; set; }
+
+ /// <summary>
+ /// ERP閲囪喘搴忓彿ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB027")]
+ public decimal? Dhb027 { get; set; }
+
+ /// <summary>
+ /// ERP鐗╂枡ID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB028")]
+ public decimal? Dhb028 { get; set; }
+
+ /// <summary>
+ /// 寰呮鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB029")]
+ public decimal? Dhb029 { get; set; }
+
+ /// <summary>
+ /// 妫�楠屾棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB030")]
+ public string Dhb030 { get; set; }
+
+ /// <summary>
+ /// 妫�楠屽憳
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB031")]
+ public string Dhb031 { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB032")]
+ public decimal? Dhb032 { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB033")]
+ public string Dhb033 { get; set; }
+
+ /// <summary>
+ /// 鍏ュ簱鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB034")]
+ public string Dhb034 { get; set; }
+
+ /// <summary>
+ /// 閫�璐ф暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB035")]
+ public decimal? Dhb035 { get; set; }
+
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB037")]
+ public decimal? Dhb037 { get; set; }
+
+ /// <summary>
+ /// 閫�璐т汉
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB036")]
+ public string Dhb036 { get; set; }
+
+ /// <summary>
+ /// ERP鍘熷垎褰曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB038")]
+ public decimal? Dhb038 { get; set; }
+
+ /// <summary>
+ /// ERP婧愬崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB039")]
+ public decimal? Dhb039 { get; set; }
+
+ /// <summary>
+ /// ERP婧愬崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB040")]
+ public decimal? Dhb040 { get; set; }
+
+ /// <summary>
+ /// ERP璁㈠崟鍐呯爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB041")]
+ public decimal? Dhb041 { get; set; }
+
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 鏄惁妫�楠岋紝1涓哄凡妫�
+ /// </summary>
+ [SugarColumn(ColumnName = "ISCHECK")]
+ public decimal? Ischeck { get; set; }
+
+ /// <summary>
+ /// 浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DHB042")]
+ public string Dhb042 { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdka.cs b/MES.Service/Modes/Purdka.cs
new file mode 100644
index 0000000..4330c13
--- /dev/null
+++ b/MES.Service/Modes/Purdka.cs
@@ -0,0 +1,130 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閫�鏂欏崟澶�
+/// </summary>
+[SugarTable("PURDKA")]
+public class Purdka
+{
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEUSER")]
+ public string Createuser { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATETIME")]
+ public string Createtime { get; set; }
+
+ /// <summary>
+ /// 淇敼鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYTIME")]
+ public string Modifytime { get; set; }
+
+ /// <summary>
+ /// 淇敼浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "MODIFYUSER")]
+ public string Modifyuser { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
+ public string Auditing { get; set; }
+
+ /// <summary>
+ /// 閫�璐у崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA001")]
+ public string Dka001 { get; set; }
+
+ /// <summary>
+ /// 閫�璐х被鍨�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA002")]
+ public string Dka002 { get; set; }
+
+ /// <summary>
+ /// 閫�璐ф棩鏈�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA003")]
+ public string Dka003 { get; set; }
+
+ /// <summary>
+ /// 閫�璐ф椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA004")]
+ public string Dka004 { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA005")]
+ public string Dka005 { get; set; }
+
+ /// <summary>
+ /// 渚涘簲鍟嗗悕绉�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA006")]
+ public string Dka006 { get; set; }
+
+ /// <summary>
+ /// 閮ㄩ棬
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA007")]
+ public string Dka007 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鑰�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA008")]
+ public string Dka008 { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA009")]
+ public string Dka009 { get; set; }
+
+ /// <summary>
+ /// 閫�璐х姸鎬侊紝0鎴栫┖涓烘湭閫�璐э紝1涓哄凡閫�瀹�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA010")]
+ public string Dka010 { get; set; }
+
+ /// <summary>
+ /// ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
+ public decimal? Erpid { get; set; }
+
+ /// <summary>
+ /// 淇濈鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA011")]
+ public string Dka011 { get; set; }
+
+ /// <summary>
+ /// 楠屾敹鍛樼紪鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA012")]
+ public string Dka012 { get; set; }
+
+ /// <summary>
+ /// 鏄惁鎺ㄩ�佺孩瀛楀叆搴�1-鎺ㄩ�侊紝0-鏈帹閫�
+ /// </summary>
+ [SugarColumn(ColumnName = "DKA013")]
+ public decimal? Dka013 { get; set; }
+}
\ No newline at end of file
diff --git a/MES.Service/Modes/Purdkb.cs b/MES.Service/Modes/Purdkb.cs
new file mode 100644
index 0000000..7eda171
--- /dev/null
+++ b/MES.Service/Modes/Purdkb.cs
@@ -0,0 +1,142 @@
+锘縰sing SqlSugar;
+
+namespace MES.Service.Modes;
+
+/// <summary>
+/// 閫�鏂欏崟瀛愯〃
+/// </summary>
+[SugarTable("PURDKB")]
+public class Purdkb
+{
+ /// <summary>
+ /// 鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "ID")]
+ public decimal? Id { get; set; }
+
+ /// <summary>
+ /// 瀹℃牳
+ /// </summary>
+ [SugarColumn(ColumnName = "AUDITING")]
+ public string Auditing { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATETIME")]
+ public string Createtime { get; set; }
+
+ /// <summary>
+ /// 鍒涘缓浜哄憳
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATEUSER")]
+ public string Createuser { get; set; }
+
+ /// <summary>
+ /// 鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB001")]
+ public string Dkb001 { get; set; }
+
+ /// <summary>
+ /// 搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB002")]
+ public string Dkb002 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB003")]
+ public string Dkb003 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB004")]
+ public string Dkb004 { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB005")]
+ public string Dkb005 { get; set; }
+
+ /// <summary>
+ /// 搴旈��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB006")]
+ public decimal? Dkb006 { get; set; }
+
+ /// <summary>
+ /// 瀹為��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB007")]
+ public decimal? Dkb007 { get; set; }
+
+ /// <summary>
+ /// 寰呴��鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB008")]
+ public decimal? Dkb008 { get; set; }
+
+ /// <summary>
+ /// 鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB009")]
+ public string Dkb009 { get; set; }
+
+ /// <summary>
+ /// 鍗曚环
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB010")]
+ public decimal? Dkb010 { get; set; }
+
+ /// <summary>
+ /// 閲戦
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB011")]
+ public decimal? Dkb011 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB012")]
+ public string Dkb012 { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB013")]
+ public string Dkb013 { get; set; }
+
+ /// <summary>
+ /// 涓嶈壇鍒嗙被
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB014")]
+ public string Dkb014 { get; set; }
+
+ /// <summary>
+ /// 涓嶈壇椤圭洰
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB015")]
+ public string Dkb015 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB016")]
+ public string Dkb016 { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB017")]
+ public string Dkb017 { get; set; }
+
+ /// <summary>
+ /// 浠撳簱鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "DKB018")]
+ public string Dkb018 { 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 51bc172..6d2f60f 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 40c5073..dcd0d5e 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 6aed25f..ba6228b 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 437449f..0ed0ab8 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/BasicData/MesItemsManager.cs b/MES.Service/service/BasicData/MesItemsManager.cs
index a90c981..2d42a7b 100644
--- a/MES.Service/service/BasicData/MesItemsManager.cs
+++ b/MES.Service/service/BasicData/MesItemsManager.cs
@@ -135,7 +135,7 @@
Fissuetype = item.FIssueType,
Fisbatchmanage = item.FIsBatchManage,
Fpurchaserid = item.FPurchaserId,
- Fpurchaseunitid = item.FPurchaseUnitId,
+ Fpurchaseunitid = Convert.ToDecimal(item.FPurchaseUnitId),
Storeunit = item.FStoreUnitID,
Saleunit = item.FSaleUnitId,
Fforbidstatus = item.FForbidStatus,
diff --git a/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
new file mode 100644
index 0000000..38d361f
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesInvItemArnDetailManager.cs
@@ -0,0 +1,162 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.service;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class MesInvItemArnDetailManager : Repository<MesInvItemArnDetail>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemArnDetailManager.cs
+
+ public List<MesInvItemArnDetail> GetDetails(WarehouseQuery query)
+ {
+ // 鏌ヨ
+ return Db.Queryable<MesInvItemArnDetail, MesItems, MesUnit>(
+ (c, t, u) => new object[]
+ {
+ JoinType.Left,
+ c.ItemNo == t.ItemNo && c.Company == t.Company &&
+ c.Factory == t.Factory,
+ JoinType.Left,
+ t.Fpurchaseunitid == u.Id && t.Factory == u.Factory &&
+ t.Company == u.Company
+ })
+ .Where((c, t, u) => c.Mid == query.id)
+ .Select((c, t, u) => new MesInvItemArnDetail
+ {
+ CheckRes = c.CheckRes,
+ itemModel = t.ItemModel,
+ itemName = t.ItemName,
+ UrgentFlag = c.UrgentFlag,
+ Memo = c.Memo,
+ Quantity = c.Quantity,
+ SubQty = c.SubQty,
+ CheckStates = c.CheckStates,
+ WorkLine = c.WorkLine,
+ IsdepsIn = c.IsdepsIn,
+ OkRkqty = c.OkRkqty,
+ Fname = u.Fname,
+ EbelnQty = c.EbelnQty,
+ ItemNo = c.ItemNo,
+ Id = c.Id,
+ Ebeln = c.Ebeln
+ })
+ .ToList();
+ }
+
+ public List<Material> GetMaterial(WarehouseQuery query)
+ {
+ // 鏌ヨ
+ var result = Db
+ .Queryable<MesQaItemsDetect01, MesInvItemArn, MesInvItemArnDetail,
+ MesItems, MesUnit>(
+ (a, d, b, c, t) => new object[]
+ {
+ JoinType.Inner, d.BillNo == a.LotNo,
+ JoinType.Inner, d.Id == b.Mid && b.ItemNo == a.ItemNo,
+ JoinType.Inner,
+ a.ItemNo == c.ItemNo && a.Company == c.Company &&
+ a.Factory == c.Factory,
+ JoinType.Inner, c.Fpurchaseunitid == t.Id
+ })
+ .Where((a, d, b, c, t) => a.FngHandle == "閫�璐�" &&
+ query.ItemArnDetailIds.Contains(b.Id))
+ .Select((a, d, b, c, t) => new Material
+ {
+ FmrMode = a.Fmrmode,
+ FngDesc = a.FngDesc,
+ FsrcEntryId = b.Id,
+ FrmRealQty = b.Quantity,
+ FmaterialId = a.ItemNo,
+ FstockId = d.DepotsCode,
+ Funit = t.Fnumber,
+ FmesEntryId = a.Id,
+ Mid = d.Id
+ })
+ .ToList();
+
+ return result;
+ }
+
+ //var result = db.Ado.GetString($"SELECT f_getseqnextvalue('{sequenceName}') FROM DUAL");
+
+ private readonly PurdhbManager purdhbManager = new();
+ private readonly PurdkaManager purdkaManager = new();
+ private readonly PurdkbManager purdkbManager = new();
+ private readonly MesQaItemsDetect01Manager rohInDataManager = new();
+
+ public bool SetMaterial(Material material)
+ {
+ return UseTransaction(db =>
+ {
+ var executeCommand = db.Updateable<MesInvItemArnDetail>()
+ .SetColumns(s => s.CheckRes == "涓嶅悎鏍�")
+ .SetColumns(s => s.CheckStates == "閫�璐�")
+ .SetColumns(s => s.Ischeck == 1)
+ .Where(s =>
+ s.Mid == material.Mid && s.ItemNo == material.FmaterialId)
+ .ExecuteCommand();
+
+ var mesQaItemsDetect01 = db.Queryable<MesQaItemsDetect01>()
+ .Where(a => a.Id == material.FmesEntryId).Single();
+
+ if (mesQaItemsDetect01 == null)
+ {
+ return 0;
+ }
+
+ var suppName = db.Queryable<MesSupplier>()
+ .Where(b => b.SuppNo == mesQaItemsDetect01.SuppNo)
+ .Select<string>(b => b.SuppName).First();
+
+ var CIdt = db.Ado.GetString(
+ $"SELECT f_getseqnextvalue('mes_inv_item_ins') FROM DUAL");
+
+ var billNo = db.Ado.GetString(
+ $"SELECT getbillcode1('1000', '1000', 'INV_IN_BACK') FROM DUAL");
+
+ // PURDKA
+ var purdka = GetPurdka(CIdt, billNo, mesQaItemsDetect01, suppName);
+
+ executeCommand += db.Insertable<Purdka>(purdka).ExecuteCommand();
+
+ db.Queryable<Purdhb>()
+ .Where(c => c.Dhb001 == mesQaItemsDetect01.LotNo
+ && c.Dhb003 == mesQaItemsDetect01.ItemNo)
+ .Select(c => new Purdhb
+ {
+ Dhb002 = c.Dhb002,
+ Dhb003 = c.Dhb003,
+ Dhb006 = c.Dhb006,
+ Dhb007 = c.Dhb007,
+ Dhb017 = c.Dhb017,
+ Dhb018 = c.Dhb018,
+ Dhb001 = c.Dhb001,
+ Dhb042 = c.Dhb042
+ }).ToList();
+
+ return executeCommand;
+ }) > 3;
+ }
+
+ private static Purdka GetPurdka(string CIdt, string billNo,
+ MesQaItemsDetect01 mesQaItemsDetect01, string suppName)
+ {
+ var date = DateTime.Now.ToString("yyyy-MM-dd");
+ Purdka purdka = new Purdka();
+ purdka.Id = Convert.ToDecimal(CIdt);
+ purdka.Dka001 = billNo;
+ purdka.Dka002 = "閲囪喘閫�璐�";
+ purdka.Dka003 = date;
+ purdka.Dka004 = date;
+ purdka.Dka005 = mesQaItemsDetect01.SuppNo;
+ purdka.Dka006 = suppName;
+ purdka.Dka010 = "1";
+ purdka.Dka013 = 0;
+ purdka.Createuser = mesQaItemsDetect01.LastupdateBy;
+ return purdka;
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesInvItemArnManager.cs b/MES.Service/service/Warehouse/MesInvItemArnManager.cs
new file mode 100644
index 0000000..81d0c48
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesInvItemArnManager.cs
@@ -0,0 +1,52 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Dto.service;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class MesInvItemArnManager : Repository<MesInvItemArn>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesInvItemArnManager.cs
+ public List<MesInvItemArn> GetPagedResults(WarehouseQuery query)
+ {
+ // 鏌ヨ骞跺垎椤�
+ var result = Db.Queryable<MesInvItemArn, MesDepots, MesSupplier>(
+ (a, d, f) => new object[]
+ {
+ JoinType.Left,
+ a.DepotsCode == d.DepotCode && d.Factory == a.Factory &&
+ d.Company == a.Company,
+ JoinType.Left, a.SuppNo == f.SuppNo
+ })
+ .Where((a, d, f) => a.BillTypeId == 700
+ && a.TransctionNo == "701"
+ && a.Factory == "1000"
+ && a.Company == "1000"
+ && a.IsVisual == 0)
+ .WhereIF(query.id != null, (a, d, f) => a.Id == query.id)
+ .Select((a, d, f) => new MesInvItemArn
+ {
+ Status = a.Status,
+ SuppNo = a.SuppNo,
+ FType = a.FType,
+ Fstatus = a.Fstatus,
+ Remark = a.Remark,
+ Insdate = a.Insdate,
+ CheckDate = a.CheckDate,
+ DepotsCode = a.DepotsCode,
+ Id = a.Id,
+ UrgentFlag = a.UrgentFlag,
+ CreateBy = a.CreateBy,
+ BillNo = a.BillNo,
+ PaperBillNo = a.PaperBillNo,
+ DepotName = d.DepotName,
+ SuppName = f.SuppName
+ }).OrderByDescending(a => a.BillNo)
+ .ToPageList(query.PageIndex, query.Limit);
+
+ return result;
+ }
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs b/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs
new file mode 100644
index 0000000..a6dfa66
--- /dev/null
+++ b/MES.Service/service/Warehouse/MesQaItemsDetect01Manager.cs
@@ -0,0 +1,78 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class MesQaItemsDetect01Manager : Repository<MesQaItemsDetect01>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesQaItemsDetect01Manager.cs
+
+
+ #region 鏁欏鏂规硶
+
+ /// <summary>
+ /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠ｇ爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+ /// </summary>
+ public void Study()
+ {
+ /*********鏌ヨ*********/
+
+ var data1 = base.GetById(1); //鏍规嵁ID鏌ヨ
+ var data2 = base.GetList(); //鏌ヨ鎵�鏈�
+ var data3 = base.GetList(it => 1 == 1); //鏍规嵁鏉′欢鏌ヨ
+ //var data4 = base.GetSingle(it => 1 == 1);//鏍规嵁鏉′欢鏌ヨ涓�鏉�,濡傛灉瓒呰繃涓�鏉′細鎶ラ敊
+
+ var p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
+ var data5 = base.GetPageList(it => 1 == 1, p);
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
+
+ var data6 =
+ base.GetPageList(it => 1 == 1, p,
+ it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+ Console.Write(p.TotalCount); //杩斿洖鎬绘暟
+
+ var conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+ conModels.Add(new ConditionalModel
+ {
+ FieldName = typeof(MesQaItemsDetect01).GetProperties()[0].Name,
+ ConditionalType = ConditionalType.Equal, FieldValue = "1"
+ }); //id=1
+ var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
+
+ AsQueryable().Where(x => 1 == 1)
+ .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
+
+ /*********鎻掑叆*********/
+ var insertData = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
+ var insertArray = new[] { insertData };
+ base.Insert(insertData); //鎻掑叆
+ base.InsertRange(insertArray); //鎵归噺鎻掑叆
+ var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+ AsInsertable(insertData).ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+
+
+ /*********鏇存柊*********/
+ var updateData = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
+ var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+ base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+ base.UpdateRange(updateArray); //鎵归噺鏇存柊
+ //base.Update(it => new MesQaItemsDetect01() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
+ AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+
+
+ /*********鍒犻櫎*********/
+ var deldata = new MesQaItemsDetect01(); //娴嬭瘯鍙傛暟
+ base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+ base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+ base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+ base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+ AsDeleteable().Where(it => 1 == 2)
+ .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+ }
+
+ #endregion
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdhbManager.cs b/MES.Service/service/Warehouse/PurdhbManager.cs
new file mode 100644
index 0000000..0061129
--- /dev/null
+++ b/MES.Service/service/Warehouse/PurdhbManager.cs
@@ -0,0 +1,14 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class PurdhbManager : Repository<Purdhb>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdhbManager.cs
+
+
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdkaManager.cs b/MES.Service/service/Warehouse/PurdkaManager.cs
new file mode 100644
index 0000000..4d6c646
--- /dev/null
+++ b/MES.Service/service/Warehouse/PurdkaManager.cs
@@ -0,0 +1,13 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class PurdkaManager : Repository<Purdka>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdkaManager.cs
+
+}
\ No newline at end of file
diff --git a/MES.Service/service/Warehouse/PurdkbManager.cs b/MES.Service/service/Warehouse/PurdkbManager.cs
new file mode 100644
index 0000000..224c6d7
--- /dev/null
+++ b/MES.Service/service/Warehouse/PurdkbManager.cs
@@ -0,0 +1,12 @@
+锘縰sing MES.Service.DB;
+using MES.Service.Modes;
+using SqlSugar;
+
+namespace MES.Service.service.Warehouse;
+
+public class PurdkbManager : Repository<Purdkb>
+{
+ //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+
+ //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 PurdkbManager.cs
+}
\ No newline at end of file
diff --git a/MES.Service/service/WomcaaManager.cs b/MES.Service/service/WomcaaManager.cs
index 354a2c3..3e98070 100644
--- a/MES.Service/service/WomcaaManager.cs
+++ b/MES.Service/service/WomcaaManager.cs
@@ -109,7 +109,10 @@
ForceCloserid = dto.FForceCloserId,
CloseType = dto.FCloseType,
SrcSplitBillno = dto.FSrcSplitBillNo,
- Caa016 = dto.FMemoItem
+ Caa016 = dto.FMemoItem,
+ Caa018 = Convert.ToDecimal(dto.planId),
+ Caa019 = Convert.ToDecimal(dto.planSeq),
+ Caa020 = dto.planNum
};
}
diff --git a/MESApplication/Controllers/DemoController.cs b/MESApplication/Controllers/Base/DemoController.cs
similarity index 97%
rename from MESApplication/Controllers/DemoController.cs
rename to MESApplication/Controllers/Base/DemoController.cs
index f2caea1..ce0eaba 100644
--- a/MESApplication/Controllers/DemoController.cs
+++ b/MESApplication/Controllers/Base/DemoController.cs
@@ -4,7 +4,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Base;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/LoginController.cs b/MESApplication/Controllers/Base/LoginController.cs
similarity index 97%
rename from MESApplication/Controllers/LoginController.cs
rename to MESApplication/Controllers/Base/LoginController.cs
index 9872e67..58de874 100644
--- a/MESApplication/Controllers/LoginController.cs
+++ b/MESApplication/Controllers/Base/LoginController.cs
@@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Base;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/MessageCenterController.cs b/MESApplication/Controllers/Base/MessageCenterController.cs
similarity index 98%
rename from MESApplication/Controllers/MessageCenterController.cs
rename to MESApplication/Controllers/Base/MessageCenterController.cs
index e275539..a079762 100644
--- a/MESApplication/Controllers/MessageCenterController.cs
+++ b/MESApplication/Controllers/Base/MessageCenterController.cs
@@ -4,7 +4,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Base;
[ApiController]
[Route("api/[controller]")]
diff --git a/MESApplication/Controllers/BaseController.cs b/MESApplication/Controllers/QC/BaseController.cs
similarity index 97%
rename from MESApplication/Controllers/BaseController.cs
rename to MESApplication/Controllers/QC/BaseController.cs
index 22ea012..dd54e7f 100644
--- a/MESApplication/Controllers/BaseController.cs
+++ b/MESApplication/Controllers/QC/BaseController.cs
@@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/QC/MesLineUserController.cs
similarity index 98%
rename from MESApplication/Controllers/MesLineUserController.cs
rename to MESApplication/Controllers/QC/MesLineUserController.cs
index 74259cf..944f756 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/QC/MesLineUserController.cs
@@ -4,7 +4,7 @@
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[ApiController]
[Route("api/[controller]")]
diff --git a/MESApplication/Controllers/RKJController.cs b/MESApplication/Controllers/QC/RKJController.cs
similarity index 99%
rename from MESApplication/Controllers/RKJController.cs
rename to MESApplication/Controllers/QC/RKJController.cs
index a6bed3d..3aea949 100644
--- a/MESApplication/Controllers/RKJController.cs
+++ b/MESApplication/Controllers/QC/RKJController.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/SJController.cs b/MESApplication/Controllers/QC/SJController.cs
similarity index 99%
rename from MESApplication/Controllers/SJController.cs
rename to MESApplication/Controllers/QC/SJController.cs
index d634958..107d6b9 100644
--- a/MESApplication/Controllers/SJController.cs
+++ b/MESApplication/Controllers/QC/SJController.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/SuspendController.cs b/MESApplication/Controllers/QC/SuspendController.cs
similarity index 98%
rename from MESApplication/Controllers/SuspendController.cs
rename to MESApplication/Controllers/QC/SuspendController.cs
index 54e8bfa..ff980df 100644
--- a/MESApplication/Controllers/SuspendController.cs
+++ b/MESApplication/Controllers/QC/SuspendController.cs
@@ -5,7 +5,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/XJController.cs b/MESApplication/Controllers/QC/XJController.cs
similarity index 99%
rename from MESApplication/Controllers/XJController.cs
rename to MESApplication/Controllers/QC/XJController.cs
index 93fe18d..e43cb9f 100644
--- a/MESApplication/Controllers/XJController.cs
+++ b/MESApplication/Controllers/QC/XJController.cs
@@ -6,7 +6,7 @@
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json.Linq;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.QC;
[Route("api/[controller]")]
[ApiController]
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
similarity index 78%
copy from MESApplication/Controllers/MesLineUserController.cs
copy to MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
index 74259cf..007d9f9 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemArnController.cs
@@ -1,19 +1,38 @@
锘縰sing System.Dynamic;
+using MES.Service.Dto.service;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
+public class MesInvItemArnController : ControllerBase
{
- private readonly MesLineUserManager m = new();
+ private readonly MesInvItemArnManager m = new();
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
+ [HttpPost("GetPageList")]
+ public ResponseResult GetPageList(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetPagedResults(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
/// <summary>
/// 鑾峰彇鎵�鏈�
@@ -93,7 +112,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MesLineUser data)
+ public ResponseResult Add([FromBody] MesInvItemArn data)
{
try
{
@@ -117,7 +136,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesLineUser data)
+ public ResponseResult InsertReturnIdentity([FromBody] MesInvItemArn data)
{
try
{
@@ -141,7 +160,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MesLineUser data)
+ public ResponseResult Update([FromBody] MesInvItemArn data)
{
try
{
diff --git a/MESApplication/Controllers/MessageCenterController.cs b/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
similarity index 75%
copy from MESApplication/Controllers/MessageCenterController.cs
copy to MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
index e275539..3e88398 100644
--- a/MESApplication/Controllers/MessageCenterController.cs
+++ b/MESApplication/Controllers/Warehouse/MesInvItemArnDetailController.cs
@@ -1,26 +1,25 @@
锘縰sing System.Dynamic;
+using MES.Service.Dto.service;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MessageCenterController : ControllerBase
+public class MesInvItemArnDetailController : ControllerBase
{
- private readonly MessageCenterManager m = new();
+ private readonly MesInvItemArnDetailManager m = new();
-
- //ResetUpdate
- [HttpPost("ResetUpdate")]
- public ResponseResult ResetUpdate([FromBody] MessageCenter data)
+ [HttpPost("GetDetails")]
+ public ResponseResult GetDetails(WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.ResetUpdate(data);
+ resultInfos.tbBillList = m.GetDetails(query);
return new ResponseResult
{
status = 0,
@@ -34,13 +33,14 @@
}
}
- [HttpPost("GetByPid")]
- public ResponseResult ResetUpdate(int pid)
+ //
+ [HttpPost("GetMaterial")]
+ public ResponseResult GetMaterial(WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetList(it => it.Pid == pid);
+ resultInfos.tbBillList = m.GetMaterial(query);
return new ResponseResult
{
status = 0,
@@ -53,28 +53,6 @@
return ResponseResult.ResponseError(ex);
}
}
-
- [HttpPost("getPushFailed")]
- public ResponseResult getPushFailed(MessageCenter query)
- {
- try
- {
- dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.getPushFailedPage(query);
- return new ResponseResult
- {
- status = 0,
- message = "OK",
- data = resultInfos
- };
- }
- catch (Exception ex)
- {
- return ResponseResult.ResponseError(ex);
- }
- }
-
- /***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
/// <summary>
/// 鑾峰彇鎵�鏈�
@@ -154,12 +132,12 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MessageCenter data)
+ public ResponseResult Add([FromBody] MesInvItemArnDetail data)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.save(data);
+ resultInfos.tbBillList = m.Insert(data);
return new ResponseResult
{
status = 0,
@@ -178,7 +156,8 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MessageCenter data)
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] MesInvItemArnDetail data)
{
try
{
@@ -202,7 +181,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MessageCenter data)
+ public ResponseResult Update([FromBody] MesInvItemArnDetail data)
{
try
{
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
similarity index 88%
copy from MESApplication/Controllers/MesLineUserController.cs
copy to MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
index 74259cf..8ede063 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/Warehouse/MesQaItemsDetect01Controller.cs
@@ -1,16 +1,16 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
+public class MesQaItemsDetect01Controller : ControllerBase
{
- private readonly MesLineUserManager m = new();
+ private readonly MesQaItemsDetect01Manager m = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -93,7 +93,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MesLineUser data)
+ public ResponseResult Add([FromBody] MesQaItemsDetect01 data)
{
try
{
@@ -117,7 +117,8 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesLineUser data)
+ public ResponseResult InsertReturnIdentity(
+ [FromBody] MesQaItemsDetect01 data)
{
try
{
@@ -141,7 +142,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MesLineUser data)
+ public ResponseResult Update([FromBody] MesQaItemsDetect01 data)
{
try
{
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/Warehouse/PurdhbController.cs
similarity index 90%
copy from MESApplication/Controllers/MesLineUserController.cs
copy to MESApplication/Controllers/Warehouse/PurdhbController.cs
index 74259cf..3687f1d 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/Warehouse/PurdhbController.cs
@@ -1,16 +1,16 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
+public class PurdhbController : ControllerBase
{
- private readonly MesLineUserManager m = new();
+ private readonly PurdhbManager m = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -93,7 +93,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MesLineUser data)
+ public ResponseResult Add([FromBody] Purdhb data)
{
try
{
@@ -117,7 +117,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesLineUser data)
+ public ResponseResult InsertReturnIdentity([FromBody] Purdhb data)
{
try
{
@@ -141,7 +141,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MesLineUser data)
+ public ResponseResult Update([FromBody] Purdhb data)
{
try
{
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/Warehouse/PurdkaController.cs
similarity index 90%
copy from MESApplication/Controllers/MesLineUserController.cs
copy to MESApplication/Controllers/Warehouse/PurdkaController.cs
index 74259cf..3f0b71d 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/Warehouse/PurdkaController.cs
@@ -1,16 +1,16 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
+public class PurdkaController : ControllerBase
{
- private readonly MesLineUserManager m = new();
+ private readonly PurdkaManager m = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -93,7 +93,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MesLineUser data)
+ public ResponseResult Add([FromBody] Purdka data)
{
try
{
@@ -117,7 +117,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesLineUser data)
+ public ResponseResult InsertReturnIdentity([FromBody] Purdka data)
{
try
{
@@ -141,7 +141,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MesLineUser data)
+ public ResponseResult Update([FromBody] Purdka data)
{
try
{
diff --git a/MESApplication/Controllers/MesLineUserController.cs b/MESApplication/Controllers/Warehouse/PurdkbController.cs
similarity index 90%
copy from MESApplication/Controllers/MesLineUserController.cs
copy to MESApplication/Controllers/Warehouse/PurdkbController.cs
index 74259cf..8ebf009 100644
--- a/MESApplication/Controllers/MesLineUserController.cs
+++ b/MESApplication/Controllers/Warehouse/PurdkbController.cs
@@ -1,16 +1,16 @@
锘縰sing System.Dynamic;
using MES.Service.Modes;
-using MES.Service.service;
+using MES.Service.service.Warehouse;
using MES.Service.util;
using Microsoft.AspNetCore.Mvc;
-namespace MESApplication.Controllers;
+namespace MESApplication.Controllers.Warehouse;
[ApiController]
[Route("api/[controller]")]
-public class MesLineUserController : ControllerBase
+public class PurdkbController : ControllerBase
{
- private readonly MesLineUserManager m = new();
+ private readonly PurdkbManager m = new();
/***杩涘叆妯＄増绠＄悊鍙互淇敼妯＄増***/
@@ -93,7 +93,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Insert")]
- public ResponseResult Add([FromBody] MesLineUser data)
+ public ResponseResult Add([FromBody] Purdkb data)
{
try
{
@@ -117,7 +117,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("InsertReturnIdentity")]
- public ResponseResult InsertReturnIdentity([FromBody] MesLineUser data)
+ public ResponseResult InsertReturnIdentity([FromBody] Purdkb data)
{
try
{
@@ -141,7 +141,7 @@
/// </summary>
/// <returns></returns>
[HttpPost("Update")]
- public ResponseResult Update([FromBody] MesLineUser data)
+ public ResponseResult Update([FromBody] Purdkb data)
{
try
{
diff --git a/MESApplication/Controllers/WomcaaController.cs b/MESApplication/Controllers/WomcaaController.cs
index 7ca725a..50c2651 100644
--- a/MESApplication/Controllers/WomcaaController.cs
+++ b/MESApplication/Controllers/WomcaaController.cs
@@ -12,9 +12,8 @@
[Route("api/[controller]")]
public class WomcaaController : ControllerBase
{
- private readonly WomcaaManager m = new();
-
private readonly MessageCenterManager _manager = new();
+ private readonly WomcaaManager m = new();
private readonly string METHOD = "POST";
diff --git a/MESApplication/Startup.cs b/MESApplication/Startup.cs
index fb5ae6c..20a55e3 100644
--- a/MESApplication/Startup.cs
+++ b/MESApplication/Startup.cs
@@ -25,7 +25,7 @@
{
c.SwaggerDoc("v1",
new OpenApiInfo
- { Title = "WebFirst.Api", Version = "v1" });
+ { Title = "MESApplication.Api", Version = "v1" });
});
//閰嶇疆JSON.NET
@@ -42,6 +42,9 @@
// 璁剧疆鍛藉悕绛栫暐涓洪┘宄板懡鍚�
opt.SerializerSettings.ContractResolver =
new CamelCasePropertyNamesContractResolver();
+
+ //杩斿洖缁欏墠绔殑鏃堕棿鏍煎紡鍖�
+ opt.SerializerSettings.DateFormatString = "yyyy-MM-dd HH:mm:ss";
});
//閰嶇疆鍙互璺ㄥ煙
diff --git a/MESApplication/bin/Debug/net8.0/MES.Service.dll b/MESApplication/bin/Debug/net8.0/MES.Service.dll
index 51bc172..6d2f60f 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 40c5073..dcd0d5e 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 0383e0a..f425719 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 d0eabea..57e8c1e 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 e58fd66..77bf131 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/Release/net8.0/MES.Service.dll b/MESApplication/bin/Release/net8.0/MES.Service.dll
index 6aed25f..ba6228b 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 437449f..0ed0ab8 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 0f10fd0..80a4d57 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 d0eabea..57e8c1e 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 4c9c54a..1c55a33 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 6aed25f..ba6228b 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 437449f..0ed0ab8 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 0f10fd0..80a4d57 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 d0eabea..57e8c1e 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 4c9c54a..1c55a33 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