From 554fa8ad99c42b6c0e3ed2c56358a3d7dd9ded6e Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 13 十二月 2024 14:11:45 +0800
Subject: [PATCH] 11

---
 MES.Service/Modes/SysDepartment.cs                                |    2 
 MES.Service/Modes/Womcab.cs                                       |  378 +++++++++++++-------------
 MES.Service/service/BasicData/MesStaffManager.cs                  |    5 
 MES.Service/Modes/SysOrganization.cs                              |   51 +-
 MES.Service/service/BasicData/OrganizeManager.cs                  |    2 
 MES.Service/Modes/Womcaa.cs                                       |  161 ++++++-----
 MES.Service/service/BasicData/MesRohInManager.cs                  |    6 
 MES.Service/service/WomcabManager.cs                              |   95 +++---
 MES.Service/Dto/webApi/ErpProductionOrderDto.cs                   |    1 
 MES.Service/service/BasicData/MesRohInDataManager.cs              |    2 
 MESApplication/Controllers/BasicData/ProductionOrderController.cs |    2 
 MES.Service/Modes/MesStaff.cs                                     |   99 +++---
 12 files changed, 405 insertions(+), 399 deletions(-)

diff --git a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
index 0e06c3d..67f0221 100644
--- a/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
+++ b/MES.Service/Dto/webApi/ErpProductionOrderDto.cs
@@ -39,6 +39,7 @@
     public string? FPurOrderEntrySeq { get; set; } // 閲囪喘璁㈠崟琛屽彿
     public string? FBaseStockInQty { get; set; } // 鍏ュ簱鏁伴噺
     public string? FBaseNoStockInQty { get; set; } // 鏈叆搴撴暟閲�
+
     public string? FInStockOwnerId { get; set; } // 鍏ュ簱璐т富
     // public string? FSUPPLIERID { get; set; } // 渚涘簲鍟咺D
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/MesStaff.cs b/MES.Service/Modes/MesStaff.cs
index b458632..2d42d2b 100644
--- a/MES.Service/Modes/MesStaff.cs
+++ b/MES.Service/Modes/MesStaff.cs
@@ -9,148 +9,147 @@
 public class MesStaff
 {
     /// <summary>
-    ///  
-    /// 榛樿鍊�: (newid())
-    ///</summary>
+    ///     榛樿鍊�: (newid())
+    /// </summary>
     [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    /// ID 
-    ///</summary>
+    ///     ID
+    /// </summary>
     [SugarColumn(ColumnName = "id")]
     public decimal Id { get; set; }
 
     /// <summary>
-    /// 鍛樺伐缂栫爜 
-    ///</summary>
+    ///     鍛樺伐缂栫爜
+    /// </summary>
     [SugarColumn(ColumnName = "staff_no")]
     public string? StaffNo { get; set; }
 
     /// <summary>
-    /// 鍛樺伐濮撳悕 
-    ///</summary>
+    ///     鍛樺伐濮撳悕
+    /// </summary>
     [SugarColumn(ColumnName = "staff_name")]
     public string? StaffName { get; set; }
 
     /// <summary>
-    /// 閮ㄩ棬缂栫爜 
-    ///</summary>
+    ///     閮ㄩ棬缂栫爜
+    /// </summary>
     [SugarColumn(ColumnName = "department_no")]
     public string? DepartmentNo { get; set; }
 
     /// <summary>
-    /// 閮ㄩ棬鍚嶇О 
-    ///</summary>
+    ///     閮ㄩ棬鍚嶇О
+    /// </summary>
     [SugarColumn(ColumnName = "department_name")]
     public string? DepartmentName { get; set; }
 
     /// <summary>
-    /// 宀椾綅缂栫爜 
-    ///</summary>
+    ///     宀椾綅缂栫爜
+    /// </summary>
     [SugarColumn(ColumnName = "position_code")]
     public string? PositionCode { get; set; }
 
     /// <summary>
-    /// 宀椾綅鍚嶇О 
-    ///</summary>
+    ///     宀椾綅鍚嶇О
+    /// </summary>
     [SugarColumn(ColumnName = "position_name")]
     public string? PositionName { get; set; }
 
     /// <summary>
-    /// 鎵嬫満鍙� 
-    ///</summary>
+    ///     鎵嬫満鍙�
+    /// </summary>
     [SugarColumn(ColumnName = "phone_number")]
     public string? PhoneNumber { get; set; }
 
     /// <summary>
-    /// 浠诲矖寮�濮嬫棩鏈� 
-    ///</summary>
+    ///     浠诲矖寮�濮嬫棩鏈�
+    /// </summary>
     [SugarColumn(ColumnName = "start_date")]
     public DateTime? StartDate { get; set; }
 
     /// <summary>
-    /// 澶囨敞 
-    ///</summary>
+    ///     澶囨敞
+    /// </summary>
     [SugarColumn(ColumnName = "remark")]
     public string? Remark { get; set; }
 
     /// <summary>
-    /// 鑷畾涔夊瓧娈�3 
-    ///</summary>
+    ///     鑷畾涔夊瓧娈�3
+    /// </summary>
     [SugarColumn(ColumnName = "remark3")]
     public string? Remark3 { get; set; }
 
     /// <summary>
-    /// 鑷畾涔夊瓧娈�4 
-    ///</summary>
+    ///     鑷畾涔夊瓧娈�4
+    /// </summary>
     [SugarColumn(ColumnName = "remark4")]
     public string? Remark4 { get; set; }
 
     /// <summary>
-    /// 鑷畾涔夊瓧娈�5 
-    ///</summary>
+    ///     鑷畾涔夊瓧娈�5
+    /// </summary>
     [SugarColumn(ColumnName = "remark5")]
     public string? Remark5 { get; set; }
 
     /// <summary>
-    /// 鍒涘缓浜� 
-    ///</summary>
+    ///     鍒涘缓浜�
+    /// </summary>
     [SugarColumn(ColumnName = "create_by")]
     public string? CreateBy { get; set; }
 
     /// <summary>
-    /// 鍒涘缓鏃堕棿 
-    ///</summary>
+    ///     鍒涘缓鏃堕棿
+    /// </summary>
     [SugarColumn(ColumnName = "create_date")]
     public DateTime? CreateDate { get; set; }
 
     /// <summary>
-    /// 鏇存柊浜� 
-    ///</summary>
+    ///     鏇存柊浜�
+    /// </summary>
     [SugarColumn(ColumnName = "lastupdate_by")]
     public string? LastupdateBy { get; set; }
 
     /// <summary>
-    /// 鏇存柊鏃堕棿 
-    ///</summary>
+    ///     鏇存柊鏃堕棿
+    /// </summary>
     [SugarColumn(ColumnName = "lastupdate_date")]
     public DateTime? LastupdateDate { get; set; }
 
     /// <summary>
-    /// 澶囨敞 
-    ///</summary>
+    ///     澶囨敞
+    /// </summary>
     [SugarColumn(ColumnName = "memo")]
     public string? Memo { get; set; }
 
     /// <summary>
-    /// 鐢熶骇绾� 
-    ///</summary>
+    ///     鐢熶骇绾�
+    /// </summary>
     [SugarColumn(ColumnName = "line_no")]
     public string? LineNo { get; set; }
 
     /// <summary>
-    /// 鐢熶骇鍛樺伐鏍囪瘑 
-    /// 榛樿鍊�: ((1))
-    ///</summary>
+    ///     鐢熶骇鍛樺伐鏍囪瘑
+    ///     榛樿鍊�: ((1))
+    /// </summary>
     [SugarColumn(ColumnName = "work_mk")]
     public int? WorkMk { get; set; }
 
     /// <summary>
-    /// 鏄惁绂佺敤 
-    ///</summary>
+    ///     鏄惁绂佺敤
+    /// </summary>
     [SugarColumn(ColumnName = "fforbid_status")]
     public string? FforbidStatus { get; set; }
 
     /// <summary>
-    /// 鍒涘缓缁勭粐 
-    ///</summary>
+    ///     鍒涘缓缁勭粐
+    /// </summary>
     [SugarColumn(ColumnName = "Fumbrella")]
     public string? Fumbrella { get; set; }
 
     /// <summary>
-    /// 浣跨敤缁勭粐 
-    ///</summary>
+    ///     浣跨敤缁勭粐
+    /// </summary>
     [SugarColumn(ColumnName = "FSubsidiary")]
     public string? FSubsidiary { get; set; }
 
diff --git a/MES.Service/Modes/SysDepartment.cs b/MES.Service/Modes/SysDepartment.cs
index 66e30f4..38bc21a 100644
--- a/MES.Service/Modes/SysDepartment.cs
+++ b/MES.Service/Modes/SysDepartment.cs
@@ -138,7 +138,7 @@
     [SugarColumn(ColumnName = "material_properti")]
     public string? MaterialProperti { get; set; }
 
-    
+
     /// <summary>
     ///     鑷畾涔夊瓧娈�4
     /// </summary>
diff --git a/MES.Service/Modes/SysOrganization.cs b/MES.Service/Modes/SysOrganization.cs
index d617696..c1978d0 100644
--- a/MES.Service/Modes/SysOrganization.cs
+++ b/MES.Service/Modes/SysOrganization.cs
@@ -8,81 +8,78 @@
 public class SysOrganization
 {
     /// <summary>
-    /// 涓婚敭 
-    ///</summary>
+    ///     涓婚敭
+    /// </summary>
     [SugarColumn(ColumnName = "GUID", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    /// 鍚嶇О 
-    ///</summary>
+    ///     鍚嶇О
+    /// </summary>
     [SugarColumn(ColumnName = "NAME")]
     public string? Name { get; set; }
 
     /// <summary>
-    /// 鑱旂郴浜� 
-    ///</summary>
+    ///     鑱旂郴浜�
+    /// </summary>
     [SugarColumn(ColumnName = "CON_PEOPLE")]
     public string? ConPeople { get; set; }
 
     /// <summary>
-    /// 鑱旂郴鐢佃瘽 
-    ///</summary>
+    ///     鑱旂郴鐢佃瘽
+    /// </summary>
     [SugarColumn(ColumnName = "CON_TEL")]
     public string? ConTel { get; set; }
 
     /// <summary>
-    /// 绯荤粺鍐呯疆 
-    ///</summary>
+    ///     绯荤粺鍐呯疆
+    /// </summary>
     [SugarColumn(ColumnName = "IS_SYS")]
     public int? IsSys { get; set; }
 
     /// <summary>
-    /// 鐘舵�� 
-    ///</summary>
+    ///     鐘舵��
+    /// </summary>
     [SugarColumn(ColumnName = "IS_STATUS")]
     public bool? IsStatus { get; set; }
 
     /// <summary>
-    /// 缂栬緫鏃堕棿 
-    ///</summary>
+    ///     缂栬緫鏃堕棿
+    /// </summary>
     [SugarColumn(ColumnName = "EDT_TIME")]
     public DateTime? EdtTime { get; set; }
 
     /// <summary>
-    ///  
-    ///</summary>
+    /// </summary>
     [SugarColumn(ColumnName = "check_date")]
     public DateTime? CheckDate { get; set; }
 
     /// <summary>
-    ///  
-    ///</summary>
+    /// </summary>
     [SugarColumn(ColumnName = "check_by")]
     public string? CheckBy { get; set; }
 
     /// <summary>
-    ///  
-    /// 榛樿鍊�: ((0))
-    ///</summary>
+    ///     榛樿鍊�: ((0))
+    /// </summary>
     [SugarColumn(ColumnName = "check_status")]
     public bool? CheckStatus { get; set; }
 
     /// <summary>
-    /// 缁勭粐ID 
-    ///</summary>
+    ///     缁勭粐ID
+    /// </summary>
     [SugarColumn(ColumnName = "FID")]
     public string? Fid { get; set; }
 
     /// <summary>
-    /// 缁勭粐缂栧彿 
-    ///</summary>
+    ///     缁勭粐缂栧彿
+    /// </summary>
     [SugarColumn(ColumnName = "FNumber")]
     public string? FNumber { get; set; }
 
     /// <summary>
-    /// 鐖剁骇ID 
-    ///</summary>
+    ///     鐖剁骇ID
+    /// </summary>
     [SugarColumn(ColumnName = "FParentlD")]
     public string? FParentlD { get; set; }
 
diff --git a/MES.Service/Modes/Womcaa.cs b/MES.Service/Modes/Womcaa.cs
index 697634d..0dc869e 100644
--- a/MES.Service/Modes/Womcaa.cs
+++ b/MES.Service/Modes/Womcaa.cs
@@ -3,7 +3,7 @@
 namespace MES.Service.Modes;
 
 /// <summary>
-///     宸ュ崟琛�
+///     鐢熶骇浠诲姟鍗曡〃
 /// </summary>
 [SugarTable("WOMCAA")]
 public class Womcaa
@@ -24,43 +24,43 @@
     ///     鍗曟嵁缂栧彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA001")]
-    public string? Caa001 { get; set; }
+    public string Caa001 { get; set; }
 
     /// <summary>
     ///     鍗曟嵁绫诲瀷(&quot;1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇&quot;)
     /// </summary>
     [SugarColumn(ColumnName = "CAA004")]
-    public string? Caa004 { get; set; }
+    public string Caa004 { get; set; }
 
     /// <summary>
     ///     璁″垝涓嬭揪鏃ユ湡
     /// </summary>
     [SugarColumn(ColumnName = "CAA005")]
-    public string? Caa005 { get; set; }
+    public string Caa005 { get; set; }
 
     /// <summary>
-    ///     浜у搧缂栫爜
+    ///     浜у搧ID
     /// </summary>
     [SugarColumn(ColumnName = "CAA006")]
-    public string? Caa006 { get; set; }
+    public string Caa006 { get; set; }
 
     /// <summary>
     ///     鍗曚綅
     /// </summary>
     [SugarColumn(ColumnName = "CAA009")]
-    public string? Caa009 { get; set; }
+    public string Caa009 { get; set; }
 
     /// <summary>
     ///     棰勮寮�宸ユ椂闂�
     /// </summary>
     [SugarColumn(ColumnName = "CAA010")]
-    public string? Caa010 { get; set; }
+    public string Caa010 { get; set; }
 
     /// <summary>
     ///     棰勮瀹屽伐鏃堕棿
     /// </summary>
     [SugarColumn(ColumnName = "CAA011")]
-    public string? Caa011 { get; set; }
+    public string Caa011 { get; set; }
 
     /// <summary>
     ///     宸ュ崟鏁伴噺
@@ -72,19 +72,19 @@
     ///     BOM鐗堟
     /// </summary>
     [SugarColumn(ColumnName = "CAA013")]
-    public string? Caa013 { get; set; }
+    public string Caa013 { get; set; }
 
-    // /// <summary>
-    // ///     閿�鍞鍗曞彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CAA015")]
-    // public string? Caa015 { get; set; }
+    /// <summary>
+    ///     閿�鍞鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "CAA015")]
+    public string Caa015 { get; set; }
 
     /// <summary>
     ///     澶囨敞
     /// </summary>
     [SugarColumn(ColumnName = "CAA016")]
-    public string? Caa016 { get; set; }
+    public string Caa016 { get; set; }
 
     /// <summary>
     ///     宸叉帓鏁伴噺锛堝純鐢級
@@ -108,13 +108,13 @@
     ///     ERP鐢熶骇璁㈠崟鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "CAA020")]
-    public string? Caa020 { get; set; }
+    public string Caa020 { get; set; }
 
     /// <summary>
     ///     鐢熶骇杞﹂棿
     /// </summary>
     [SugarColumn(ColumnName = "CAA021")]
-    public string? Caa021 { get; set; }
+    public string Caa021 { get; set; }
 
     /// <summary>
     ///     瀹℃牳鐮�
@@ -132,7 +132,7 @@
     ///     瀹℃牳浜�
     /// </summary>
     [SugarColumn(ColumnName = "CHECK_USER")]
-    public string? CheckUser { get; set; }
+    public string CheckUser { get; set; }
 
     /// <summary>
     ///     鏈帓鏁伴噺锛堝純鐢級
@@ -144,7 +144,7 @@
     ///     涓氬姟鐘舵��(&quot;1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�&quot;)
     /// </summary>
     [SugarColumn(ColumnName = "CAA023")]
-    public string? Caa023 { get; set; }
+    public string Caa023 { get; set; }
 
     /// <summary>
     ///     宸插叆搴撴暟閲�
@@ -156,121 +156,121 @@
     ///     宸ヨ壓璺嚎
     /// </summary>
     [SugarColumn(ColumnName = "ROUTING_ID")]
-    public string? RoutingId { get; set; }
+    public string RoutingId { get; set; }
 
     /// <summary>
     ///     浜х嚎
     /// </summary>
     [SugarColumn(ColumnName = "WORK_SHOP_ID")]
-    public string? WorkShopId { get; set; }
+    public string WorkShopId { get; set; }
 
     /// <summary>
     ///     浠撳簱
     /// </summary>
     [SugarColumn(ColumnName = "DEPOT_CODE")]
-    public string? DepotCode { get; set; }
+    public string DepotCode { get; set; }
 
     /// <summary>
     ///     鍗曟嵁鏃ユ湡
     /// </summary>
     [SugarColumn(ColumnName = "CREATE_DATE")]
-    public string? CreateDate { get; set; }
+    public string CreateDate { get; set; }
 
     /// <summary>
     ///     璁″垝缁�
     /// </summary>
     [SugarColumn(ColumnName = "WORK_GROUP_ID")]
-    public string? WorkGroupId { get; set; }
+    public string WorkGroupId { get; set; }
 
     /// <summary>
     ///     璁″垝鍛�
     /// </summary>
     [SugarColumn(ColumnName = "PLAN_ID")]
-    public string? PlanId { get; set; }
+    public string PlanId { get; set; }
 
     /// <summary>
     ///     鍏ュ簱涓婇檺
     /// </summary>
     [SugarColumn(ColumnName = "STOCK_INLIMITH")]
-    public string? StockInlimith { get; set; }
+    public string StockInlimith { get; set; }
 
     /// <summary>
     ///     鍏ュ簱涓嬮檺
     /// </summary>
     [SugarColumn(ColumnName = "STOCK_INLIMITL")]
-    public string? StockInlimitl { get; set; }
+    public string StockInlimitl { get; set; }
 
     /// <summary>
     ///     涓昏溅闂磋皟搴﹀崟
     /// </summary>
     [SugarColumn(ColumnName = "MTONO")]
-    public string? Mtono { get; set; }
+    public string Mtono { get; set; }
 
     /// <summary>
     ///     鎵规
     /// </summary>
     [SugarColumn(ColumnName = "LOT")]
-    public string? Lot { get; set; }
+    public string Lot { get; set; }
 
-    // /// <summary>
-    // ///     寮曠敤鍗曞彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CAA015_HEAD")]
-    // public string? Caa015Head { get; set; }
+    /// <summary>
+    ///     寮曠敤鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "CAA015_HEAD")]
+    public string Caa015Head { get; set; }
 
     /// <summary>
     ///     鍒跺崟绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "CREATE_TYPE")]
-    public string? CreateType { get; set; }
+    public string CreateType { get; set; }
 
     /// <summary>
     ///     鏉ユ簮鍗曟嵁绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
-    public string? SrcBillType { get; set; }
+    public string SrcBillType { get; set; }
 
     /// <summary>
     ///     鏉ユ簮鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILL_NO")]
-    public string? SrcBillNo { get; set; }
+    public string SrcBillNo { get; set; }
 
     /// <summary>
     ///     鏉ユ簮琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
-    public string? SrcBillentryseq { get; set; }
+    public string SrcBillentryseq { get; set; }
 
     /// <summary>
     ///     閿�鍞鍗曞彿
     /// </summary>
     [SugarColumn(ColumnName = "SALE_ORDER_NO")]
-    public string? SaleOrderNo { get; set; }
+    public string SaleOrderNo { get; set; }
 
     /// <summary>
     ///     閿�鍞鍗曡鍙�
     /// </summary>
     [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
-    public string? SaleOrderEntryseq { get; set; }
+    public string SaleOrderEntryseq { get; set; }
 
     /// <summary>
     ///     寮哄埗鍏抽棴浜�
     /// </summary>
     [SugarColumn(ColumnName = "FORCE_CLOSERID")]
-    public string? ForceCloserid { get; set; }
+    public string ForceCloserid { get; set; }
 
     /// <summary>
     ///     鍏抽棴绫诲瀷
     /// </summary>
     [SugarColumn(ColumnName = "CLOSE_TYPE")]
-    public string? CloseType { get; set; }
+    public string CloseType { get; set; }
 
     /// <summary>
     ///     鍒嗗崟鍙�
     /// </summary>
     [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
-    public string? SrcSplitBillno { get; set; }
+    public string SrcSplitBillno { get; set; }
 
     /// <summary>
     ///     鏄惁绠℃帶
@@ -284,45 +284,45 @@
     [SugarColumn(ColumnName = "ERP_WTZZ")]
     public int? ErpWtzz { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
-    // public string? MainProductNo { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
+    public string MainProductNo { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
-    // public int? MainProductQty { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+    public int? MainProductQty { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
-    // public string? CustomerItemNumber { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+    public string CustomerItemNumber { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
-    // public string? PackingListNumber { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+    public string PackingListNumber { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CUSTOMER_NAME")]
-    // public string? CustomerName { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "CUSTOMER_NAME")]
+    public string CustomerName { get; set; }
 
-    // /// <summary>
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CUSTOMER")]
-    // public string? Customer { get; set; }
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "CUSTOMER")]
+    public string Customer { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "TYPE")]
-    public string? Type { get; set; }
+    public string Type { get; set; }
 
     /// <summary>
     /// </summary>
     [SugarColumn(ColumnName = "JA_BS")]
-    public string? JaBs { get; set; }
+    public string JaBs { get; set; }
 
     /// <summary>
     /// </summary>
@@ -335,10 +335,9 @@
     public int? YpNum { get; set; }
 
     /// <summary>
-    ///     棰勮瀹屽伐鏃堕棿澶囦唤
     /// </summary>
     [SugarColumn(ColumnName = "CAA011_1")]
-    public string? Caa0111 { get; set; }
+    public string Caa0111 { get; set; }
 
     /// <summary>
     /// </summary>
@@ -390,17 +389,29 @@
     ///     閲囪喘璁㈠崟鍙�
     /// </summary>
     [SugarColumn(ColumnName = "FPURORDERNO")]
-    public string? Fpurorderno { get; set; }
+    public string Fpurorderno { get; set; }
 
     /// <summary>
     ///     閲囪喘璁㈠崟琛屽彿
     /// </summary>
     [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
-    public string? Fpurorderentryseq { get; set; }
+    public string Fpurorderentryseq { get; set; }
 
     /// <summary>
     ///     澶囨敞锛堣〃浣擄級
     /// </summary>
     [SugarColumn(ColumnName = "Btbz")]
-    public string? Btbz { get; set; }
+    public string Btbz { get; set; }
+
+    /// <summary>
+    ///     婧愭媶鍒嗚鍗曠紪鍙�
+    /// </summary>
+    [SugarColumn(ColumnName = "fmoentryid")]
+    public string Fmoentryid { get; set; }
+
+    /// <summary>
+    ///     鎺掍骇绾垮埆
+    /// </summary>
+    [SugarColumn(ColumnName = "prod_line")]
+    public string ProdLine { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/Modes/Womcab.cs b/MES.Service/Modes/Womcab.cs
index efd50ee..46ec80d 100644
--- a/MES.Service/Modes/Womcab.cs
+++ b/MES.Service/Modes/Womcab.cs
@@ -3,247 +3,247 @@
 namespace MES.Service.Modes;
 
 /// <summary>
-///     浠诲姟鍗曠墿鏂欒〃
+///     浠诲姟鍗曠墿鏂欒〃bom
 /// </summary>
 [SugarTable("WOMCAB")]
 public class Womcab
 {
-    /// <summary>
-    ///     榛樿鍊�: (newid())
-    /// </summary>
-    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+ /// <summary>
+ ///     榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
-    /// <summary>
-    ///     ERPID
-    /// </summary>
-    [SugarColumn(ColumnName = "ERPID")]
+ /// <summary>
+ ///     ERPID
+ /// </summary>
+ [SugarColumn(ColumnName = "ERPID")]
     public int? Erpid { get; set; }
 
-    /// <summary>
-    ///     宸ュ崟鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB001")]
-    public string? Cab001 { get; set; }
+ /// <summary>
+ ///     宸ュ崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB001")]
+    public string Cab001 { get; set; }
 
-    /// <summary>
-    ///     搴忓彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB002")]
+ /// <summary>
+ ///     搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB002")]
     public int? Cab002 { get; set; }
 
-    /// <summary>
-    ///     鏉愭枡缂栫爜
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB003")]
-    public string? Cab003 { get; set; }
+ /// <summary>
+ ///     鏉愭枡缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB003")]
+    public string Cab003 { get; set; }
 
-    /// <summary>
-    ///     闇�棰嗙敤閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB006")]
+ /// <summary>
+ ///     闇�棰嗙敤閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB006")]
     public decimal? Cab006 { get; set; }
 
-    /// <summary>
-    ///     宸查鐢ㄩ噺
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB007")]
+ /// <summary>
+ ///     宸查鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB007")]
     public decimal? Cab007 { get; set; }
 
-    /// <summary>
-    ///     宸ヨ壓
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB008")]
-    public string? Cab008 { get; set; }
+ /// <summary>
+ ///     宸ヨ壓
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB008")]
+    public string Cab008 { get; set; }
 
-    /// <summary>
-    ///     鍗曚綅
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB009")]
-    public string? Cab009 { get; set; }
+ /// <summary>
+ ///     鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB009")]
+    public string Cab009 { get; set; }
 
-    /// <summary>
-    ///     缁勬垚鐢ㄩ噺
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB012")]
+ /// <summary>
+ ///     缁勬垚鐢ㄩ噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB012")]
     public decimal? Cab012 { get; set; }
 
-    /// <summary>
-    ///     鏄惁鏇挎枡
-    /// </summary>
-    [SugarColumn(ColumnName = "CAB014")]
-    public string? Cab014 { get; set; }
+ /// <summary>
+ ///     鏄惁鏇挎枡
+ /// </summary>
+ [SugarColumn(ColumnName = "CAB014")]
+    public string Cab014 { get; set; }
 
-    /// <summary>
-    ///     PID
-    /// </summary>
-    [SugarColumn(ColumnName = "PID")]
+ /// <summary>
+ ///     PID
+ /// </summary>
+ [SugarColumn(ColumnName = "PID")]
     public int? Pid { get; set; }
 
-    /// <summary>
-    ///     ERP澶碔D
-    /// </summary>
-    [SugarColumn(ColumnName = "EID")]
+ /// <summary>
+ ///     ERP澶碔D
+ /// </summary>
+ [SugarColumn(ColumnName = "EID")]
     public int? Eid { get; set; }
 
-    /// <summary>
-    ///     浣嶇疆鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "POSITION_NO")]
-    public string? PositionNo { get; set; }
+ /// <summary>
+ ///     浣嶇疆鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "POSITION_NO")]
+    public string PositionNo { get; set; }
 
-    /// <summary>
-    ///     鍙戞枡缁勭粐
-    /// </summary>
-    [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
-    public string? IssuingOrganization { get; set; }
+ /// <summary>
+ ///     鍙戞枡缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUING_ORGANIZATION")]
+    public string IssuingOrganization { get; set; }
 
-    /// <summary>
-    ///     渚涘簲缁勭粐
-    /// </summary>
-    [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
-    public string? SupplyOrganization { get; set; }
+ /// <summary>
+ ///     渚涘簲缁勭粐
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLY_ORGANIZATION")]
+    public string SupplyOrganization { get; set; }
 
-    /// <summary>
-    ///     璐т富
-    /// </summary>
-    [SugarColumn(ColumnName = "OWNER_ID")]
-    public string? OwnerId { get; set; }
+ /// <summary>
+ ///     璐т富
+ /// </summary>
+ [SugarColumn(ColumnName = "OWNER_ID")]
+    public string OwnerId { get; set; }
 
-    /// <summary>
-    ///     璁″垝璺熻釜鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "MTONO")]
-    public string? Mtono { 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 = "LOT")]
+    public string Lot { get; set; }
 
-    /// <summary>
-    ///     浠撳簱
-    /// </summary>
-    [SugarColumn(ColumnName = "DEPOT_CODE")]
-    public string? DepotCode { get; set; }
+ /// <summary>
+ ///     浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
+    public string DepotCode { get; set; }
 
-    /// <summary>
-    ///     鍙戞枡鏂瑰紡
-    /// </summary>
-    [SugarColumn(ColumnName = "ISSUE_TYPE")]
-    public string? IssueType { get; set; }
+ /// <summary>
+ ///     鍙戞枡鏂瑰紡
+ /// </summary>
+ [SugarColumn(ColumnName = "ISSUE_TYPE")]
+    public string IssueType { get; set; }
 
-    /// <summary>
-    ///     渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
-    /// </summary>
-    [SugarColumn(ColumnName = "SUPPLY_TYPE")]
-    public string? SupplyType { get; set; }
+ /// <summary>
+ ///     渚涘簲绫诲瀷(C閲囪喘 Z鑷埗 W濮斿)
+ /// </summary>
+ [SugarColumn(ColumnName = "SUPPLY_TYPE")]
+    public string SupplyType { get; set; }
 
-    /// <summary>
-    ///     鍒嗗瓙
-    /// </summary>
-    [SugarColumn(ColumnName = "NUMERATOR")]
-    public string? Numerator { get; set; }
+ /// <summary>
+ ///     鍒嗗瓙
+ /// </summary>
+ [SugarColumn(ColumnName = "NUMERATOR")]
+    public string Numerator { get; set; }
 
-    /// <summary>
-    ///     鍒嗘瘝
-    /// </summary>
-    [SugarColumn(ColumnName = "DENOMINATOR")]
-    public string? Denominator { get; set; }
+ /// <summary>
+ ///     鍒嗘瘝
+ /// </summary>
+ [SugarColumn(ColumnName = "DENOMINATOR")]
+    public string Denominator { get; set; }
 
-    /// <summary>
-    ///     鍥哄畾鎹熻��
-    /// </summary>
-    [SugarColumn(ColumnName = "SCRAPQTY")]
-    public string? Scrapqty { get; set; }
+ /// <summary>
+ ///     鍥哄畾鎹熻��
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPQTY")]
+    public string Scrapqty { get; set; }
 
-    /// <summary>
-    ///     鍙樺姩鎹熻�楃巼
-    /// </summary>
-    [SugarColumn(ColumnName = "SCRAPRATE")]
-    public string? Scraprate { get; set; }
+ /// <summary>
+ ///     鍙樺姩鎹熻�楃巼
+ /// </summary>
+ [SugarColumn(ColumnName = "SCRAPRATE")]
+    public string Scraprate { get; set; }
 
-    // /// <summary>
-    // ///     瀹㈡埛璐у彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
-    // public string? CustomerItemNumber { get; set; }
+ /// <summary>
+ ///     瀹㈡埛璐у彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+    public string CustomerItemNumber { get; set; }
 
-    // /// <summary>
-    // ///     鍖呰鍗曞彿
-    // /// </summary>
-    // [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
-    // public string? PackingListNumber { get; set; }
+ /// <summary>
+ ///     鍖呰鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+    public string PackingListNumber { get; set; }
 
-    // /// <summary>
-    // ///     涓讳骇鍝�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT")]
-    // public string? MainProduct { get; set; }
+ /// <summary>
+ ///     涓讳骇鍝�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT")]
+    public string MainProduct { get; set; }
 
-    // /// <summary>
-    // ///     涓讳骇鍝佹暟閲�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
-    // public int? MainProductQty { get; set; }
+ /// <summary>
+ ///     涓讳骇鍝佹暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+    public int? MainProductQty { get; set; }
 
-    // /// <summary>
-    // ///     鐖堕」鐗╂枡鍚嶇О
-    // /// </summary>
-    // [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
-    // public string? ParentItemName { get; set; }
+ /// <summary>
+ ///     鐖堕」鐗╂枡鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "PARENT_ITEM_NAME")]
+    public string ParentItemName { get; set; }
 
-    // /// <summary>
-    // ///     閿�鍞鍗�
-    // /// </summary>
-    // [SugarColumn(ColumnName = "FSALEORDERNO")]
-    // public string? Fsaleorderno { get; set; }
+ /// <summary>
+ ///     閿�鍞鍗�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSALEORDERNO")]
+    public string Fsaleorderno { get; set; }
 
-    /// <summary>
-    ///     璐т富绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "FOWNERTYPEID")]
-    public string? Fownertypeid { get; set; }
+ /// <summary>
+ ///     璐т富绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FOWNERTYPEID")]
+    public string Fownertypeid { get; set; }
 
-    /// <summary>
-    ///     椤规鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "FREPLACEGROUP")]
+ /// <summary>
+ ///     椤规鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "FREPLACEGROUP")]
     public int? Freplacegroup { get; set; }
 
-    /// <summary>
-    ///     閿�鍞鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_XSDDH")]
-    public string? ErpXsddh { get; set; }
+ /// <summary>
+ ///     閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_XSDDH")]
+    public string ErpXsddh { get; set; }
 
-    /// <summary>
-    ///     瀛愰」绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "FMATERIALTYPE")]
-    public string? Fmaterialtype { get; set; }
+ /// <summary>
+ ///     瀛愰」绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "FMATERIALTYPE")]
+    public string Fmaterialtype { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "FUNITID")]
-    public string? Funitid { get; set; }
+ /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "FUNITID")]
+    public string Funitid { get; set; }
 
-    /// <summary>
-    ///     搴斿彂鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "Must_Qty")]
+ /// <summary>
+ ///     搴斿彂鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "Must_Qty")]
     public decimal? MustQty { get; set; }
 
-    /// <summary>
-    ///     浣跨敤姣斾緥锛�%锛�
-    /// </summary>
-    [SugarColumn(ColumnName = "Use_Rate")]
+ /// <summary>
+ ///     浣跨敤姣斾緥锛�%锛�
+ /// </summary>
+ [SugarColumn(ColumnName = "Use_Rate")]
     public decimal? UseRate { get; set; }
 
-    /// <summary>
-    ///     瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
-    /// </summary>
-    [SugarColumn(ColumnName = "Material_Type")]
-    public string? MaterialType { get; set; }
+ /// <summary>
+ ///     瀛愰」绫诲瀷 1鏍囧噯浠� 2杩旇繕浠� 3鏇夸唬浠�
+ /// </summary>
+ [SugarColumn(ColumnName = "Material_Type")]
+    public string MaterialType { get; set; }
 }
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInDataManager.cs b/MES.Service/service/BasicData/MesRohInDataManager.cs
index 9862bd1..cf2a88b 100644
--- a/MES.Service/service/BasicData/MesRohInDataManager.cs
+++ b/MES.Service/service/BasicData/MesRohInDataManager.cs
@@ -1,6 +1,5 @@
 锘縰sing MES.Service.DB;
 using MES.Service.Modes;
-using SqlSugar;
 
 namespace MES.Service.service.BasicData;
 
@@ -9,5 +8,4 @@
     //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
 
     //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 MesRohInDataManager.cs
-    
 }
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/MesRohInManager.cs b/MES.Service/service/BasicData/MesRohInManager.cs
index c7ad1e9..83bf792 100644
--- a/MES.Service/service/BasicData/MesRohInManager.cs
+++ b/MES.Service/service/BasicData/MesRohInManager.cs
@@ -72,7 +72,7 @@
         var baOrUpdate = db.Insertable(mesRohInDatas).PageSize(1)
             .IgnoreColumnsNull()
             .ExecuteCommand() > 0;
-        
+
         if (orUpdate && baOrUpdate) return true;
         throw new NotImplementedException("鎻掑叆鎴栨洿鏂板け璐�");
     }
@@ -118,14 +118,10 @@
         mesRohIn.CancellationPerson = rohIn.FCancellerId;
 
         if (rohIn.FCancelDate != null)
-        {
             if (!mesRohIn.CancellationPerson.IsNullOrEmpty())
-            {
                 mesRohIn.CancellationDate =
                     DateTime.ParseExact(rohIn.FCancelDate,
                         "yyyy-MM-dd HH:mm:ss", null);
-            }
-        }
 
         mesRohIn.CreateBy = rohIn.FCreatorId;
 
diff --git a/MES.Service/service/BasicData/MesStaffManager.cs b/MES.Service/service/BasicData/MesStaffManager.cs
index 776945d..a3aeee7 100644
--- a/MES.Service/service/BasicData/MesStaffManager.cs
+++ b/MES.Service/service/BasicData/MesStaffManager.cs
@@ -232,6 +232,9 @@
     private bool InsertOrUpdateBatch(SqlSugarScope db, List<SysUser> userList,
         List<MesStaff> staffList)
     {
-        return !(from sysUser in userList let entity = staffList.First(s => s.StaffNo == sysUser.Account) where !InsertOrUpdateStaff(db, sysUser, entity) select sysUser).Any();
+        return !(from sysUser in userList
+            let entity = staffList.First(s => s.StaffNo == sysUser.Account)
+            where !InsertOrUpdateStaff(db, sysUser, entity)
+            select sysUser).Any();
     }
 }
\ No newline at end of file
diff --git a/MES.Service/service/BasicData/OrganizeManager.cs b/MES.Service/service/BasicData/OrganizeManager.cs
index 2830862..ce20911 100644
--- a/MES.Service/service/BasicData/OrganizeManager.cs
+++ b/MES.Service/service/BasicData/OrganizeManager.cs
@@ -119,7 +119,7 @@
             FNumber = organize.FNumber,
             FParentlD = organize.FParentID,
             IsStatus = organize.FForbidStatus.Equals("A"),
-            Fid = organize.Id,
+            Fid = organize.Id
         };
     }
 
diff --git a/MES.Service/service/WomcabManager.cs b/MES.Service/service/WomcabManager.cs
index 4260f5d..c4903fd 100644
--- a/MES.Service/service/WomcabManager.cs
+++ b/MES.Service/service/WomcabManager.cs
@@ -1,78 +1,79 @@
-锘縰sing SqlSugar;
-using System;
-using System.Collections.Generic;
-using MES.Service.DB;
+锘縰sing MES.Service.DB;
 using MES.Service.Modes;
+using SqlSugar;
 
-namespace MES.Service.service
-{
+namespace MES.Service.service;
+
 public class WomcabManager : Repository<Womcab>
 {
- 
     //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
 
     //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomcabManager.cs
 
 
     #region 鏁欏鏂规硶
+
     /// <summary>
-    /// 浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
+    ///     浠撳偍鏂规硶婊¤冻涓嶄簡澶嶆潅涓氬姟闇�姹傦紝涓氬姟浠g爜璇峰湪杩欓噷闈㈠畾涔夋柟娉�
     /// </summary>
     public void Study()
     {
-	     
-	   /*********鏌ヨ*********/
+        /*********鏌ヨ*********/
 
-        var data1 = base.GetById(1);//鏍规嵁ID鏌ヨ
-        var data2 = base.GetList();//鏌ヨ鎵�鏈�
-        var data3 = base.GetList(it => 1 == 1);  //鏍规嵁鏉′欢鏌ヨ  
+        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 p = new PageModel { PageIndex = 1, PageSize = 2 }; // 鍒嗛〉鏌ヨ
         var data5 = base.GetPageList(it => 1 == 1, p);
-        Console.Write(p.TotalCount);//杩斿洖鎬绘暟
+        Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
-        var data6 = base.GetPageList(it => 1 == 1, p, it => SqlFunc.GetRandom(), OrderByType.Asc);// 鍒嗛〉鏌ヨ鍔犳帓搴�
-        Console.Write(p.TotalCount);//杩斿洖鎬绘暟
-     
-        List<IConditionalModel> conModels = new List<IConditionalModel>(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
-        conModels.Add(new ConditionalModel() { FieldName= typeof(Womcab).GetProperties()[0].Name, ConditionalType = ConditionalType.Equal, FieldValue = "1" });//id=1
-        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom(), OrderByType.Asc);
+        var data6 =
+            base.GetPageList(it => 1 == 1, p,
+                it => SqlFunc.GetRandom()); // 鍒嗛〉鏌ヨ鍔犳帓搴�
+        Console.Write(p.TotalCount); //杩斿洖鎬绘暟
 
-        base.AsQueryable().Where(x => 1 == 1).ToList();//鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+        List<IConditionalModel> conModels = new(); //缁勮鏉′欢鏌ヨ浣滀负鏉′欢瀹炵幇 鍒嗛〉鏌ヨ鍔犳帓搴�
+        conModels.Add(new ConditionalModel
+        {
+            FieldName = typeof(Womcab).GetProperties()[0].Name,
+            ConditionalType = ConditionalType.Equal, FieldValue = "1"
+        }); //id=1
+        var data7 = base.GetPageList(conModels, p, it => SqlFunc.GetRandom());
 
- 
+        base.AsQueryable().Where(x => 1 == 1)
+            .ToList(); //鏀寔浜嗚浆鎹㈡垚queryable,鎴戜滑鍙互鐢╭ueryable瀹炵幇澶嶆潅鍔熻兘
+
 
         /*********鎻掑叆*********/
-        var insertData = new Womcab() { };//娴嬭瘯鍙傛暟
-        var insertArray = new Womcab[] { insertData };
-        base.Insert(insertData);//鎻掑叆
-        base.InsertRange(insertArray);//鎵归噺鎻掑叆
-        var id = base.InsertReturnIdentity(insertData);//鎻掑叆杩斿洖鑷鍒�
-        base.AsInsertable(insertData).ExecuteCommand();//鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
+        var insertData = new Womcab(); //娴嬭瘯鍙傛暟
+        var insertArray = new[] { insertData };
+        base.Insert(insertData); //鎻掑叆
+        base.InsertRange(insertArray); //鎵归噺鎻掑叆
+        var id = base.InsertReturnIdentity(insertData); //鎻掑叆杩斿洖鑷鍒�
+        base.AsInsertable(insertData)
+            .ExecuteCommand(); //鎴戜滑鍙互杞垚 Insertable瀹炵幇澶嶆潅鎻掑叆
 
 
-
-		/*********鏇存柊*********/
-	    var updateData = new Womcab() {  };//娴嬭瘯鍙傛暟
-        var updateArray = new Womcab[] { updateData };//娴嬭瘯鍙傛暟
-        base.Update(updateData);//鏍规嵁瀹炰綋鏇存柊
-        base.UpdateRange(updateArray);//鎵归噺鏇存柊
+        /*********鏇存柊*********/
+        var updateData = new Womcab(); //娴嬭瘯鍙傛暟
+        var updateArray = new[] { updateData }; //娴嬭瘯鍙傛暟
+        base.Update(updateData); //鏍规嵁瀹炰綋鏇存柊
+        base.UpdateRange(updateArray); //鎵归噺鏇存柊
         //base.Update(it => new Womcab() { ClassName = "a", CreateTime = DateTime.Now }, it => it.id==1);// 鍙洿鏂癈lassName鍒楀拰CreateTime鍒楋紝鍏跺畠鍒椾笉鏇存柊锛屾潯浠秈d=1
-        base.AsUpdateable(updateData).ExecuteCommand();  //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
+        base.AsUpdateable(updateData).ExecuteCommand(); //杞垚Updateable鍙互瀹炵幇澶嶆潅鐨勬彃鍏�
 
 
+        /*********鍒犻櫎*********/
+        var deldata = new Womcab(); //娴嬭瘯鍙傛暟
+        base.Delete(deldata); //鏍规嵁瀹炰綋鍒犻櫎
+        base.DeleteById(1); //鏍规嵁涓婚敭鍒犻櫎
+        base.DeleteById(new[] { 1, 2 }); //鏍规嵁涓婚敭鏁扮粍鍒犻櫎
+        base.Delete(it => 1 == 2); //鏍规嵁鏉′欢鍒犻櫎
+        base.AsDeleteable().Where(it => 1 == 2)
+            .ExecuteCommand(); //杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
+    }
 
-		/*********鍒犻櫎*********/
-	    var deldata = new Womcab() {  };//娴嬭瘯鍙傛暟
-        base.Delete(deldata);//鏍规嵁瀹炰綋鍒犻櫎
-        base.DeleteById(1);//鏍规嵁涓婚敭鍒犻櫎
-        base.DeleteById(new int[] { 1,2});//鏍规嵁涓婚敭鏁扮粍鍒犻櫎
-        base.Delete(it=>1==2);//鏍规嵁鏉′欢鍒犻櫎
-        base.AsDeleteable().Where(it=>1==2).ExecuteCommand();//杞垚Deleteable瀹炵幇澶嶆潅鐨勬搷浣�
-    } 
     #endregion
-
- 
- }
 }
\ No newline at end of file
diff --git a/MESApplication/Controllers/BasicData/ProductionOrderController.cs b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
index fd7a8de..6cbf09f 100644
--- a/MESApplication/Controllers/BasicData/ProductionOrderController.cs
+++ b/MESApplication/Controllers/BasicData/ProductionOrderController.cs
@@ -22,7 +22,7 @@
     private readonly string TableName = "PRODUCTION_ORDER";
 
     private readonly string URL =
-        "http://localhost:10054/api/ProductionOrder/"; 
+        "http://localhost:10054/api/ProductionOrder/";
 
     //
     [HttpPost("Save")]

--
Gitblit v1.9.3