zyf
2025-08-20 c083e7791a7146c80567cf33adaf0379f9d9ce31
销售退货更新
已修改3个文件
91 ■■■■ 文件已修改
MES.Service/Modes/SalesOrder/SalesOrder.cs 50 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder/SalesOrderDetail.cs 36 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/SalesOrder/SalesOrder.cs
@@ -13,7 +13,7 @@
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER",IsPrimaryKey =true)]
        public decimal? Id { get; set; }
        /// <summary>
        ///  
@@ -24,17 +24,17 @@
        /// 单据编号 
        ///</summary>
        [SugarColumn(ColumnName = "FBILLNO")]
        public string Fbillno { get; set; }
        public string? Fbillno { get; set; }
        /// <summary>
        /// 单据类型 
        ///</summary>
        [SugarColumn(ColumnName = "FBILLTYPEID")]
        public string Fbilltypeid { get; set; }
        public string? Fbilltypeid { get; set; }
        /// <summary>
        /// 单据状态 
        ///</summary>
        [SugarColumn(ColumnName = "FDOCUMENTSTATUS")]
        public string Fdocumentstatus { get; set; }
        public string? Fdocumentstatus { get; set; }
        /// <summary>
        /// 日期 
        ///</summary>
@@ -44,17 +44,17 @@
        /// 业务类型 
        ///</summary>
        [SugarColumn(ColumnName = "FBUSINESSTYPE")]
        public string Fbusinesstype { get; set; }
        public string? Fbusinesstype { get; set; }
        /// <summary>
        /// 交货方式 
        ///</summary>
        [SugarColumn(ColumnName = "FHEADDELIVERYWAY")]
        public string Fheaddeliveryway { get; set; }
        public string? Fheaddeliveryway { get; set; }
        /// <summary>
        /// 交货地点 
        ///</summary>
        [SugarColumn(ColumnName = "FHEADLOCID")]
        public string Fheadlocid { get; set; }
        public string? Fheadlocid { get; set; }
        /// <summary>
        /// 销售组织 
        ///</summary>
@@ -64,62 +64,62 @@
        /// 客户 
        ///</summary>
        [SugarColumn(ColumnName = "FCUSTID")]
        public string Fcustid { get; set; }
        public string? Fcustid { get; set; }
        /// <summary>
        /// 关闭状态 
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSESTATUS")]
        public string Fclosestatus { get; set; }
        public string? Fclosestatus { get; set; }
        /// <summary>
        /// 销售部门 
        ///</summary>
        [SugarColumn(ColumnName = "FSALEDEPTID")]
        public string Fsaledeptid { get; set; }
        public string? Fsaledeptid { get; set; }
        /// <summary>
        /// 销售员 
        ///</summary>
        [SugarColumn(ColumnName = "FSALERID")]
        public string Fsalerid { get; set; }
        public string? Fsalerid { get; set; }
        /// <summary>
        /// 变更原因 
        ///</summary>
        [SugarColumn(ColumnName = "FCHANGEREASON")]
        public string Fchangereason { get; set; }
        public string? Fchangereason { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
        [SugarColumn(ColumnName = "FNOTE")]
        public string Fnote { get; set; }
        public string? Fnote { get; set; }
        /// <summary>
        /// 结算方 
        ///</summary>
        [SugarColumn(ColumnName = "FSETTLEID")]
        public string Fsettleid { get; set; }
        public string? Fsettleid { get; set; }
        /// <summary>
        /// 审核人 
        ///</summary>
        [SugarColumn(ColumnName = "FAPPROVERID")]
        public string Fapproverid { get; set; }
        public string? Fapproverid { get; set; }
        /// <summary>
        /// 收货人姓名 
        ///</summary>
        [SugarColumn(ColumnName = "FLINKMAN")]
        public string Flinkman { get; set; }
        public string? Flinkman { get; set; }
        /// <summary>
        /// 付款方 
        ///</summary>
        [SugarColumn(ColumnName = "FCHARGEID")]
        public string Fchargeid { get; set; }
        public string? Fchargeid { get; set; }
        /// <summary>
        /// 联系电话 
        ///</summary>
        [SugarColumn(ColumnName = "FLINKPHONE")]
        public string Flinkphone { get; set; }
        public string? Flinkphone { get; set; }
        /// <summary>
        /// 创建人 
        ///</summary>
        [SugarColumn(ColumnName = "FCREATORID")]
        public string Fcreatorid { get; set; }
        public string? Fcreatorid { get; set; }
        /// <summary>
        /// 创建日期 
        ///</summary>
@@ -129,7 +129,7 @@
        /// 最后修改人 
        ///</summary>
        [SugarColumn(ColumnName = "FMODIFIERID")]
        public string Fmodifierid { get; set; }
        public string? Fmodifierid { get; set; }
        /// <summary>
        /// 最后修改日期 
        ///</summary>
@@ -144,7 +144,7 @@
        /// 关闭人 
        ///</summary>
        [SugarColumn(ColumnName = "FCLOSERID")]
        public string Fcloserid { get; set; }
        public string? Fcloserid { get; set; }
        /// <summary>
        /// 关闭日期 
        ///</summary>
@@ -159,22 +159,22 @@
        /// 作废状态 
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELSTATUS")]
        public string Fcancelstatus { get; set; }
        public string? Fcancelstatus { get; set; }
        /// <summary>
        /// 作废人 
        ///</summary>
        [SugarColumn(ColumnName = "FCANCELLERID")]
        public string Fcancellerid { get; set; }
        public string? Fcancellerid { get; set; }
        /// <summary>
        /// 版本号 
        ///</summary>
        [SugarColumn(ColumnName = "FVERSIONNO")]
        public string Fversionno { get; set; }
        public string? Fversionno { get; set; }
        /// <summary>
        /// 变更人 
        ///</summary>
        [SugarColumn(ColumnName = "FCHANGERID")]
        public string Fchangerid { get; set; }
        public string? Fchangerid { get; set; }
        /// <summary>
        /// 发货日期 
        ///</summary>
MES.Service/Modes/SalesOrder/SalesOrderDetail.cs
@@ -13,7 +13,7 @@
        /// <summary>
        ///  
        ///</summary>
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER")]
        [SugarColumn(ColumnName = "ID", OracleSequenceName = "SEQ_SALES_ORDER", IsPrimaryKey = true)]
        public decimal Id { get; set; }
        /// <summary>
@@ -31,12 +31,12 @@
        /// 物料编码 
        ///</summary>
        [SugarColumn(ColumnName = "FMATERIALID")]
        public string Fmaterialid { get; set; }
        public string? Fmaterialid { get; set; }
        /// <summary>
        /// 销售单位 
        ///</summary>
        [SugarColumn(ColumnName = "FUNITID")]
        public string Funitid { get; set; }
        public string? Funitid { get; set; }
        /// <summary>
        /// 销售数量 
        ///</summary>
@@ -46,7 +46,7 @@
        /// 计价单位 
        ///</summary>
        [SugarColumn(ColumnName = "FPRICEUNITID")]
        public string Fpriceunitid { get; set; }
        public string? Fpriceunitid { get; set; }
        /// <summary>
        /// 计价数量 
        ///</summary>
@@ -61,7 +61,7 @@
        /// 是否赠品 
        ///</summary>
        [SugarColumn(ColumnName = "FISFREE")]
        public string Fisfree { get; set; }
        public string? Fisfree { get; set; }
        /// <summary>
        /// 结算组织 
        ///</summary>
@@ -71,27 +71,27 @@
        /// 货主类型 
        ///</summary>
        [SugarColumn(ColumnName = "FOWNERTYPEID")]
        public string Fownertypeid { get; set; }
        public string? Fownertypeid { get; set; }
        /// <summary>
        /// 货主 
        ///</summary>
        [SugarColumn(ColumnName = "FOWNERID")]
        public string Fownerid { get; set; }
        public string? Fownerid { get; set; }
        /// <summary>
        /// 备注 
        ///</summary>
        [SugarColumn(ColumnName = "FENTRYNOTE")]
        public string Fentrynote { get; set; }
        public string? Fentrynote { get; set; }
        /// <summary>
        /// 计划跟踪号 
        ///</summary>
        [SugarColumn(ColumnName = "FMTONO")]
        public string Fmtono { get; set; }
        public string? Fmtono { get; set; }
        /// <summary>
        /// 批号 
        ///</summary>
        [SugarColumn(ColumnName = "FLOT")]
        public string Flot { get; set; }
        public string? Flot { get; set; }
        /// <summary>
        /// 发货上限 
        ///</summary>
@@ -106,17 +106,17 @@
        /// 超发控制单位 
        ///</summary>
        [SugarColumn(ColumnName = "FOUTLMTUNITID")]
        public string Foutlmtunitid { get; set; }
        public string? Foutlmtunitid { get; set; }
        /// <summary>
        /// 业务关闭 
        ///</summary>
        [SugarColumn(ColumnName = "FMRPCLOSESTATUS")]
        public string Fmrpclosestatus { get; set; }
        public string? Fmrpclosestatus { get; set; }
        /// <summary>
        /// 业务终止 
        ///</summary>
        [SugarColumn(ColumnName = "FMRPTERMINATESTATUS")]
        public string Fmrpterminatestatus { get; set; }
        public string? Fmrpterminatestatus { get; set; }
        /// <summary>
        /// 终止日期 
        ///</summary>
@@ -131,12 +131,12 @@
        /// 源单类型 
        ///</summary>
        [SugarColumn(ColumnName = "FSRCTYPE")]
        public string Fsrctype { get; set; }
        public string? Fsrctype { get; set; }
        /// <summary>
        /// 源单单号 
        ///</summary>
        [SugarColumn(ColumnName = "FSRCBILLNO")]
        public string Fsrcbillno { get; set; }
        public string? Fsrcbillno { get; set; }
        /// <summary>
        /// 累计发货通知数量 
        ///</summary>
@@ -171,16 +171,16 @@
        /// 客户物料编码 
        ///</summary>
        [SugarColumn(ColumnName = "FMAPID")]
        public string Fmapid { get; set; }
        public string? Fmapid { get; set; }
        /// <summary>
        /// 客户物料名称 
        ///</summary>
        [SugarColumn(ColumnName = "FMAPNAME")]
        public string Fmapname { get; set; }
        public string? Fmapname { get; set; }
        /// <summary>
        /// 客户规格型号 
        ///</summary>
        [SugarColumn(ColumnName = "FMAPSPEC")]
        public string Fmapspec { get; set; }
        public string? Fmapspec { get; set; }
    }
}
MES.Service/Modes/SalesReturnNotice/SalesReturnNoticeDetail.cs
@@ -111,5 +111,10 @@
        ///</summary>
         [SugarColumn(ColumnName="FORDERNO"    )]
         public string Forderno { get; set; }
        /// <summary>
        /// 退货检验标识
        ///</summary>
        [SugarColumn(ColumnName = "FRETURNCHECK")]
        public decimal? FReturnCheck { get; set; }
    }
}