Merge branch 'master' into Liudl

bklLiudl

昨天 d3e81088f1afdc01b14af6bdac533116ab0cdb60

 Wms/WMS.IBLL/ISysServer/IMaterialsServer.cs

@@ -2,6 +2,7 @@
using System.Collections.Generic;
using System.Text;
using System.Threading.Tasks;
using Model.InterFaceModel;
using Model.ModelDto.SysDto;
using WMS.Entity.SysEntity;

@@ -123,5 +124,16 @@
        Task<int> EditERP(ERPTestDto erpdto);

        #endregion

        #region sap

        /// <summary>
        /// SAP新增物料主数据数据
        /// </summary>
        /// <param name="model">erp实体</param>
        /// <returns></returns>
        /// <exception cref="Exception">捕获异常</exception>
        Task<string> AddSkuSap(SendSkuInfoVm model);
        #endregion
    }
}