From f26b99b11db7d779494a5f111b05dd8f5d55bf9c Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 20 十一月 2024 13:12:52 +0800
Subject: [PATCH] 消息中心推送消息的逻辑修改

---
 entity/MesInvItemInCDetails.cs |  314 ++++++++++++++++++++++++++++++++--------------------
 1 files changed, 193 insertions(+), 121 deletions(-)

diff --git a/entity/MesInvItemInCDetails.cs b/entity/MesInvItemInCDetails.cs
index fd05a40..2a90c16 100644
--- a/entity/MesInvItemInCDetails.cs
+++ b/entity/MesInvItemInCDetails.cs
@@ -12,308 +12,380 @@
         ///  
         /// 榛樿鍊�: (newid())
         ///</summary>
-         [SugarColumn(ColumnName="guid" ,IsPrimaryKey = true   )]
-         public Guid Guid { get; set; }
+        [SugarColumn(ColumnName = "guid", IsPrimaryKey = true)]
+        public Guid Guid { get; set; }
+
         /// <summary>
         /// 鍏ュ簱鍗昳d 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_IN_ID"    )]
-         public long? ItemInId { get; set; }
+        [SugarColumn(ColumnName = "ITEM_IN_ID")]
+        public Guid ItemInId { get; set; }
+
         /// <summary>
         /// 鐗╂枡鏉$爜PSN 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_BARCODE"    )]
-         public string ItemBarcode { get; set; }
+        [SugarColumn(ColumnName = "ITEM_BARCODE")]
+        public string? ItemBarcode { get; set; }
+
         /// <summary>
         /// 瀹㈡埛鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 
         ///</summary>
-         [SugarColumn(ColumnName="C_ITEM_CODE"    )]
-         public string CItemCode { get; set; }
+        [SugarColumn(ColumnName = "C_ITEM_CODE")]
+        public string? CItemCode { get; set; }
+
         /// <summary>
         /// 瀹㈡埛鐗╂枡鏉$爜 
         ///</summary>
-         [SugarColumn(ColumnName="C_ITEM_BARCODE"    )]
-         public string CItemBarcode { get; set; }
+        [SugarColumn(ColumnName = "C_ITEM_BARCODE")]
+        public string? CItemBarcode { get; set; }
+
         /// <summary>
         /// 楠屾敹鏁伴噺 
         ///</summary>
-         [SugarColumn(ColumnName="QUANTITY"    )]
-         public decimal? Quantity { get; set; }
+        [SugarColumn(ColumnName = "QUANTITY")]
+        public decimal? Quantity { get; set; }
+
         /// <summary>
         /// 鍏ュ簱鏂瑰紡(1:鏈夋潯鐮�,0:鏃犳潯鐮�) 
         /// 榛樿鍊�: ((1))
         ///</summary>
-         [SugarColumn(ColumnName="BARCODE_FLAG"    )]
-         public bool? BarcodeFlag { get; set; }
+        [SugarColumn(ColumnName = "BARCODE_FLAG")]
+        public bool? BarcodeFlag { get; set; }
+
         /// <summary>
         /// 鐜繚鏍囧織锛�0-闈炵幆淇�,1-鐜繚.鏃犳潯鐮佹墜宸ュ綍鍏ワ紝鏈夋潯鐮佷负鍐椾綑瀛楁锛� 
         /// 榛樿鍊�: ((1))
         ///</summary>
-         [SugarColumn(ColumnName="EP_FLAG"    )]
-         public bool? EpFlag { get; set; }
+        [SugarColumn(ColumnName = "EP_FLAG")]
+        public bool? EpFlag { get; set; }
+
         /// <summary>
         /// 鍒涘缓浜� 
         ///</summary>
-         [SugarColumn(ColumnName="CREATE_BY"    )]
-         public string CreateBy { get; set; }
+        [SugarColumn(ColumnName = "CREATE_BY")]
+        public string? CreateBy { get; set; }
+
         /// <summary>
         /// 鍒涘缓鏃堕棿 
         ///</summary>
-         [SugarColumn(ColumnName="CREATE_DATE"    )]
-         public DateTime? CreateDate { get; set; }
+        [SugarColumn(ColumnName = "CREATE_DATE")]
+        public DateTime? CreateDate { get; set; }
+
         /// <summary>
         /// 鏈�鍚庢洿鏂颁汉 
         ///</summary>
-         [SugarColumn(ColumnName="LASTUPDATE_BY"    )]
-         public string LastupdateBy { get; set; }
+        [SugarColumn(ColumnName = "LASTUPDATE_BY")]
+        public string? LastupdateBy { get; set; }
+
         /// <summary>
         /// 鏈�鍚庢洿鏂版椂闂� 
         ///</summary>
-         [SugarColumn(ColumnName="LASTUPDATE_DATE"    )]
-         public DateTime? LastupdateDate { get; set; }
+        [SugarColumn(ColumnName = "LASTUPDATE_DATE")]
+        public DateTime? LastupdateDate { get; set; }
+
         /// <summary>
         /// 浣滀笟鏂瑰紡0-鏈夌嚎鏉$爜鏋�1-鏃犵嚎鏉$爜鏋� 
         ///</summary>
-         [SugarColumn(ColumnName="WORK_TYPE"    )]
-         public long? WorkType { get; set; }
+        [SugarColumn(ColumnName = "WORK_TYPE")]
+        public long? WorkType { get; set; }
+
         /// <summary>
         /// 鏈徃鐗╂枡缂栫爜锛堟棤鏉$爜鎵嬪伐褰曞叆锛屾湁鏉$爜涓哄啑浣欏瓧娈碉級 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_NO"    )]
-         public string ItemNo { get; set; }
+        [SugarColumn(ColumnName = "ITEM_NO")]
+        public string? ItemNo { get; set; }
+
         /// <summary>
         /// 鍘傚鎵规 
         ///</summary>
-         [SugarColumn(ColumnName="LOT_NO"    )]
-         public string LotNo { get; set; }
+        [SugarColumn(ColumnName = "LOT_NO")]
+        public string? LotNo { get; set; }
+
         /// <summary>
         /// 鏄惁鍏辩鐗╂枡(0:鍚︼紝1:鏄�) 
         /// 榛樿鍊�: ((0))
         ///</summary>
-         [SugarColumn(ColumnName="COMANAGEMENT_FLAG"    )]
-         public bool? ComanagementFlag { get; set; }
+        [SugarColumn(ColumnName = "COMANAGEMENT_FLAG")]
+        public bool? ComanagementFlag { get; set; }
+
         /// <summary>
         /// 瀹㈡埛缂栫爜 
         ///</summary>
-         [SugarColumn(ColumnName="CUST_NO"    )]
-         public string CustNo { get; set; }
+        [SugarColumn(ColumnName = "CUST_NO")]
+        public string? CustNo { get; set; }
+
         /// <summary>
         /// 妫�楠岀粨鏋� 
         ///</summary>
-         [SugarColumn(ColumnName="CHECK_RES"    )]
-         public string CheckRes { get; set; }
+        [SugarColumn(ColumnName = "CHECK_RES")]
+        public string? CheckRes { get; set; }
+
         /// <summary>
         /// 杩涜揣鏁伴噺 
         ///</summary>
-         [SugarColumn(ColumnName="CHECK_QTY"    )]
-         public decimal? CheckQty { get; set; }
+        [SugarColumn(ColumnName = "CHECK_QTY")]
+        public decimal? CheckQty { get; set; }
+
         /// <summary>
         /// 妫�楠岀姸鎬� 
         ///</summary>
-         [SugarColumn(ColumnName="CHECK_STATES"    )]
-         public string CheckStates { get; set; }
+        [SugarColumn(ColumnName = "CHECK_STATES")]
+        public string? CheckStates { get; set; }
+
         /// <summary>
         /// 寮哄埗鍏ュ簱鏍囪0鏃狅紝1-寮哄埗鍏ュ簱  閫�鏂欏崟浣跨敤 
         /// 榛樿鍊�: ((0))
         ///</summary>
-         [SugarColumn(ColumnName="FORCE_IN_FLAG"    )]
-         public bool? ForceInFlag { get; set; }
+        [SugarColumn(ColumnName = "FORCE_IN_FLAG")]
+        public bool? ForceInFlag { get; set; }
+
         /// <summary>
         /// 浠撳簱缂栫爜 
         ///</summary>
-         [SugarColumn(ColumnName="DEPOT_CODE"    )]
-         public string DepotCode { get; set; }
+        [SugarColumn(ColumnName = "DEPOT_CODE")]
+        public string? DepotCode { get; set; }
+
         /// <summary>
         /// 璐т綅缂栫爜 
         ///</summary>
-         [SugarColumn(ColumnName="DEPOT_SECTION_CODE"    )]
-         public string DepotSectionCode { get; set; }
+        [SugarColumn(ColumnName = "DEPOT_SECTION_CODE")]
+        public string? DepotSectionCode { get; set; }
+
         /// <summary>
         /// 鐗硅浜嬮」 
         ///</summary>
-         [SugarColumn(ColumnName="REMARK"    )]
-         public string Remark { get; set; }
+        [SugarColumn(ColumnName = "REMARK")]
+        public string? Remark { get; set; }
+
         /// <summary>
         /// 鐗╂枡鏉$爜 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_BARCODE2"    )]
-         public string ItemBarcode2 { get; set; }
+        [SugarColumn(ColumnName = "ITEM_BARCODE2")]
+        public string? ItemBarcode2 { get; set; }
+
         /// <summary>
         /// 鏂版潯鐮� 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_BARCODE3"    )]
-         public string ItemBarcode3 { get; set; }
+        [SugarColumn(ColumnName = "ITEM_BARCODE3")]
+        public string? ItemBarcode3 { get; set; }
+
         /// <summary>
         /// 宸蹭娇鐢ㄦ暟閲� 
         ///</summary>
-         [SugarColumn(ColumnName="USE_QTY"    )]
-         public decimal? UseQty { get; set; }
+        [SugarColumn(ColumnName = "USE_QTY")]
+        public decimal? UseQty { get; set; }
+
         /// <summary>
         /// 鍑哄簱鏁伴噺 
         ///</summary>
-         [SugarColumn(ColumnName="OUT_QTY"    )]
-         public decimal? OutQty { get; set; }
+        [SugarColumn(ColumnName = "OUT_QTY")]
+        public decimal? OutQty { get; set; }
+
         /// <summary>
         /// 鐗╂枡鍚嶇О 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_SNAME"    )]
-         public string ItemSname { get; set; }
+        [SugarColumn(ColumnName = "ITEM_SNAME")]
+        public string? ItemSname { get; set; }
+
         /// <summary>
         /// 璧峰浣嶇疆 
         ///</summary>
-         [SugarColumn(ColumnName="SPOSTION"    )]
-         public int? Spostion { get; set; }
+        [SugarColumn(ColumnName = "SPOSTION")]
+        public int? Spostion { get; set; }
+
         /// <summary>
         /// 缁撴潫浣嶇疆 
         ///</summary>
-         [SugarColumn(ColumnName="EPOSTION"    )]
-         public int? Epostion { get; set; }
+        [SugarColumn(ColumnName = "EPOSTION")]
+        public int? Epostion { get; set; }
+
         /// <summary>
         /// 妫�楠屾棩鏈� 
         ///</summary>
-         [SugarColumn(ColumnName="CHECK_DATE"    )]
-         public DateTime? CheckDate { get; set; }
+        [SugarColumn(ColumnName = "CHECK_DATE")]
+        public DateTime? CheckDate { get; set; }
+
         /// <summary>
         /// 鍗曚綅 
         ///</summary>
-         [SugarColumn(ColumnName="UNIT"    )]
-         public string Unit { get; set; }
+        [SugarColumn(ColumnName = "UNIT")]
+        public string? Unit { get; set; }
+
         /// <summary>
         /// 鏄惁妫�楠� 
         /// 榛樿鍊�: ((0))
         ///</summary>
-         [SugarColumn(ColumnName="ISCHECK"    )]
-         public bool? Ischeck { get; set; }
+        [SugarColumn(ColumnName = "ISCHECK")]
+        public bool? Ischeck { get; set; }
+
         /// <summary>
         /// 閲囪喘鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="EBELN"    )]
-         public string Ebeln { get; set; }
+        [SugarColumn(ColumnName = "EBELN")]
+        public string? Ebeln { get; set; }
+
         /// <summary>
         /// 鎵规鏃ユ湡 
         ///</summary>
-         [SugarColumn(ColumnName="LOT_DATE"    )]
-         public string LotDate { get; set; }
+        [SugarColumn(ColumnName = "LOT_DATE")]
+        public string? LotDate { get; set; }
+
         /// <summary>
         /// 鍙戠エ鍙� 
         ///</summary>
-         [SugarColumn(ColumnName="BILL_NO"    )]
-         public string BillNo { get; set; }
+        [SugarColumn(ColumnName = "BILL_NO")]
+        public string? BillNo { get; set; }
+
         /// <summary>
         /// 鏄惁鍏ュ簱鎴愬姛 
         /// 榛樿鍊�: ((0))
         ///</summary>
-         [SugarColumn(ColumnName="STOCK_OK"    )]
-         public bool? StockOk { get; set; }
+        [SugarColumn(ColumnName = "STOCK_OK")]
+        public bool? StockOk { get; set; }
+
         /// <summary>
         /// 宸ュ巶 
         ///</summary>
-         [SugarColumn(ColumnName="FACTORY"    )]
-         public string Factory { get; set; }
+        [SugarColumn(ColumnName = "FACTORY")]
+        public string? Factory { get; set; }
+
         /// <summary>
         /// 鍏徃 
         ///</summary>
-         [SugarColumn(ColumnName="COMPANY"    )]
-         public string Company { get; set; }
+        [SugarColumn(ColumnName = "COMPANY")]
+        public string? Company { get; set; }
+
         /// <summary>
         /// CB鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="CB_NO"    )]
-         public string CbNo { get; set; }
+        [SugarColumn(ColumnName = "CB_NO")]
+        public string? CbNo { get; set; }
+
         /// <summary>
         /// 绠卞彿 
         ///</summary>
-         [SugarColumn(ColumnName="BOX_NO"    )]
-         public string BoxNo { get; set; }
+        [SugarColumn(ColumnName = "BOX_NO")]
+        public string? BoxNo { get; set; }
+
         /// <summary>
         /// 浠撳簱ID 
         ///</summary>
-         [SugarColumn(ColumnName="DEPOT_ID"    )]
-         public long? DepotId { get; set; }
+        [SugarColumn(ColumnName = "DEPOT_ID")]
+        public long? DepotId { get; set; }
+
         /// <summary>
         /// 璐т綅ID 
         ///</summary>
-         [SugarColumn(ColumnName="DEPOT_SECTION_ID"    )]
-         public long? DepotSectionId { get; set; }
+        [SugarColumn(ColumnName = "DEPOT_SECTION_ID")]
+        public long? DepotSectionId { get; set; }
+
         /// <summary>
         /// 琛屽彿 
         ///</summary>
-         [SugarColumn(ColumnName="LINE_NUM"    )]
-         public string LineNum { get; set; }
+        [SugarColumn(ColumnName = "LINE_NUM")]
+        public string? LineNum { get; set; }
+
         /// <summary>
         /// 鎵弿鏁伴噺 
         ///</summary>
-         [SugarColumn(ColumnName="SM_QTY"    )]
-         public decimal? SmQty { get; set; }
+        [SugarColumn(ColumnName = "SM_QTY")]
+        public decimal? SmQty { get; set; }
+
         /// <summary>
         /// 鍙戣揣鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="VGBEL"    )]
-         public string Vgbel { get; set; }
+        [SugarColumn(ColumnName = "VGBEL")]
+        public string? Vgbel { get; set; }
+
         /// <summary>
         /// 琛屽彿 
         ///</summary>
-         [SugarColumn(ColumnName="KDPOS"    )]
-         public long? Kdpos { get; set; }
+        [SugarColumn(ColumnName = "KDPOS")]
+        public long? Kdpos { get; set; }
+
         /// <summary>
         /// 浣滀笟鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="WORK_NO"    )]
-         public string WorkNo { get; set; }
+        [SugarColumn(ColumnName = "WORK_NO")]
+        public string? WorkNo { get; set; }
+
         /// <summary>
         /// 琛屽彿 
         ///</summary>
-         [SugarColumn(ColumnName="EBELN_LINE_NO"    )]
-         public long? EbelnLineNo { get; set; }
+        [SugarColumn(ColumnName = "EBELN_LINE_NO")]
+        public long? EbelnLineNo { get; set; }
+
         /// <summary>
         /// CB鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="CBILL_NO"    )]
-         public string CbillNo { get; set; }
+        [SugarColumn(ColumnName = "CBILL_NO")]
+        public string? CbillNo { get; set; }
+
         /// <summary>
         /// 绱ф�ユ爣璁� 
         ///</summary>
-         [SugarColumn(ColumnName="URGENT_FLAG"    )]
-         public bool? UrgentFlag { get; set; }
+        [SugarColumn(ColumnName = "URGENT_FLAG")]
+        public bool? UrgentFlag { get; set; }
+
         /// <summary>
         /// 鏉垮瀷 
         ///</summary>
-         [SugarColumn(ColumnName="BOARD_STYLE"    )]
-         public string BoardStyle { get; set; }
+        [SugarColumn(ColumnName = "BOARD_STYLE")]
+        public string? BoardStyle { get; set; }
+
         /// <summary>
         /// 宸ヤ綔琛屽彿 
         ///</summary>
-         [SugarColumn(ColumnName="WORK_LINE"    )]
-         public int? WorkLine { get; set; }
+        [SugarColumn(ColumnName = "WORK_LINE")]
+        public int? WorkLine { get; set; }
+
         /// <summary>
         /// 浠诲姟鍙� 
         ///</summary>
-         [SugarColumn(ColumnName="TASK_NO"    )]
-         public string TaskNo { get; set; }
+        [SugarColumn(ColumnName = "TASK_NO")]
+        public string? TaskNo { get; set; }
+
         /// <summary>
         /// 渚涘簲鍟嗙紪鐮� 
         ///</summary>
-         [SugarColumn(ColumnName="SUPP_NO"    )]
-         public string SuppNo { get; set; }
+        [SugarColumn(ColumnName = "SUPP_NO")]
+        public string? SuppNo { get; set; }
+
         /// <summary>
         /// 鏀惰揣鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="RBILL_NO"    )]
-         public string RbillNo { get; set; }
+        [SugarColumn(ColumnName = "RBILL_NO")]
+        public string? RbillNo { get; set; }
+
         /// <summary>
         /// K3 閲囪喘鍗曞彿 
         ///</summary>
-         [SugarColumn(ColumnName="EBELN_K3ID"    )]
-         public long? EbelnK3id { get; set; }
+        [SugarColumn(ColumnName = "EBELN_K3ID")]
+        public long? EbelnK3id { get; set; }
+
         /// <summary>
         /// K3 琛屽彿 
         ///</summary>
-         [SugarColumn(ColumnName="LINE_K3ID"    )]
-         public long? LineK3id { get; set; }
+        [SugarColumn(ColumnName = "LINE_K3ID")]
+        public long? LineK3id { get; set; }
+
         /// <summary>
         /// 鐗╂枡ID 
         ///</summary>
-         [SugarColumn(ColumnName="ITEM_ID"    )]
-         public long? ItemId { get; set; }
+        [SugarColumn(ColumnName = "ITEM_ID")]
+        public long? ItemId { get; set; }
+
+        [SugarColumn(ColumnName = "SUPP_ID")]
+        public string? SuppId { get; set; }
+
+
+        // 娣诲姞鐨勫瓧娈碉紝骞朵笖瀹冧滑涓嶅睘浜庢暟鎹簱琛�
+        [SugarColumn(IsIgnore = true)] public string? ItemName { get; set; }
+
+        [SugarColumn(IsIgnore = true)] public string? ItemModel { get; set; }
+
+        [SugarColumn(IsIgnore = true)] public string? ItemUnit { get; set; }
+
+        [SugarColumn(IsIgnore = true)] public decimal? SumQuantity { get; set; }
     }
-}
+}
\ No newline at end of file

--
Gitblit v1.9.3