消息中心推送消息的逻辑修改

啊鑫

2024-11-20 f26b99b11db7d779494a5f111b05dd8f5d55bf9c

 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>
        /// 入库单id 
        ///</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; }
    }
}
}