This commit is contained in:
xiaowei.song
2024-06-06 13:19:24 +08:00
parent c93711290e
commit 127c428a9e
919 changed files with 93 additions and 86 deletions

View File

@@ -0,0 +1,114 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.MES.md;
using ZR.Service.MES.md.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.MES.md
{
[Route("mes/md/BOM")]
public class MdBOMController :BaseController
{
IMdBOMService mdBOMService;
public MdBOMController(IMdBOMService mdBOMService)
{
this.mdBOMService = mdBOMService;
}
/// <summary>
/// 获取bom信息
/// </summary>
/// <param name="pageNum">页数</param>
/// <param name="pageSize">页尺</param>
/// <param name="productCode">产品code</param>
/// <param name="productName">产品名称</param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string productCode = "", string productName = "")
{
(int, List<MdBom>) data = mdBOMService.GetAll(productCode, productName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 查询父产品
/// </summary>
/// <param name="queryString">productCode码</param>
/// <returns></returns>
[HttpGet("queryBOM")]
public IActionResult List(string queryString="")
{
List<MdBom> data = mdBOMService.QueryBOM(queryString);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 获取全部单位
/// </summary>
/// <returns></returns>
[HttpGet("getunitList")]
public IActionResult GetAllunitList()
{
List<MdUnit> data = mdBOMService.GetAllunitList();
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 新增BOM数据
/// </summary>
/// <param name="bom"></param>
/// <returns></returns>
[HttpPost("addBom")]
public IActionResult AddBOM([FromBody] MdBom bomItem)
{
if(bomItem!=null&&bomItem.Id!=null)
bomItem.ToCreate(HttpContext);
if (bomItem.ParentProductId == 0)
bomItem.ParentProductId = null;
int result=mdBOMService.AddBom(bomItem);
return ToResponse(new ApiResult(200, "success", result));
}
/// <summary>
/// 修改bom数据
/// </summary>
/// <param name="bomItem"></param>
/// <returns></returns>
[HttpPost("updateBom")]
public IActionResult UpdateBOM([FromBody] MdBom bomItem)
{
if (bomItem != null && bomItem.Id != null)
bomItem.ToUpdate(HttpContext);
if (bomItem.ParentProductId == 0)
bomItem.ParentProductId = null;
int result = mdBOMService.UpdateBOM(bomItem);
return ToResponse(new ApiResult(200, "success", result));
}
[HttpPost("delBom")]
public IActionResult deleteBOM([FromBody] List<int> ids)
{
if (ids != null)
{
int result = mdBOMService.deleteBOM(ids.ToArray());
return ToResponse(result);
}
return null;
}
}
}

View File

@@ -0,0 +1,88 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/device")]
public class MdDeviceController : BaseController
{
IMdDeviceService deviceService;
public MdDeviceController(IMdDeviceService deviceService)
{
this.deviceService = deviceService;
}
/// <summary>
///
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="deviceCode"></param>
/// <param name="deviceName"></param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string deviceCode = "", string deviceName = "")
{
(int, List<MdDevice>) data = deviceService.GetAll(deviceCode, deviceName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
[HttpPost("addDevice")]
public IActionResult AddDevice([FromBody]MdDevice device)
{
if (device != null)
device.ToCreate(HttpContext);
int result = deviceService.AddDevice(device);
return SUCCESS(result);
}
[HttpPost("updateDevice")]
public IActionResult UpdateDevice([FromBody]MdDevice device)
{
if (device != null)
{
device.ToUpdate(HttpContext);
}
int result = deviceService.UpdateDevice(device);
return SUCCESS(result);
}
[HttpPost("delDevice")]
public IActionResult deleteWorkshop([FromBody] List<int> ids)
{
if (ids != null)
{
int result = deviceService.deleteDevice(ids.ToArray());
return ToResponse(result);
}
return null;
}
[HttpGet("getworkstationList")]
public IActionResult GetworkstationList()
{
List<MdWorkstation> workstations= deviceService.getworkstationList();
return SUCCESS(workstations);
}
}
}

View File

@@ -0,0 +1,196 @@
using CSRedis;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Model.mes.md.DTO;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
using static System.Runtime.InteropServices.JavaScript.JSType;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/product")]
public class MdProductDefineController : BaseController
{
private readonly IMdProductDefineService mdProduct;
public MdProductDefineController(IMdProductDefineService mdProduct)
{
this.mdProduct = mdProduct;
}
/// <summary>
/// 分页查寻 unti
/// </summary>
/// <param name="pageNum">页码</param>
/// <param name="pagesize">页尺</param>
/// <param name="name">单位名称</param>
/// <param name="code">单位代码</param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult Getlist(int pageNum, int pagesize, string name = "", string code = "")
{
var unitPageDto = mdProduct.GetList(name, code, pageNum, pagesize);
return SUCCESS(unitPageDto);
}
/// <summary>
/// 根据单位名称查询单位
/// </summary>
/// <param name="name"></param>
/// <returns></returns>
[HttpGet("getUnit/{name}")]
public IActionResult GetUnitlist(string name)
{
List<MdUnit> units = mdProduct.GetProductDefineList(name);
return SUCCESS(units);
}
/// <summary>
/// 获取全部单位
/// </summary>
/// <returns></returns>
[HttpGet("getUnit")]
public IActionResult GetUnitlist()
{
List<MdUnit> units = mdProduct.GetProductDefineList();
return SUCCESS(units);
}
/// <summary>
/// 获取全部 产线
/// </summary>
/// <returns></returns>
[HttpGet("getProcessroute")]
public IActionResult GetProcessroutelist()
{
List<MdWorkline> worklines = mdProduct.GetWorklineList();
return SUCCESS(worklines);
}
/// <summary>
/// add 产品
/// </summary>
/// <param name="products"></param>
/// <returns></returns>
[HttpPost("addProductDefine")]
public IActionResult addProductDefine([FromBody] MdProductDefine products)
{
if (products == null)
{
return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
}
if (products != null)
{
products.ToCreate(HttpContext);
}
int result = mdProduct.InsertProductDefine(products);
return SUCCESS(result);
}
/// <summary>
/// 根据主键查询product
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpGet("getProductBypk/{id}")]
public IActionResult GetProductBypk(int id)
{
MdProductDefine mdProductDefine = mdProduct.GetProductDefinebyPK(id);
return SUCCESS(mdProductDefine);
}
/// <summary>
/// 修改产品
/// </summary>
/// <param name="products"></param>
/// <returns></returns>
[HttpPost("updateProductDefine")]
public IActionResult UpdateProductDefine([FromBody] MdProductDefine products)
{
if (products != null)
products.ToUpdate(HttpContext);
int result = mdProduct.UpdateProductDefine(products);
return SUCCESS(result);
}
/// <summary>
/// 删除产品
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("delproduct/{id}")]
public IActionResult DelUnit(string id)
{
int[] ids = Tools.SpitIntArrary(id);
int result = mdProduct.deleteProductDefine(ids);
return ToResponse(result);
}
/// <summary>
/// 导出产品excel
/// </summary>
/// <param name="starttime"></param>
/// <param name="endtime"></param>
/// <param name="productCode"></param>
/// <param name="productName"></param>
/// <returns></returns>
[HttpGet("exportProduct")]
public IActionResult ExportProduct(DateTime starttime, DateTime endtime, string productCode = "", string productName = "")
{
List<MdProductDefine> units = null;
units = mdProduct.GetList(starttime, endtime, productCode, productName);
var result = ExportExcelMini(units, "pruduct", "产品列表");
return ExportExcel(result.Item2, result.Item1);
}
/// <summary>
///
/// </summary>
/// <param name="updateSupport">0只新增 1新增且更新</param>
/// <returns></returns>
[HttpPost("importExcel")]
public IActionResult ImportExcel()
{
IFormFileCollection files = Request.Form.Files;
foreach (IFormFile file in files)
{
string directory = Path.Combine(App.WebHostEnvironment.ContentRootPath, "Images");
string fileExtension = Path.GetExtension(file.FileName);
string fileName = Guid.NewGuid().ToString() + fileExtension;
string filePath = Path.Combine(directory, fileName);// 生成文件路径
if (!Directory.Exists(directory))
{
Directory.CreateDirectory(directory);
}
// 写入文件
using (var stream = new FileStream(filePath, FileMode.Create))
{
file.CopyTo(stream);
stream.Flush();
}
}
return null;
}
}
}

View File

@@ -0,0 +1,74 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/workproroute")]
public class MdTechnologicalProrouteController : BaseController
{
IMdTechnologicalProrouteService workproroute;
public MdTechnologicalProrouteController(IMdTechnologicalProrouteService workproroute)
{
this.workproroute = workproroute;
}
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string ProrouteCode="", string ProrouteName="")
{
(int, List<MdTechnologicalProroute>) data = workproroute.GetAll(ProrouteCode, ProrouteName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 插入车间
/// </summary>
/// <param name="workshop"></param>
/// <returns></returns>
[HttpPost("addProcess")]
public IActionResult AddWorkshop([FromBody] MdTechnologicalProroute workshop)
{
if (workshop != null)
workshop.ToCreate(HttpContext);
int result = workproroute.AddWorkProroute(workshop);
return SUCCESS(result);
}
[HttpPost("updateProcess")]
public IActionResult UpdateWorkshop([FromBody] MdTechnologicalProroute workshop)
{
if (workshop != null)
workshop.ToUpdate(HttpContext);
int result = workproroute.UpdateWorkProroute(workshop);
return SUCCESS(result);
}
[HttpPost("delProcess")]
public IActionResult deleteWorkshop([FromBody] List<int> ids)
{
if (ids != null)
{
int result = workproroute.deleteWorksProroute(ids.ToArray());
return ToResponse(result);
}
return null;
}
}
}

View File

@@ -0,0 +1,125 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Hosting;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System.Collections.Generic;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Model.mes.md.DTO;
using ZR.Service.mes.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/unit")]
public class MdUnitController : BaseController
{
private readonly IMdUnitService unitService;
public MdUnitController(IMdUnitService unitService)
{
this.unitService = unitService;
}
/// <summary>
/// 分页查寻 unti
/// </summary>
/// <param name="pageNum">页码</param>
/// <param name="pagesize">页尺</param>
/// <param name="name">单位名称</param>
/// <param name="code">单位代码</param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult Getlist(int pageNum, int pagesize, string name = "", string code = "")
{
var unitPageDto = unitService.GetList(name, code, pageNum, pagesize);
return SUCCESS(unitPageDto);
}
/// <summary>
/// by pk 寻求unit
/// </summary>
/// <param name="measure_id"></param>
/// <returns></returns>
[HttpGet("getUnit/{measure_id}")]
public IActionResult GetUnit(int measure_id)
{
var unit = unitService.GetUnitbyPK(measure_id);
return SUCCESS(unit);
}
/// <summary>
/// 添加Unit
/// </summary>
/// <param name="paramss"></param>
/// <returns></returns>
[HttpPost("addUnit")]
public IActionResult AddUnitmeasure([FromBody] MdUnit paramss)
{
if(paramss == null) {
return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
}
paramss.ToCreate(HttpContext);
int result = unitService.InsertUnit(paramss);
return SUCCESS(result);
}
/// <summary>
/// 更新单位unit
/// </summary>
/// <param name="paramss"></param>
/// <returns></returns>
[HttpPost("updateUnit")]
public IActionResult UpdateUnit([FromBody] MdUnit paramss)
{
if (paramss != null)
{
paramss.ToUpdate(HttpContext);
int result = unitService.Updateunit(paramss);
return SUCCESS(result);
}
else
{
return ToResponse(ApiResult.Error(110, "请求参数为空"));
}
}
/// <summary>
/// 根据主键删除名称
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
[HttpDelete("delUnit/{id}")]
public IActionResult DelUnit(string id)
{
int[] ids = Tools.SpitIntArrary(id);
int result = unitService.deleteunit(ids);
return ToResponse(result);
}
/// <summary>
/// 导出Unit excel
/// </summary>
/// <param name="searchOption"></param>
/// <returns></returns>
[HttpGet("exportUnit")]
public IActionResult exportUnit([FromQuery] SearchOptionDTO searchOption)
{
List<MdUnit> units = null;
if (searchOption != null)
{
units = unitService.GetList(searchOption);
}
var result = ExportExcelMini(units, "unit", "单位列表");
return ExportExcel(result.Item2, result.Item1);
}
}
}

View File

@@ -0,0 +1,85 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
using ZR.Service.MES.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/workline")]
public class MdWorklineController : BaseController
{
IMdWorklineService worklineService;
public MdWorklineController(IMdWorklineService worklineService)
{
this.worklineService = worklineService;
}
/// <summary>
/// 获取数据
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="deviceCode"></param>
/// <param name="deviceName"></param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string lineCode = "", string lineName = "")
{
(int, List<MdWorkline>) data = worklineService.GetAll(lineCode, lineName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
[HttpPost("addWorkline")]
public IActionResult AddWorkline([FromBody] MdWorkline workline)
{
if (workline != null)
workline.ToCreate(HttpContext);
int result = worklineService.AddWorkline(workline);
return SUCCESS(result);
}
[HttpPost("updateWorkline")]
public IActionResult UpdateWorkline([FromBody] MdWorkline workline)
{
if (workline != null)
{
workline.ToUpdate(HttpContext);
}
int result = worklineService.UpdateWorkline(workline);
return SUCCESS(result);
}
[HttpPost("delWorkline")]
public IActionResult DelWorkline([FromBody] List<int> ids)
{
if (ids != null)
{
int result = worklineService.deleteWorkline(ids.ToArray());
return ToResponse(result);
}
return null;
}
[HttpGet("getWorkshopList")]
public IActionResult GetWorkshopList(int worklineId=0)
{
List<MdWorkshop> MdWorkshopList= worklineService.GetMdWorkshops(worklineId);
return SUCCESS(MdWorkshopList);
}
}
}

View File

@@ -0,0 +1,83 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Model.System.Dto;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/workshop")]
public class MdWorkshopController : BaseController
{
IMdWorkshopService mdWorkshopService;
public MdWorkshopController(IMdWorkshopService mdWorkshopService)
{
this.mdWorkshopService = mdWorkshopService;
}
/// <summary>
/// 获取车间列表信息
/// </summary>
/// <param name="pageNum"></param>
/// <param name="pageSize"></param>
/// <param name="workshopId"></param>
/// <param name="workshopName"></param>
/// <param name="workshopPosition"></param>
/// <returns></returns>
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string workshopId = "", string workshopName = "", string workshopPosition = "")
{
(int, List<MdWorkshop>) data = mdWorkshopService.GetAll(workshopId, workshopName, workshopPosition, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
/// <summary>
/// 插入车间
/// </summary>
/// <param name="workshop"></param>
/// <returns></returns>
[HttpPost("addWorkshop")]
public IActionResult AddWorkshop([FromBody] MdWorkshop workshop)
{
if (workshop == null)
{
return ToResponse(new ApiResult((int)ResultCode.NO_DATA, "null"));
}
if (workshop != null)
workshop.ToCreate(HttpContext);
int result = mdWorkshopService.AddWorkshop(workshop);
return SUCCESS(result);
}
[HttpPost("updateWorkshop")]
public IActionResult UpdateWorkshop([FromBody] MdWorkshop workshop)
{
if(workshop!=null)
workshop.ToUpdate(HttpContext);
int result = mdWorkshopService.UpdateWorkshop(workshop);
return SUCCESS(result);
}
[HttpPost("delWorkshop")]
public IActionResult deleteWorkshop([FromBody] List<int> ids)
{
if (ids != null)
{
int result = mdWorkshopService.deleteWorkshop(ids.ToArray());
return ToResponse(result);
}
return null;
}
}
}

View File

@@ -0,0 +1,74 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Diagnostics.CodeAnalysis;
using ZR.Admin.WebApi.Extensions;
using ZR.Model.mes.md;
using ZR.Service.mes.md;
using ZR.Service.mes.md.IService;
using ZR.Service.MES.md;
namespace ZR.Admin.WebApi.Controllers.mes.md
{
[Route("mes/md/workstation")]
public class MdWorkstationController : BaseController
{
IMdWorkstationService workstationService;
public MdWorkstationController(IMdWorkstationService workstationService)
{
this.workstationService = workstationService;
}
[HttpGet("list")]
public IActionResult List(int pageNum, int pageSize, string StationCode = "", string StationName = "")
{
(int, List<MdWorkstation>) data = workstationService.GetAll(StationCode, StationName, pageNum, pageSize);
return ToResponse(new ApiResult(200, "success", data));
}
[HttpPost("addWorkstation")]
public IActionResult AddWorkstation([FromBody] MdWorkstation workshop)
{
if (workshop != null)
workshop.ToCreate(HttpContext);
int result = workstationService.AddWorkshop(workshop);
return SUCCESS(result);
}
[HttpPost("updateWorkstation")]
public IActionResult UpdateWorkshop([FromBody] MdWorkstation workshop)
{
if (workshop != null)
workshop.ToUpdate(HttpContext);
int result = workstationService.UpdateWorkshop(workshop);
return SUCCESS(result);
}
[HttpPost("delWorkstation")]
public IActionResult DelWorkstation([FromBody] List<int> ids)
{
if (ids != null)
{
int result = workstationService.deleteWorkshop(ids.ToArray());
return ToResponse(result);
}
return null;
}
[HttpGet("getworkLineList")]
public IActionResult GetworkLineList()
{
List<MdWorkline> MdWorkshopList = workstationService.GetworkLineList();
return SUCCESS(MdWorkshopList);
}
}
}