From a3eaebdf653a36dfeecfe4d286c524b9fce379d2 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Mon, 4 Aug 2025 11:05:21 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E6=88=90=E5=90=8C=E6=AD=A5=E6=B2=B9?= =?UTF-8?q?=E6=BC=86BOM?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MmGeneratePaintBOMController.cs | 40 +++++++++++++++++++ DOAN.Model/MES/ERP/CustDevMesInventory.cs | 7 ++++ DOAN.Model/MES/base/BaseMaterialList.cs | 10 +++++ DOAN.Service/MES/ERP/InteractERPService.cs | 9 +---- .../IService/IMmGeneratePaintBOMService.cs | 15 +++++++ .../MmGeneratePaintBOMService.cs | 27 +++++++++++++ 6 files changed, 101 insertions(+), 7 deletions(-) create mode 100644 DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmGeneratePaintBOMController.cs create mode 100644 DOAN.Service/MES/mm/paintedparts_call/IService/IMmGeneratePaintBOMService.cs create mode 100644 DOAN.Service/MES/mm/paintedparts_call/MmGeneratePaintBOMService.cs diff --git a/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmGeneratePaintBOMController.cs b/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmGeneratePaintBOMController.cs new file mode 100644 index 0000000..56fcce3 --- /dev/null +++ b/DOAN.Admin.WebApi/Controllers/MES/mm/paintedparts_call/MmGeneratePaintBOMController.cs @@ -0,0 +1,40 @@ +using Microsoft.AspNetCore.Mvc; +using DOAN.Model.Dto; + +using DOAN.Admin.WebApi.Filters; +using DOAN.Service.MES.mm.paintedparts_call.IService; +using DOAN.Model.MES.mm.paintedparts_call; +using DOAN.Model.MES.mm.paintedparts_call.Dto; + +//创建时间：2025-07-21 +namespace DOAN.Admin.WebApi.Controllers +{ + /// + /// 叫料需求表 + /// + [Verify] + [Route("mes/materialManagement/paintedparts_call/generatePaintBOM")] + public class MmGeneratePaintBOMController : BaseController + { + /// + /// 叫料需求表接口 + /// + private readonly IMmGeneratePaintBOMService _MmGeneratePaintBOMService; + + public MmGeneratePaintBOMController(IMmGeneratePaintBOMService mmGeneratePaintBOMService) + { + _MmGeneratePaintBOMService = mmGeneratePaintBOMService; + } + + [HttpGet("generateBOM")] + public IActionResult GenerateMaterialBOM() + { + var response = _MmGeneratePaintBOMService.GenerateMaterialBOM(); + return SUCCESS(response); + } + + + + + } +} \ No newline at end of file diff --git a/DOAN.Model/MES/ERP/CustDevMesInventory.cs b/DOAN.Model/MES/ERP/CustDevMesInventory.cs index 5f50810..5f1cfe3 100644 --- a/DOAN.Model/MES/ERP/CustDevMesInventory.cs +++ b/DOAN.Model/MES/ERP/CustDevMesInventory.cs @@ -48,5 +48,12 @@ namespace DOAN.Model.MES.ERP /// [SugarColumn(ColumnName = "cInvCCode")] public string InvCCode { get; set; } + + /// + /// 存货代管商 + /// + [SugarColumn(ColumnName = "clnvDefine8")] + public string ClnvDefine8 { get; set; } + } } diff --git a/DOAN.Model/MES/base/BaseMaterialList.cs b/DOAN.Model/MES/base/BaseMaterialList.cs index 42304f2..e64c505 100644 --- a/DOAN.Model/MES/base/BaseMaterialList.cs +++ b/DOAN.Model/MES/base/BaseMaterialList.cs @@ -69,12 +69,22 @@ namespace DOAN.Model.MES.base_ /// public string Description { get; set; } + + + /// /// 供应商外键id /// [SugarColumn(ColumnName = "fk_supplier_id")] public int? FkSupplierId { get; set; } + + /// + /// 供应商代码 + /// + [SugarColumn(ColumnName = "supplier_code")] + public string SupplierCode { get; set; } + /// /// 保质期单位 /// diff --git a/DOAN.Service/MES/ERP/InteractERPService.cs b/DOAN.Service/MES/ERP/InteractERPService.cs index 25dc5e1..6d6c76b 100644 --- a/DOAN.Service/MES/ERP/InteractERPService.cs +++ b/DOAN.Service/MES/ERP/InteractERPService.cs @@ -237,13 +237,7 @@ namespace DOAN.Service.MES.ERP { // ERP中的物料清单 List ERPInventories = Context.AsTenant() - .QueryableWithAttr().ToList(); - - - - - - + .QueryableWithAttr().ToList(); var childDb = Context.AsTenant().GetConnectionWithAttr();//线程安全用GetConnectionWithAttrScope //清空表 childDb.DbMaintenance.TruncateTable(); @@ -257,6 +251,7 @@ namespace DOAN.Service.MES.ERP .Map(dest => dest.ADDCode, src => src.InvAddCode) .Map(dest => dest.Unit, src => src.ComUnitName) .Map(dest => dest.FkMaterialTypeCode, src => src.InvCCode) + .Map(dest => dest.SupplierCode, src => src.ClnvDefine8) ; List materialLists = ERPInventories.Adapt>(); diff --git a/DOAN.Service/MES/mm/paintedparts_call/IService/IMmGeneratePaintBOMService.cs b/DOAN.Service/MES/mm/paintedparts_call/IService/IMmGeneratePaintBOMService.cs new file mode 100644 index 0000000..2307bf2 --- /dev/null +++ b/DOAN.Service/MES/mm/paintedparts_call/IService/IMmGeneratePaintBOMService.cs @@ -0,0 +1,15 @@ +using DOAN.Model.MES.mm.paintedparts_call; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.mm.paintedparts_call.IService +{ + public interface IMmGeneratePaintBOMService : IBaseService + { + int GenerateMaterialBOM(); + + } +} diff --git a/DOAN.Service/MES/mm/paintedparts_call/MmGeneratePaintBOMService.cs b/DOAN.Service/MES/mm/paintedparts_call/MmGeneratePaintBOMService.cs new file mode 100644 index 0000000..3ab4db6 --- /dev/null +++ b/DOAN.Service/MES/mm/paintedparts_call/MmGeneratePaintBOMService.cs @@ -0,0 +1,27 @@ +using DOAN.Model.MES.mm.paintedparts_call; +using DOAN.Service.MES.mm.paintedparts_call.IService; +using Infrastructure.Attribute; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace DOAN.Service.MES.mm.paintedparts_call +{ + + [AppService(ServiceType = typeof(IMmGeneratePaintBOMService), ServiceLifetime = LifeTime.Transient)] + public class MmGeneratePaintBOMService : BaseService, IMmGeneratePaintBOMService + { + /// + /// 生成同步油漆BOM + /// + /// + public int GenerateMaterialBOM() + { + + + return 0; + } + } +}