cnf
2025-08-29 1d4c9510a9d662181a783c0179750dde2dfe9d8d
采购订单接口修改
已修改4个文件
42 ■■■■■ 文件已修改
MES.Service/Dto/webApi/ErpRohIn.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpRohinData.cs 10 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Modes/MesRohInData.cs 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/service/BasicData/MesRohInManager.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
MES.Service/Dto/webApi/ErpRohIn.cs
@@ -17,7 +17,7 @@
    public string? FPurchaserId { get; set; }
    public string? FSettleId { get; set; }
    public string? FChargeId { get; set; }
    public string? FProviderEMail { get; set; }
    //public string? FProviderEMail { get; set; }
    public string? Remarks { get; set; }
    public string? FCancelStatus { get; set; }
    public string? FCancellerId { get; set; }
@@ -33,12 +33,12 @@
    public string? FReceiveOrgId { get; set; }
    public string? FProviderId { get; set; }
    public string? FTContact { get; set; }
    public string? Fmobilephone { get; set; }
    //public string? FTContact { get; set; }
    //public string? Fmobilephone { get; set; }
    public string? FixedTelephone { get; set; }
    //public string? FixedTelephone { get; set; }
    public string? Address { get; set; }
    //public string? Address { get; set; }
    public string? Acctype { get; set; }
}
MES.Service/Dto/webApi/ErpRohinData.cs
@@ -20,9 +20,9 @@
    public string? FRequireDeptId { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? FReceiveDeptId { get; set; }
    public string? FSETTLEORGID { get; set; }
    //public string? FSETTLEORGID { get; set; }
    public string? FGiveAway { get; set; }
    public string? Fnote { get; set; }
    //public string? Fnote { get; set; }
    public string? FEntryNote { get; set; }
    public string? FSupMatId { get; set; }
    public string? FSupMatName { get; set; }
@@ -51,7 +51,7 @@
    public string? FDEMANDTYPE { get; set; }
    public string? FDEMANDBILLENTRYSEQ { get; set; }
    public string? SalesOrderId { get; set; }
    public string? OrderLineId { get; set; }
    //public string? SalesOrderId { get; set; }
    //public string? OrderLineId { get; set; }
    public string? FSUBREQENTRYID { get; set; }
}
MES.Service/Modes/MesRohInData.cs
@@ -355,4 +355,9 @@
    /// </summary>
    [SugarColumn(ColumnName = "FDEMANDBILLNO_LINE")]
    public string? FdemandbillnoLine { get; set; }
    /// <summary>
    /// </summary>
    [SugarColumn(ColumnName = "FSUBREQENTRYID")]
    public string? Fsubreqentryid { get; set; }
}
MES.Service/service/BasicData/MesRohInManager.cs
@@ -113,7 +113,7 @@
        mesRohIn.Purchaser = rohIn.FPurchaserId;
        mesRohIn.SettlementParty = rohIn.FSettleId;
        mesRohIn.PaymentParty = rohIn.FChargeId;
        mesRohIn.Email = rohIn.FProviderEMail;
        //mesRohIn.Email = rohIn.FProviderEMail;
        mesRohIn.Remarks = rohIn.Remarks;
        mesRohIn.CancellationStatus = rohIn.FCancelStatus;
        mesRohIn.CancellationPerson = rohIn.FCancellerId;
@@ -147,10 +147,10 @@
        mesRohIn.ReceiveOrgId = rohIn.FReceiveOrgId;
        mesRohIn.ProviderId = rohIn.FProviderId;
        mesRohIn.Anred = rohIn.FTContact;
        mesRohIn.Telf1 = rohIn.Fmobilephone;
        mesRohIn.FixedTelephone = rohIn.FixedTelephone;
        mesRohIn.Address = rohIn.Address;
        //mesRohIn.Anred = rohIn.FTContact;
        //mesRohIn.Telf1 = rohIn.Fmobilephone;
        //mesRohIn.FixedTelephone = rohIn.FixedTelephone;
        //mesRohIn.Address = rohIn.Address;
        mesRohIn.Acctype = rohIn.Acctype;
        mesRohIn.SynchronousDate = DateTime.Now;
@@ -233,11 +233,12 @@
                PurchaseOrderLineNumber = s.FSEQ,
                Demand = s.FRequireOrgId,
                Receiving = s.FReceiveOrgId,
                Settlement = s.FSETTLEORGID,
                //Settlement = s.FSETTLEORGID,
                DemandDepartment = s.FRequireDeptId,
                ReceivingDepartment = s.FReceiveDeptId,
                SalesOrderId = s.SalesOrderId,
                OrderLineId = s.OrderLineId
                //SalesOrderId = s.SalesOrderId,
                //OrderLineId = s.OrderLineId
                Fsubreqentryid=s.FSUBREQENTRYID
            };
            if (s.FFreezeDate != null)