销售退货 退货组织，收料通的单创建人

hao

4 天以前 78456b712df7ed58cb43ea980395a07c502a356a

销售退货 退货组织，收料通的单创建人

 StandardInterface/MES.Service/Dto/webApi/ErpSalesReturnDto.cs

@@ -9,6 +9,7 @@
    public string? FDate { get; set; } // 日期
    public string? FSettleCurrld { get; set; } // 结算币别
    public string? FSaleDeptId { get; set; } // 销售部门
    public string? FSaleOrgId { get; set; } // 销售组织
    public string? FRetcustId { get; set; } // 退货客户
    public string? FRetcustReason { get; set; } // 退货原因
    public string? FHeadLocId { get; set; } // 交货地点

 StandardInterface/MES.Service/Dto/webApi/SRM/DeliveryNote.cs

@@ -9,4 +9,5 @@
    public string? Remark { get; set; }
    public string? FReceiveOrgId { get; set; }
    public string? Is_SRM { get; set; }
    public string? CREATE_BY { get; set; }
}

 StandardInterface/MES.Service/Modes/SRM/MesDeliveryNote.cs

@@ -44,7 +44,9 @@
    //是否SRM
    [SugarColumn(ColumnName = "IS_SRM")]
    public string? Issrm { get; set; }

    //创建人
    [SugarColumn(ColumnName = "CREATE_BY")]
    public string? CreateBy { get; set; }
    //创建时间
    [SugarColumn(ColumnName = "CREATE_DATE")]
    public DateTime? CreateDate { get; set; }

 StandardInterface/MES.Service/Modes/SalesReturnNotice.cs

@@ -41,6 +41,11 @@
        [SugarColumn(ColumnName = "SALES_DEPT")]
        public string SalesDept { get; set; }
        /// <summary>
        /// 销售组织
        ///</summary>
        [SugarColumn(ColumnName = "SALES_ORG")]
        public string SalesOrg { get; set; }
        /// <summary>
        /// 退货客户 
        ///</summary>
        [SugarColumn(ColumnName = "RETURN_CUSTOMER")]

 StandardInterface/MES.Service/service/BasicData/Sales/SalesReturnNoticeManager.cs

@@ -131,6 +131,7 @@
            BillType = erpDto.FBillTypeID, // 单据类型
            Currency = erpDto.FSettleCurrld, // 结算币别
            SalesDept = erpDto.FSaleDeptId, //销售部门
            SalesOrg = erpDto.FSaleOrgId, //销售组织
            ReturnCustomer = erpDto.FRetcustId, // 退货客户
            ReturnReason = erpDto.FRetcustReason, // 退货原因
            DeliveryLocation = erpDto.FHeadLocId, // 交货地点

 StandardInterface/MES.Service/service/DbckaManager.cs

@@ -6,6 +6,7 @@
using MES.Service.Dto.webApi;
using MES.Service.Modes;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory;
using System.Net.NetworkInformation;

namespace MES.Service.service
{
@@ -56,7 +57,9 @@
                Remark = dto.bz,
                Erpid = dto.erpid,
                CreateDate = DateTime.Now,
                CreateBy = "System"
                CreateBy = "System",
                DbStatus="未调拨",
                Status=1
            };

            //    var single = base.GetSingle(it => it.Erpid == entity.Erpid);

 StandardInterface/MES.Service/service/SRM/MesDeliveryNoteManager.cs

@@ -79,6 +79,7 @@
        mesDeliveryNote.Remark = delivery.Remark;
        mesDeliveryNote.Site = delivery.FReceiveOrgId;
        mesDeliveryNote.Issrm=delivery.Is_SRM;
        mesDeliveryNote.CreateBy=delivery.Is_SRM;
        if (single != null)
        {
            mesDeliveryNote.Status = single.Status;

 StandardInterface/MESApplication/appsettings.json

@@ -10,6 +10,6 @@
  "AppSettings": {
    "TestErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfo",
    "ProductionErpUrl": "http://192.168.11.120:8098/WebService1.asmx/mesToErpinfoFormal",
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = hm_prd; Password=hmprd"
    "DataBaseConn": "Data Source = (DESCRIPTION = (ADDRESS = (PROTOCOL = TCP)(HOST = 192.168.1.22)(PORT = 1521))(CONNECT_DATA = (SERVICE_NAME = ORCL))); Persist Security Info=True;User ID = test_dev; Password=hmprd"
  }
}