From 5d44809e865a4b550560ab5ce824d4b1dc8952e7 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 28 Aug 2024 15:40:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E6=A1=A3=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Controllers/MES/base/BaseInteractERP.cs | 38 +++++++++++++++++++ .../appsettings.Development.json | 4 +- DOAN.Model/MES/ERP/CustDevMesCustomer.cs | 37 ++++++++++++++++++ .../MES/base/IService/IInteractERPService.cs | 14 +++++++ DOAN.Service/MES/base/InteractERPService.cs | 34 +++++++++++++++++ 5 files changed, 125 insertions(+), 2 deletions(-) create mode 100644 DOAN.Admin.WebApi/Controllers/MES/base/BaseInteractERP.cs create mode 100644 DOAN.Model/MES/ERP/CustDevMesCustomer.cs create mode 100644 DOAN.Service/MES/base/IService/IInteractERPService.cs create mode 100644 DOAN.Service/MES/base/InteractERPService.cs diff --git a/DOAN.Admin.WebApi/Controllers/MES/base/BaseInteractERP.cs b/DOAN.Admin.WebApi/Controllers/MES/base/BaseInteractERP.cs new file mode 100644 index 0000000..a351c19 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/base/BaseInteractERP.cs @@ -0,0 +1,38 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.Dto; +using DOAN.Model.MES.base_.Dto; +using DOAN.Model.MES.base_; +using DOAN.Service.MES.base_.IService; +using DOAN.Admin.WebApi.Filters; + +namespace DOAN.Admin.WebApi.Controllers +{ + + /// + ///对接ERP + /// + [Verify] + [Route("mes/baseInteractERP")] + public class BaseInteractERPController : BaseController + { + private readonly IInteractERPService interactERPService; + public BaseInteractERPController(IInteractERPService interactERPService) + { + this.interactERPService = interactERPService; + } + + + //TODO 同步ERP中的客户信息 + [HttpGet("synch_ERP_custom")] + public IActionResult SynhERPCustom() + { + var response= interactERPService.SynhERPCustom(); + + return SUCCESS(response); + + } + + + } + +} diff --git a/DOAN.Admin.WebApi/appsettings.Development.json b/DOAN.Admin.WebApi/appsettings.Development.json index 5e1b142..6713a38 100644 --- a/DOAN.Admin.WebApi/appsettings.Development.json +++ b/DOAN.Admin.WebApi/appsettings.Development.json @@ -18,8 +18,8 @@ { //"Conn": "Data Source=139.224.232.211;User ID=root;Password=doantech123;Initial Catalog=GXAssembly;Port=3308", // "Conn": "Data Source=127.0.0.1;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306", - "Conn": "Data Source=192.168.0.58;User ID=root;Password=123456;Initial Catalog=GXAssembly;Port=3306", - "DbType": 0, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 + "Conn": "Data Source=192.168.20.202;User ID=u8-mes;Password=0.1230.123;Initial Catalog=UFDATA_230_2024", + "DbType": 1, //数据库类型 MySql = 0, SqlServer = 1, Oracle = 3,PgSql = 4 "ConfigId": "1", //多租户唯一标识 "IsAutoCloseConnection": true } diff --git a/DOAN.Model/MES/ERP/CustDevMesCustomer.cs b/DOAN.Model/MES/ERP/CustDevMesCustomer.cs new file mode 100644 index 0000000..4e13f6a --- /dev/null +++ b/DOAN.Model/MES/ERP/CustDevMesCustomer.cs @@ -0,0 +1,37 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Model.MES.ERP +{ + /// + /// 客户档案 + /// + [SugarTable("custDev_mes_Customer")] + public class CustDevMesCustomer + { + + /// + /// 客户编码 + /// + [SugarColumn(ColumnName = "cCusCode")] + public string CusCode { get; set; } + + + + /// + /// 客户名称 + /// + [SugarColumn(ColumnName = "cCusName")] + public string CusName { get; set; } + + /// + /// 客户简称 + /// + [SugarColumn(ColumnName = "cCusAbbName")] + public string CusAbbName { get; set; } + + } +} diff --git a/DOAN.Service/MES/base/IService/IInteractERPService.cs b/DOAN.Service/MES/base/IService/IInteractERPService.cs new file mode 100644 index 0000000..1958526 --- /dev/null +++ b/DOAN.Service/MES/base/IService/IInteractERPService.cs @@ -0,0 +1,14 @@ +using System; +using DOAN.Model; +using DOAN.Model.MES.base_.Dto; +using DOAN.Model.MES.base_; +using System.Collections.Generic; + +namespace DOAN.Service.MES.base_.IService +{ + public interface IInteractERPService + { + + int SynhERPCustom(); + } +} diff --git a/DOAN.Service/MES/base/InteractERPService.cs b/DOAN.Service/MES/base/InteractERPService.cs new file mode 100644 index 0000000..5c116e3 --- /dev/null +++ b/DOAN.Service/MES/base/InteractERPService.cs @@ -0,0 +1,34 @@ +using System; +using SqlSugar; +using Infrastructure.Attribute; +using Infrastructure.Extensions; +using DOAN.Model; +using DOAN.Model.MES.base_.Dto; +using DOAN.Model.MES.base_; +using DOAN.Repository; +using DOAN.Service.MES.base_.IService; +using System.Linq; +using Mapster; + +namespace DOAN.Service.MES.base_ +{ + /// + /// 工位Service业务层处理 + /// + [AppService(ServiceType = typeof(IBaseWorkStationService), ServiceLifetime = LifeTime.Transient)] + public class InteractERPService : BaseService, IInteractERPService + { + + /// + /// 同步ERP中的客户信息 + /// + /// + public int SynhERPCustom() + { + + + } + + + } +}