From 07c9f1415365fa2709afe500384a163a3239fa11 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期五, 13 十二月 2024 10:30:05 +0800
Subject: [PATCH] 11

---
 entity/Womcab.cs                   |    2 
 entity/MesSysPageview.cs           |   27 
 service/base/LoginService.cs       |    8 
 entity/Womcaa.cs                   |  532 +++++++++++-----------
 service/Warehouse/WomdaaManager.cs |   74 +++
 Dto/service/ProductionPickDto.cs   |   16 
 entity/Womdab.cs                   |  239 ++++++++++
 entity/MesFile.cs                  |   53 ++
 entity/Womdaa.cs                   |  410 +++++++++++++++++
 9 files changed, 1,087 insertions(+), 274 deletions(-)

diff --git a/Dto/service/ProductionPickDto.cs b/Dto/service/ProductionPickDto.cs
new file mode 100644
index 0000000..d0298d9
--- /dev/null
+++ b/Dto/service/ProductionPickDto.cs
@@ -0,0 +1,16 @@
+锘�
+
+using NewPdaSqlServer.entity;
+
+namespace NewPdaSqlServer.Dto.service;
+
+public class ProductionPickDto
+{
+    public string? ItemModel { get; set; }
+
+    public List<Womdab>? totals { get; set; }
+
+    public List<Womdab>? daisao { get; set; }
+
+    public List<MesInvItemOutCDetails> yisao { get; set; }
+}
\ No newline at end of file
diff --git a/entity/MesFile.cs b/entity/MesFile.cs
new file mode 100644
index 0000000..09b9195
--- /dev/null
+++ b/entity/MesFile.cs
@@ -0,0 +1,53 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity
+{
+    /// <summary>
+    /// 
+    ///</summary>
+    [SugarTable("MES_FILE")]
+    public class MesFile
+    {
+     /// <summary>
+        /// 涓婚敭 
+        ///</summary>
+         [SugarColumn(ColumnName="guid" ,IsPrimaryKey = true   )]
+         public Guid Guid { get; set; }
+
+     /// <summary>
+        /// 鐖朵翰Guid 
+        ///</summary>
+         [SugarColumn(ColumnName="parent_Guid"    )]
+         public Guid? ParentGuid { get; set; }
+
+     /// <summary>
+        /// 鏂囦欢鏍囬 
+        ///</summary>
+         [SugarColumn(ColumnName="file_Title"    )]
+         public string FileTitle { get; set; }
+
+     /// <summary>
+        /// 鏂囦欢绫诲瀷 
+        ///</summary>
+         [SugarColumn(ColumnName="file_Type"    )]
+         public string FileType { get; set; }
+
+     /// <summary>
+        /// 鏂囦欢璺緞 
+        ///</summary>
+         [SugarColumn(ColumnName="url_Path"    )]
+         public string UrlPath { get; set; }
+
+     /// <summary>
+        /// 涓婁紶鑰� 
+        ///</summary>
+         [SugarColumn(ColumnName="create_by"    )]
+         public string CreateBy { get; set; }
+
+     /// <summary>
+        /// 涓婁紶鏃堕棿 
+        ///</summary>
+         [SugarColumn(ColumnName="create_date"    )]
+         public DateTime? CreateDate { get; set; }
+    }
+}
diff --git a/entity/MesSysPageview.cs b/entity/MesSysPageview.cs
index 2688515..7440f0a 100644
--- a/entity/MesSysPageview.cs
+++ b/entity/MesSysPageview.cs
@@ -9,42 +9,45 @@
 public class MesSysPageview
 {
     /// <summary>
-    ///     涓婚敭
-    ///     榛樿鍊�: (newid())
-    /// </summary>
+    /// 涓婚敭 
+    /// 榛樿鍊�: (newid())
+    ///</summary>
     [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
     public Guid Guid { get; set; }
 
     /// <summary>
-    ///     椤甸潰涓枃鍚�
-    /// </summary>
+    /// 椤甸潰涓枃鍚� 
+    ///</summary>
     [SugarColumn(ColumnName = "PAGE_VIEW")]
     public string PageView { get; set; }
 
     /// <summary>
-    ///     椤甸潰璺緞
-    /// </summary>
+    /// 椤甸潰璺緞 
+    ///</summary>
     [SugarColumn(ColumnName = "PATH")]
     public string Path { get; set; }
 
     /// <summary>
-    ///     椤甸潰鍥炬爣
-    /// </summary>
+    /// 椤甸潰鍥炬爣 
+    ///</summary>
     [SugarColumn(ColumnName = "ICOIMG")]
     public string Icoimg { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "PAGE_GROUP")]
     public string PageGroup { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "PAGE_IDX")]
     public int? PageIdx { get; set; }
 
     /// <summary>
-    /// </summary>
+    ///  
+    ///</summary>
     [SugarColumn(ColumnName = "PAGE_STATUS")]
     public bool? PageStatus { get; set; }
 }
\ No newline at end of file
diff --git a/entity/Womcaa.cs b/entity/Womcaa.cs
index 7cc3956..6f73e68 100644
--- a/entity/Womcaa.cs
+++ b/entity/Womcaa.cs
@@ -3,403 +3,415 @@
 namespace NewPdaSqlServer.entity;
 
 /// <summary>
-///     浠诲姟鍗曡〃
+///     鐢熶骇浠诲姟鍗曡〃
 /// </summary>
 [SugarTable("WOMCAA")]
 public class Womcaa
 {
-    /// <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 = "CAA001")]
+   /// <summary>
+ ///     鍗曟嵁缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA001")]
     public string Caa001 { get; set; }
 
-    /// <summary>
-    ///     鍗曟嵁绫诲瀷(&quot;1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇&quot;)
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA004")]
+   /// <summary>
+ ///     鍗曟嵁绫诲瀷(&quot;1銆佺洿鎺ュ叆搴�-鏅�氱敓浜� 2銆佺洿鎺ュ叆搴�-杩斿伐鐢熶骇 3銆佸伐搴忔眹鎶�-鏅�氱敓浜� 4銆佸伐搴忔眹鎶�-杩斿伐鐢熶骇&quot;)
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA004")]
     public string Caa004 { get; set; }
 
-    /// <summary>
-    ///     璁″垝涓嬭揪鏃ユ湡
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA005")]
+   /// <summary>
+ ///     璁″垝涓嬭揪鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA005")]
     public string Caa005 { get; set; }
 
-    /// <summary>
-    ///     浜у搧缂栫爜
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA006")]
+   /// <summary>
+ ///     浜у搧ID
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA006")]
     public string Caa006 { get; set; }
 
-    /// <summary>
-    ///     鍗曚綅
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA009")]
+   /// <summary>
+ ///     鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA009")]
     public string Caa009 { get; set; }
 
-    /// <summary>
-    ///     棰勮寮�宸ユ椂闂�
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA010")]
+   /// <summary>
+ ///     棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA010")]
     public string Caa010 { get; set; }
 
-    /// <summary>
-    ///     棰勮瀹屽伐鏃堕棿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA011")]
+   /// <summary>
+ ///     棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA011")]
     public string Caa011 { get; set; }
 
-    /// <summary>
-    ///     宸ュ崟鏁伴噺
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA012")]
+   /// <summary>
+ ///     宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA012")]
     public decimal? Caa012 { get; set; }
 
-    /// <summary>
-    ///     BOM鐗堟
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA013")]
+   /// <summary>
+ ///     BOM鐗堟
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA013")]
     public string Caa013 { get; set; }
 
-    /// <summary>
-    ///     閿�鍞鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA015")]
+   /// <summary>
+ ///     閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA015")]
     public string Caa015 { get; set; }
 
-    /// <summary>
-    ///     澶囨敞
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA016")]
+   /// <summary>
+ ///     澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA016")]
     public string Caa016 { get; set; }
 
-    /// <summary>
-    ///     宸叉帓鏁伴噺锛堝純鐢級
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA017")]
+   /// <summary>
+ ///     宸叉帓鏁伴噺锛堝純鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA017")]
     public int? Caa017 { get; set; }
 
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟ID
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA018")]
+   /// <summary>
+ ///     ERP鐢熶骇璁㈠崟ID
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA018")]
     public int? Caa018 { get; set; }
 
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟搴忓彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA019")]
+   /// <summary>
+ ///     ERP鐢熶骇璁㈠崟搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA019")]
     public int? Caa019 { get; set; }
 
-    /// <summary>
-    ///     ERP鐢熶骇璁㈠崟鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA020")]
+   /// <summary>
+ ///     ERP鐢熶骇璁㈠崟鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA020")]
     public string Caa020 { get; set; }
 
-    /// <summary>
-    ///     鐢熶骇杞﹂棿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA021")]
+   /// <summary>
+ ///     鐢熶骇杞﹂棿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA021")]
     public string Caa021 { get; set; }
 
-    /// <summary>
-    ///     瀹℃牳鐮�
-    /// </summary>
-    [SugarColumn(ColumnName = "FSTATUS")]
+   /// <summary>
+ ///     瀹℃牳鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "FSTATUS")]
     public int? Fstatus { get; set; }
 
-    /// <summary>
-    ///     瀹℃牳鏃ユ湡
-    /// </summary>
-    [SugarColumn(ColumnName = "CHECK_DATE")]
+   /// <summary>
+ ///     瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_DATE")]
     public DateTime? CheckDate { get; set; }
 
-    /// <summary>
-    ///     瀹℃牳浜�
-    /// </summary>
-    [SugarColumn(ColumnName = "CHECK_USER")]
+   /// <summary>
+ ///     瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "CHECK_USER")]
     public string CheckUser { get; set; }
 
-    /// <summary>
-    ///     鏈帓鏁伴噺锛堝純鐢級
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA022")]
+   /// <summary>
+ ///     鏈帓鏁伴噺锛堝純鐢級
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA022")]
     public int? Caa022 { get; set; }
 
-    /// <summary>
-    ///     涓氬姟鐘舵��(&quot;1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�&quot;)
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA023")]
+   /// <summary>
+ ///     涓氬姟鐘舵��(&quot;1锛岃鍒掞紝2銆佽鍒掔‘璁� 2銆佷笅杈� 4銆佸紑宸� 5銆佸畬宸� 6銆佺粨妗堬紝7銆佺粨绠�&quot;)
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA023")]
     public string Caa023 { get; set; }
 
-    /// <summary>
-    ///     宸插叆搴撴暟閲�
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA024")]
+   /// <summary>
+ ///     宸插叆搴撴暟閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA024")]
     public int? Caa024 { get; set; }
 
-    /// <summary>
-    ///     宸ヨ壓璺嚎
-    /// </summary>
-    [SugarColumn(ColumnName = "ROUTING_ID")]
+   /// <summary>
+ ///     宸ヨ壓璺嚎
+ /// </summary>
+ [SugarColumn(ColumnName = "ROUTING_ID")]
     public string RoutingId { get; set; }
 
-    /// <summary>
-    ///     浜х嚎
-    /// </summary>
-    [SugarColumn(ColumnName = "WORK_SHOP_ID")]
+   /// <summary>
+ ///     浜х嚎
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_SHOP_ID")]
     public string WorkShopId { get; set; }
 
-    /// <summary>
-    ///     浠撳簱
-    /// </summary>
-    [SugarColumn(ColumnName = "DEPOT_CODE")]
+   /// <summary>
+ ///     浠撳簱
+ /// </summary>
+ [SugarColumn(ColumnName = "DEPOT_CODE")]
     public string DepotCode { get; set; }
 
-    /// <summary>
-    ///     鍗曟嵁鏃ユ湡
-    /// </summary>
-    [SugarColumn(ColumnName = "CREATE_DATE")]
+   /// <summary>
+ ///     鍗曟嵁鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_DATE")]
     public string CreateDate { get; set; }
 
-    /// <summary>
-    ///     璁″垝缁�
-    /// </summary>
-    [SugarColumn(ColumnName = "WORK_GROUP_ID")]
+   /// <summary>
+ ///     璁″垝缁�
+ /// </summary>
+ [SugarColumn(ColumnName = "WORK_GROUP_ID")]
     public string WorkGroupId { get; set; }
 
-    /// <summary>
-    ///     璁″垝鍛�
-    /// </summary>
-    [SugarColumn(ColumnName = "PLAN_ID")]
+   /// <summary>
+ ///     璁″垝鍛�
+ /// </summary>
+ [SugarColumn(ColumnName = "PLAN_ID")]
     public string PlanId { get; set; }
 
-    /// <summary>
-    ///     鍏ュ簱涓婇檺
-    /// </summary>
-    [SugarColumn(ColumnName = "STOCK_INLIMITH")]
+   /// <summary>
+ ///     鍏ュ簱涓婇檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_INLIMITH")]
     public string StockInlimith { get; set; }
 
-    /// <summary>
-    ///     鍏ュ簱涓嬮檺
-    /// </summary>
-    [SugarColumn(ColumnName = "STOCK_INLIMITL")]
+   /// <summary>
+ ///     鍏ュ簱涓嬮檺
+ /// </summary>
+ [SugarColumn(ColumnName = "STOCK_INLIMITL")]
     public string StockInlimitl { get; set; }
 
-    /// <summary>
-    ///     涓昏溅闂磋皟搴﹀崟
-    /// </summary>
-    [SugarColumn(ColumnName = "MTONO")]
+   /// <summary>
+ ///     涓昏溅闂磋皟搴﹀崟
+ /// </summary>
+ [SugarColumn(ColumnName = "MTONO")]
     public string Mtono { get; set; }
 
-    /// <summary>
-    ///     鎵规
-    /// </summary>
-    [SugarColumn(ColumnName = "LOT")]
+   /// <summary>
+ ///     鎵规
+ /// </summary>
+ [SugarColumn(ColumnName = "LOT")]
     public string Lot { get; set; }
 
-    /// <summary>
-    ///     寮曠敤鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA015_HEAD")]
+   /// <summary>
+ ///     寮曠敤鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA015_HEAD")]
     public string Caa015Head { get; set; }
 
-    /// <summary>
-    ///     鍒跺崟绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "CREATE_TYPE")]
+   /// <summary>
+ ///     鍒跺崟绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "CREATE_TYPE")]
     public string CreateType { get; set; }
 
-    /// <summary>
-    ///     鏉ユ簮鍗曟嵁绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
+   /// <summary>
+ ///     鏉ユ簮鍗曟嵁绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_TYPE")]
     public string SrcBillType { get; set; }
 
-    /// <summary>
-    ///     鏉ユ簮鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "SRC_BILL_NO")]
+   /// <summary>
+ ///     鏉ユ簮鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILL_NO")]
     public string SrcBillNo { get; set; }
 
-    /// <summary>
-    ///     鏉ユ簮琛屽彿
-    /// </summary>
-    [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
+   /// <summary>
+ ///     鏉ユ簮琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_BILLENTRYSEQ")]
     public string SrcBillentryseq { get; set; }
 
-    /// <summary>
-    ///     閿�鍞鍗曞彿
-    /// </summary>
-    [SugarColumn(ColumnName = "SALE_ORDER_NO")]
+   /// <summary>
+ ///     閿�鍞鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_ORDER_NO")]
     public string SaleOrderNo { get; set; }
 
-    /// <summary>
-    ///     閿�鍞鍗曡鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
+   /// <summary>
+ ///     閿�鍞鍗曡鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SALE_ORDER_ENTRYSEQ")]
     public string SaleOrderEntryseq { get; set; }
 
-    /// <summary>
-    ///     寮哄埗鍏抽棴浜�
-    /// </summary>
-    [SugarColumn(ColumnName = "FORCE_CLOSERID")]
+   /// <summary>
+ ///     寮哄埗鍏抽棴浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "FORCE_CLOSERID")]
     public string ForceCloserid { get; set; }
 
-    /// <summary>
-    ///     鍏抽棴绫诲瀷
-    /// </summary>
-    [SugarColumn(ColumnName = "CLOSE_TYPE")]
+   /// <summary>
+ ///     鍏抽棴绫诲瀷
+ /// </summary>
+ [SugarColumn(ColumnName = "CLOSE_TYPE")]
     public string CloseType { get; set; }
 
-    /// <summary>
-    ///     鍒嗗崟鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
+   /// <summary>
+ ///     鍒嗗崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "SRC_SPLIT_BILLNO")]
     public string SrcSplitBillno { get; set; }
 
-    /// <summary>
-    ///     鏄惁绠℃帶
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_SCZZ")]
+   /// <summary>
+ ///     鏄惁绠℃帶
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_SCZZ")]
     public int? ErpSczz { get; set; }
 
-    /// <summary>
-    ///     鏄惁濮旀墭
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_WTZZ")]
+   /// <summary>
+ ///     鏄惁濮旀墭
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_WTZZ")]
     public int? ErpWtzz { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_NO")]
     public string MainProductNo { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "MAIN_PRODUCT_QTY")]
     public int? MainProductQty { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_ITEM_NUMBER")]
     public string CustomerItemNumber { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "PACKING_LIST_NUMBER")]
     public string PackingListNumber { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "CUSTOMER_NAME")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER_NAME")]
     public string CustomerName { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "CUSTOMER")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CUSTOMER")]
     public string Customer { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "TYPE")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "TYPE")]
     public string Type { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "JA_BS")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_BS")]
     public string JaBs { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "JA_TIME")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "JA_TIME")]
     public DateTime? JaTime { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "YP_NUM")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "YP_NUM")]
     public int? YpNum { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA011_1")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA011_1")]
     public string Caa0111 { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_GYZZ")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_GYZZ")]
     public int? ErpGyzz { get; set; }
 
-    /// <summary>
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_FLZZ")]
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_FLZZ")]
     public int? ErpFlzz { get; set; }
 
-    /// <summary>
-    ///     鏄惁鍏ュ簱
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_SLZZ")]
+   /// <summary>
+ ///     鏄惁鍏ュ簱
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_SLZZ")]
     public int? ErpSlzz { get; set; }
 
-    /// <summary>
-    ///     鏄惁閫�搴�
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_RKZZ")]
+   /// <summary>
+ ///     鏄惁閫�搴�
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_RKZZ")]
     public int? ErpRkzz { get; set; }
 
-    /// <summary>
-    ///     鏄惁鎹㈣揣
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_RKHZ")]
+   /// <summary>
+ ///     鏄惁鎹㈣揣
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_RKHZ")]
     public int? ErpRkhz { get; set; }
 
-    /// <summary>
-    ///     鏄惁瀵勫敭
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_JJDS")]
+   /// <summary>
+ ///     鏄惁瀵勫敭
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_JJDS")]
     public int? ErpJjds { get; set; }
 
-    /// <summary>
-    ///     鏄惁鎸夋
-    /// </summary>
-    [SugarColumn(ColumnName = "ERP_BZDS")]
+   /// <summary>
+ ///     鏄惁鎸夋
+ /// </summary>
+ [SugarColumn(ColumnName = "ERP_BZDS")]
     public int? ErpBzds { get; set; }
 
-    /// <summary>
-    ///     鏄惁鏂板缓
-    /// </summary>
-    [SugarColumn(ColumnName = "CAA025")]
+   /// <summary>
+ ///     鏄惁鏂板缓
+ /// </summary>
+ [SugarColumn(ColumnName = "CAA025")]
     public int? Caa025 { get; set; }
 
-    /// <summary>
-    ///     閲囪喘璁㈠崟鍙�
-    /// </summary>
-    [SugarColumn(ColumnName = "FPURORDERNO")]
+   /// <summary>
+ ///     閲囪喘璁㈠崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERNO")]
     public string Fpurorderno { get; set; }
 
-    /// <summary>
-    ///     閲囪喘璁㈠崟琛屽彿
-    /// </summary>
-    [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
+   /// <summary>
+ ///     閲囪喘璁㈠崟琛屽彿
+ /// </summary>
+ [SugarColumn(ColumnName = "FPURORDERENTRYSEQ")]
     public string Fpurorderentryseq { get; set; }
 
-    /// <summary>
-    ///     澶囨敞锛堣〃浣擄級
-    /// </summary>
-    [SugarColumn(ColumnName = "Btbz")]
+   /// <summary>
+ ///     澶囨敞锛堣〃浣擄級
+ /// </summary>
+ [SugarColumn(ColumnName = "Btbz")]
     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/entity/Womcab.cs b/entity/Womcab.cs
index 7f01a2d..50d07ad 100644
--- a/entity/Womcab.cs
+++ b/entity/Womcab.cs
@@ -3,7 +3,7 @@
 namespace NewPdaSqlServer.entity;
 
 /// <summary>
-///     浠诲姟鍗曠墿鏂欒〃
+///     浠诲姟鍗曠墿鏂欒〃bom
 /// </summary>
 [SugarTable("WOMCAB")]
 public class Womcab
diff --git a/entity/Womdaa.cs b/entity/Womdaa.cs
new file mode 100644
index 0000000..1a4169e
--- /dev/null
+++ b/entity/Womdaa.cs
@@ -0,0 +1,410 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("WOMDAA")]
+public class Womdaa
+{
+   /// <summary>
+ ///     榛樿鍊�: (newid())
+ /// </summary>
+ [SugarColumn(ColumnName = "guid")]
+    public Guid? Guid { get; set; }
+
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "pbaGuid")]
+    public Guid? PbaGuid { get; set; }
+
+   /// <summary>
+ /// </summary>
+ [SugarColumn(ColumnName = "caaGuid")]
+    public Guid? CaaGuid { get; set; }
+
+   /// <summary>
+ ///     鑷鍒�
+ /// </summary>
+ [SugarColumn(ColumnName = "id")]
+    public int? Id { get; set; }
+
+   /// <summary>
+ ///     鎺掍骇ID
+ /// </summary>
+ [SugarColumn(ColumnName = "pid")]
+    public int? Pid { get; set; }
+
+   /// <summary>
+ ///     鍗曞彿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa001")]
+    public string Daa001 { get; set; }
+
+   /// <summary>
+ ///     浜у搧ID
+ /// </summary>
+ [SugarColumn(ColumnName = "daa002")]
+    public string Daa002 { get; set; }
+
+   /// <summary>
+ ///     浜у搧鍚嶇О
+ /// </summary>
+ [SugarColumn(ColumnName = "daa003")]
+    public string Daa003 { get; set; }
+
+   /// <summary>
+ ///     浜у搧瑙勬牸
+ /// </summary>
+ [SugarColumn(ColumnName = "daa004")]
+    public string Daa004 { get; set; }
+
+   /// <summary>
+ ///     鍗曚綅
+ /// </summary>
+ [SugarColumn(ColumnName = "daa005")]
+    public string Daa005 { get; set; }
+
+   /// <summary>
+ ///     ERP棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa006")]
+    public DateTime? Daa006 { get; set; }
+
+   /// <summary>
+ ///     ERP棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa007")]
+    public DateTime? Daa007 { get; set; }
+
+   /// <summary>
+ ///     宸ュ崟鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa008")]
+    public int? Daa008 { get; set; }
+
+   /// <summary>
+ ///     澶囨敞
+ /// </summary>
+ [SugarColumn(ColumnName = "daa009")]
+    public string Daa009 { get; set; }
+
+   /// <summary>
+ ///     鍏ュ簱鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa010")]
+    public int? Daa010 { get; set; }
+
+   /// <summary>
+ ///     宸茬敓浜ч噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa011")]
+    public int? Daa011 { get; set; }
+
+   /// <summary>
+ ///     鎶ュ簾鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "daa012")]
+    public int? Daa012 { get; set; }
+
+   /// <summary>
+ ///     宸ヤ綔杞﹂棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa013")]
+    public string Daa013 { get; set; }
+
+   /// <summary>
+ ///     鎶曟枡鍗曞崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa014")]
+    public string Daa014 { get; set; }
+
+   /// <summary>
+ ///     鐢熶骇绾垮埆
+ /// </summary>
+ [SugarColumn(ColumnName = "daa015")]
+    public string Daa015 { get; set; }
+
+   /// <summary>
+ ///     瀹為檯寮�宸ユ棩
+ /// </summary>
+ [SugarColumn(ColumnName = "daa016")]
+    public DateTime? Daa016 { get; set; }
+
+   /// <summary>
+ ///     瀹為檯瀹屽伐鏃�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa017")]
+    public DateTime? Daa017 { get; set; }
+
+   /// <summary>
+ ///     宸ュ崟鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "daa018")]
+    public string Daa018 { get; set; }
+
+   /// <summary>
+ ///     榻愬鐘舵��
+ /// </summary>
+ [SugarColumn(ColumnName = "daa019")]
+    public string Daa019 { get; set; }
+
+   /// <summary>
+ ///     瀹℃牳鐮�
+ /// </summary>
+ [SugarColumn(ColumnName = "fstatus")]
+    public int? Fstatus { get; set; }
+
+   /// <summary>
+ ///     瀹℃牳鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "check_date")]
+    public DateTime? CheckDate { get; set; }
+
+   /// <summary>
+ ///     瀹℃牳浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "check_user")]
+    public string CheckUser { get; set; }
+
+   /// <summary>
+ ///     绾垮埆缂栫爜
+ /// </summary>
+ [SugarColumn(ColumnName = "daa020")]
+    public string Daa020 { get; set; }
+
+   /// <summary>
+ ///     浠诲姟鍗曞崟鍙�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa021")]
+    public string Daa021 { get; set; }
+
+   /// <summary>
+ ///     閫氱煡澶囨枡锛�0-鏈�氱煡锛�1-閫氱煡
+ ///     榛樿鍊�: ((0))
+ /// </summary>
+ [SugarColumn(ColumnName = "daa022")]
+    public int? Daa022 { get; set; }
+
+   /// <summary>
+ ///     鐢熶骇搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa023")]
+    public int? Daa023 { get; set; }
+
+   /// <summary>
+ ///     鎺掍骇鏃ユ湡
+ /// </summary>
+ [SugarColumn(ColumnName = "daa024")]
+    public string Daa024 { get; set; }
+
+   /// <summary>
+ ///     棣栦欢鏄惁妫�楠�1-妫�楠岋紝0鏈楠�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa025")]
+    public string Daa025 { get; set; }
+
+   /// <summary>
+ ///     棣栦欢妫�楠岀粨鏋�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa026")]
+    public string Daa026 { get; set; }
+
+   /// <summary>
+ ///     宸叉姤妫�锛�0-鏈姤妫�锛�1-宸叉姤妫�
+ /// </summary>
+ [SugarColumn(ColumnName = "is_reportcheck")]
+    public int? IsReportcheck { get; set; }
+
+   /// <summary>
+ ///     鎶ユ浜�
+ /// </summary>
+ [SugarColumn(ColumnName = "usname")]
+    public string Usname { get; set; }
+
+   /// <summary>
+ ///     鎶ユ鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "reporttime")]
+    public DateTime? Reporttime { get; set; }
+
+   /// <summary>
+ ///     鏈哄彴缂栧彿
+ /// </summary>
+ [SugarColumn(ColumnName = "machine_no")]
+    public string MachineNo { get; set; }
+
+   /// <summary>
+ ///     澶囨枡瀹屾垚1-瀹屾垚锛�0鏈畬鎴�
+ /// </summary>
+ [SugarColumn(ColumnName = "daa027")]
+    public int? Daa027 { get; set; }
+
+   /// <summary>
+ ///     澶囨枡瀹屾垚鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "daa028")]
+    public string Daa028 { get; set; }
+
+   /// <summary>
+ ///     鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "prod_hour")]
+    public int? ProdHour { get; set; }
+
+   /// <summary>
+ ///     鍗曚汉灏忔椂浜ц兘
+ /// </summary>
+ [SugarColumn(ColumnName = "person_hour_capacity")]
+    public int? PersonHourCapacity { get; set; }
+
+   /// <summary>
+ ///     鐞嗚鏍囦骇
+ /// </summary>
+ [SugarColumn(ColumnName = "the_capacity")]
+    public int? TheCapacity { get; set; }
+
+   /// <summary>
+ ///     璁″垝鐢ㄤ汉鏁�
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_personnel")]
+    public int? PlanPersonnel { get; set; }
+
+   /// <summary>
+ ///     璁″垝鏍囧噯浜ц兘
+ /// </summary>
+ [SugarColumn(ColumnName = "plan_capacity")]
+    public int? PlanCapacity { get; set; }
+
+   /// <summary>
+ ///     鐞嗚鐢ㄦ椂/M
+ /// </summary>
+ [SugarColumn(ColumnName = "the_min")]
+    public int? TheMin { get; set; }
+
+   /// <summary>
+ ///     鐞嗚鐢ㄦ椂/H
+ /// </summary>
+ [SugarColumn(ColumnName = "the_hour")]
+    public int? TheHour { get; set; }
+
+   /// <summary>
+ ///     绾夸綋绫诲埆
+ /// </summary>
+ [SugarColumn(ColumnName = "line_type")]
+    public string LineType { get; set; }
+
+   /// <summary>
+ ///     鏍囧噯浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "personnel")]
+    public int? Personnel { get; set; }
+
+   /// <summary>
+ ///     鎹㈢嚎鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "change_line_time")]
+    public int? ChangeLineTime { get; set; }
+
+   /// <summary>
+ ///     浼戞伅鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "rest_time")]
+    public int? RestTime { get; set; }
+
+   /// <summary>
+ ///     鎺掍骇搴忓彿
+ /// </summary>
+ [SugarColumn(ColumnName = "schedule_order")]
+    public int? ScheduleOrder { get; set; }
+
+   /// <summary>
+ ///     MES棰勮寮�宸ユ椂闂�
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_start_prod")]
+    public DateTime? MesStartProd { get; set; }
+
+   /// <summary>
+ ///     MES棰勮瀹屽伐鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "mes_end_prod")]
+    public DateTime? MesEndProd { get; set; }
+
+   /// <summary>
+ ///     鎺掍骇鎺ㄩ�佹爣璇�
+ /// </summary>
+ [SugarColumn(ColumnName = "prodts")]
+    public int? Prodts { get; set; }
+
+   /// <summary>
+ ///     棰勮澶囨枡鏃堕棿
+ /// </summary>
+ [SugarColumn(ColumnName = "prepare_time")]
+    public DateTime? PrepareTime { get; set; }
+
+   /// <summary>
+ ///     鎻掍欢鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_worker")]
+    public int? CjWorker { get; set; }
+
+   /// <summary>
+ ///     鎻掍欢璁″垝鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "p_cj_worker")]
+    public int? PCjWorker { get; set; }
+
+   /// <summary>
+ ///     鎻掍欢鏃ヤ骇閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_daily_out")]
+    public int? CjDailyOut { get; set; }
+
+   /// <summary>
+ ///     鎻掍欢鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_std_hour")]
+    public int? CjStdHour { get; set; }
+
+   /// <summary>
+ ///     閿＄剨鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_worker")]
+    public int? HxWorker { get; set; }
+
+   /// <summary>
+ ///     閿＄剨璁″垝鎶曞叆浜烘暟
+ /// </summary>
+ [SugarColumn(ColumnName = "p_hx_worker")]
+    public int? PHxWorker { get; set; }
+
+   /// <summary>
+ ///     閿＄剨鏃ヤ骇閲�
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_daily_out")]
+    public int? HxDailyOut { get; set; }
+
+   /// <summary>
+ ///     閿＄剨鏍囧噯宸ユ椂
+ /// </summary>
+ [SugarColumn(ColumnName = "hx_std_hour")]
+    public int? HxStdHour { get; set; }
+
+   /// <summary>
+ ///     鎻掍欢鏁伴噺
+ /// </summary>
+ [SugarColumn(ColumnName = "cj_num")]
+    public int? CjNum { get; set; }
+
+   /// <summary>
+ ///     瀹㈡埛
+ /// </summary>
+ [SugarColumn(ColumnName = "cust")]
+    public string Cust { get; set; }
+
+   /// <summary>
+ ///     鏄惁棣栨
+ /// </summary>
+ [SugarColumn(ColumnName = "IS_SJ")]
+    public int? IsSj { get; set; }
+}
\ No newline at end of file
diff --git a/entity/Womdab.cs b/entity/Womdab.cs
new file mode 100644
index 0000000..015c5db
--- /dev/null
+++ b/entity/Womdab.cs
@@ -0,0 +1,239 @@
+锘縰sing SqlSugar;
+
+namespace NewPdaSqlServer.entity;
+
+/// <summary>
+/// </summary>
+[SugarTable("WOMDAB")]
+public class Womdab
+{
+    /// <summary>
+    ///     榛樿鍊�: (newid())
+    /// </summary>
+    [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+    public Guid Guid { get; set; }
+
+    /// <summary>
+    /// </summary>
+    [SugarColumn(ColumnName = "daaGuid")]
+    public Guid? DaaGuid { get; set; }
+
+    /// <summary>
+    ///     鑷鍒�
+    /// </summary>
+    [SugarColumn(ColumnName = "id")]
+    public int? Id { get; set; }
+
+    /// <summary>
+    ///     PID
+    /// </summary>
+    [SugarColumn(ColumnName = "pid")]
+    public int? Pid { get; set; }
+
+    /// <summary>
+    ///     宸ュ崟鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "dab001")]
+    public string Dab001 { get; set; }
+
+    /// <summary>
+    ///     搴忓彿
+    /// </summary>
+    [SugarColumn(ColumnName = "dab002")]
+    public int? Dab002 { get; set; }
+
+    /// <summary>
+    ///     鏉愭枡缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "dab003")]
+    public string Dab003 { get; set; }
+
+    /// <summary>
+    ///     鏉愭枡鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "dab004")]
+    public string Dab004 { get; set; }
+
+    /// <summary>
+    ///     鏉愭枡瑙勬牸
+    /// </summary>
+    [SugarColumn(ColumnName = "dab005")]
+    public string Dab005 { get; set; }
+
+    /// <summary>
+    ///     闇�棰嗙敤閲�
+    /// </summary>
+    [SugarColumn(ColumnName = "dab006")]
+    public int? Dab006 { get; set; }
+
+    /// <summary>
+    ///     宸查鐢ㄩ噺
+    /// </summary>
+    [SugarColumn(ColumnName = "dab007")]
+    public int? Dab007 { get; set; }
+
+    /// <summary>
+    ///     宸ヨ壓
+    /// </summary>
+    [SugarColumn(ColumnName = "dab008")]
+    public string Dab008 { get; set; }
+
+    /// <summary>
+    ///     鍗曚綅
+    /// </summary>
+    [SugarColumn(ColumnName = "dab009")]
+    public string Dab009 { get; set; }
+
+    /// <summary>
+    ///     鏉愭枡绫诲瀷
+    /// </summary>
+    [SugarColumn(ColumnName = "dab010")]
+    public string Dab010 { get; set; }
+
+    /// <summary>
+    ///     涓绘枡
+    /// </summary>
+    [SugarColumn(ColumnName = "dab011")]
+    public string Dab011 { get; set; }
+
+    /// <summary>
+    ///     缁勬垚鐢ㄩ噺
+    /// </summary>
+    [SugarColumn(ColumnName = "dab012")]
+    public int? Dab012 { get; set; }
+
+    /// <summary>
+    ///     搴曟暟
+    /// </summary>
+    [SugarColumn(ColumnName = "dab013")]
+    public int? Dab013 { get; set; }
+
+    /// <summary>
+    ///     鏄惁鏇挎枡
+    /// </summary>
+    [SugarColumn(ColumnName = "dab014")]
+    public string Dab014 { get; set; }
+
+    /// <summary>
+    ///     鐐逛綅
+    /// </summary>
+    [SugarColumn(ColumnName = "dab015")]
+    public string Dab015 { get; set; }
+
+    /// <summary>
+    ///     鎶曟枡鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "dab016")]
+    public string Dab016 { get; set; }
+
+    /// <summary>
+    ///     浠撳簱缂栫爜
+    /// </summary>
+    [SugarColumn(ColumnName = "dab017")]
+    public string Dab017 { get; set; }
+
+    /// <summary>
+    ///     浠撳簱鍚嶇О
+    /// </summary>
+    [SugarColumn(ColumnName = "dab018")]
+    public string Dab018 { get; set; }
+
+    /// <summary>
+    ///     棰嗘枡鏂瑰紡
+    /// </summary>
+    [SugarColumn(ColumnName = "dab019")]
+    public string Dab019 { get; set; }
+
+    /// <summary>
+    ///     鍥哄畾鎹熻��
+    /// </summary>
+    [SugarColumn(ColumnName = "scrapqty")]
+    public int? Scrapqty { get; set; }
+
+    /// <summary>
+    ///     鍙樺姩鎹熻�楃巼
+    /// </summary>
+    [SugarColumn(ColumnName = "scraprate")]
+    public int? Scraprate { get; set; }
+
+    /// <summary>
+    ///     鎶曟枡鍗曡id
+    /// </summary>
+    [SugarColumn(ColumnName = "erpid")]
+    public int? Erpid { get; set; }
+
+    /// <summary>
+    ///     鎶曟枡鍗曞ごid
+    /// </summary>
+    [SugarColumn(ColumnName = "eid")]
+    public int? Eid { get; set; }
+
+    /// <summary>
+    ///     瀹為鐢ㄩ噺
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "dab020")]
+    public int? Dab020 { get; set; }
+
+    /// <summary>
+    ///     琛ラ鏁伴噺
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "dab021")]
+    public int? Dab021 { get; set; }
+
+    /// <summary>
+    ///     閫�鏂欐暟閲�
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "dab022")]
+    public int? Dab022 { get; set; }
+
+    /// <summary>
+    ///     瓒呴鏁伴噺
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "dab023")]
+    public int? Dab023 { get; set; }
+
+    /// <summary>
+    ///     鑹搧閫�鏂�
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "lp_tl")]
+    public int? LpTl { get; set; }
+
+    /// <summary>
+    ///     鏉ユ枡涓嶈壇
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "ll_bl")]
+    public int? LlBl { get; set; }
+
+    /// <summary>
+    ///     浣滀笟涓嶈壇
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "zy_bl")]
+    public int? ZyBl { get; set; }
+
+    /// <summary>
+    ///     鍚堝苟鏍囪瘑
+    ///     榛樿鍊�: ((0))
+    /// </summary>
+    [SugarColumn(ColumnName = "hb_flag")]
+    public int? HbFlag { get; set; }
+
+    /// <summary>
+    ///     鍚堝苟鍗曞彿
+    /// </summary>
+    [SugarColumn(ColumnName = "hb_no")]
+    public string HbNo { get; set; }
+
+    // 鍔ㄦ�佹坊鍔犵殑灞炴��
+    [SugarColumn(IsIgnore = true)] public decimal? wNum { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+
+    [SugarColumn(IsIgnore = true)] public string? ItemNo { get; set; }
+}
\ No newline at end of file
diff --git a/service/Warehouse/WomdaaManager.cs b/service/Warehouse/WomdaaManager.cs
new file mode 100644
index 0000000..8485ed1
--- /dev/null
+++ b/service/Warehouse/WomdaaManager.cs
@@ -0,0 +1,74 @@
+锘縰sing NewPdaSqlServer.DB;
+using NewPdaSqlServer.Dto.service;
+using NewPdaSqlServer.entity;
+using SqlSugar;
+
+namespace NewPdaSqlServer.service.Warehouse;
+
+public class WomdaaManager : Repository<Womdaa>
+{
+    //褰撳墠绫诲凡缁忕户鎵夸簡 Repository 澧炪�佸垹銆佹煡銆佹敼鐨勬柟娉�
+    //杩欓噷闈㈠啓鐨勪唬鐮佷笉浼氱粰瑕嗙洊,濡傛灉瑕侀噸鏂扮敓鎴愯鍒犻櫎 WomdaaManager.cs
+
+    //鑾峰彇宸ュ崟鍙�
+    public List<string> GetProductionPickDaa001(WarehouseQuery query)
+    {
+        var sql =
+            "SELECT DAA001 FROM WOMDAA A LEFT JOIN (SELECT COUNT(1) UN_NUM, PID                     FROM WOMDAB                    WHERE DAB006 > DAB007                   GROUP BY PID) B ON A.ID = B.PID WHERE DAA001 LIKE '%" +
+            query.daa001 +
+            "%' and DAA018 != '瀹屽伐' AND DAA022 = 1 AND UN_NUM > 0 AND ROWNUM <= 10 order by a.id desc";
+
+        return Db.Ado.SqlQuery<string>(sql);
+    }
+
+    //鏍规嵁宸ュ崟鍙疯繑鍥炰骇鍝佸瀷鍙峰拰寰呴鐗╂枡
+    public ProductionPickDto GetItemsByDaa001(WarehouseQuery query)
+    {
+        if (string.IsNullOrEmpty(query.daa001)) throw new Exception("宸ュ崟鍙蜂负绌�");
+
+        var womdaa = Db.Queryable<Womdaa, MesItems>((a, i) =>
+                new JoinQueryInfos(JoinType.Left,
+                    a.Daa002 == i.ItemId.ToString()))
+            .Where((a, i) => a.Daa001 == query.daa001)
+            .Select((a, i) => new
+            {
+                i.ItemModel
+            }).First();
+
+        if (womdaa?.ItemModel == null) throw new Exception("宸ュ崟鍙蜂笉瀛樺湪");
+        
+        var womdabs = Db.Queryable<Womdaa, Womdab, MesItems>((a, b, c) =>
+                new JoinQueryInfos(
+                    JoinType.Left,
+                    a.Id == b.Pid, 
+                    JoinType.Inner,
+                    c.Id.ToString() ==
+                    b.Dab003 
+                ))
+            .Where((a, b, c) =>
+                a.Daa001 == query.daa001)
+            .Select((a, b, c) => new Womdab
+            {
+                Pid = b.Pid,
+                Dab003 = b.Dab003,
+                Dab006 = b.Dab006,
+                Dab007 = b.Dab007,
+                wNum = b.Dab006 - b.Dab007, // 璁＄畻瀛楁 W_NUM
+                ItemName = c.ItemName, // 鍔ㄦ�佸瓧娈� ITEM_NAME
+                ItemNo = c.ItemNo // 鍔ㄦ�佸瓧娈� ITEM_NO
+            })
+            .ToList();
+
+        var list = womdabs.Where(s=>s.wNum > 0).ToList();
+
+        var dto = new ProductionPickDto
+        {
+            ItemModel = womdaa.ItemModel,
+            totals = womdabs,
+            daisao = list
+        };
+
+
+        return dto;
+    }
+}
\ No newline at end of file
diff --git a/service/base/LoginService.cs b/service/base/LoginService.cs
index 609db41..c4b5a68 100644
--- a/service/base/LoginService.cs
+++ b/service/base/LoginService.cs
@@ -47,16 +47,22 @@
                 groupObj.child = new List<MesSysPageview>();
 
                 foreach (var pageView in group)
+                {
+                    var mesFile = Db.Queryable<MesFile>()
+                        .Where(s => s.ParentGuid == pageView.Guid).First();
+
                     groupObj.child.Add(new MesSysPageview
                     {
                         Guid = pageView.Guid,
                         PageView = pageView.PageView,
                         Path = pageView.Path,
-                        Icoimg = pageView.Icoimg,
+                        Icoimg = "http://192.168.1.145:81/upload/" +
+                                 mesFile.UrlPath,
                         PageGroup = pageView.PageGroup,
                         PageIdx = pageView.PageIdx,
                         PageStatus = pageView.PageStatus
                     });
+                }
 
                 result.Add(groupObj);
             }

--
Gitblit v1.9.3