Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

油漆

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

247
server/ZR.Admin.WebApi/Controllers/mes/mm/MaterialInputController.cs Normal file
View File

@@ -0,0 +1,247 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Extensions;
using ZR.Model;
using ZR.Model.MES.mm;
using ZR.Model.MES.mm.Dto;
using ZR.Service.mes.mm;
using ZR.Service.mes.mm.IService;
namespace ZR.Admin.WebApi.Controllers.mes.mm
{
/// <summary>
/// 生产投料
/// </summary>
[Route("mes/mm/materialinput")]
public class MaterialInputController : BaseController
{
IMaterialInputService materialInputService;
public MaterialInputController(IMaterialInputService materialInputService)
{
this.materialInputService = materialInputService;
}
/// <summary>
/// 获取AGV 上料 开始起点
/// </summary>
/// <returns></returns>
[HttpGet("getstartpoints")]
public IActionResult Getstart_AGV_points()
{
var response = materialInputService.Getstart_AGV_points();
return SUCCESS(response);
}
/// <summary>
/// 获取AGV 上料 终点
/// </summary>
/// <returns></returns>
[HttpGet("getendpoints")]
public IActionResult Getend_AGV_points()
{
var response = materialInputService.Getend_AGV_points();
return SUCCESS(response);
}
/// <summary>
/// 获取工单list
/// </summary>
/// <returns></returns>
[HttpPost("getworkorderlist")]
public IActionResult Getworkorderlist([FromBody] WorkorderqueryDto query)
{
if (query == null || query.datetimespan == null)
{
SUCCESS(null);
}
var response = materialInputService.Getworkorderlist(query);
return SUCCESS(response);
}
/// <summary>
/// 生成配料任务
/// </summary>
/// <returns></returns>
[HttpPost("generatetask")]
public IActionResult Generatetask([FromBody] IngredientTaskDto task)
{
if (task == null || task.workorders == null || task.workorders.Count == 0)
{
return SUCCESS(null);
}
int res = materialInputService.Generatetask(task, HttpContext.GetName());
return SUCCESS(res);
}
/// <summary>
/// 分页查询 配料任务
/// </summary>
/// <param name="queryParams"></param>
/// <returns></returns>
[HttpPost("getIngredientTask")]
public IActionResult GetIngredientTask([FromBody] IngredientTaskQueryDto queryTask)
{
if (queryTask == null)
{
return SUCCESS(null);
}
List<MmIngredientTask> response = materialInputService.GetIngredientTask(queryTask);
return SUCCESS(response);
}
/// <summary>
/// 获取配料任务详情
/// </summary>
/// <param name="taskId"></param>
/// <returns></returns>
[HttpGet("getIngredientTask_son")]
public IActionResult GetIngredientTaskSon(string taskId)
{
if (string.IsNullOrEmpty(taskId))
{
return SUCCESS(null);
}
List<MmIngredientTask> response = materialInputService.GetIngredientTaskSon(taskId);
return SUCCESS(response);
}
/// <summary>
/// 获取车间上料终点
/// </summary>
/// <returns></returns>
[HttpGet("getfabgopoints")]
public IActionResult Getfabgopoints()
{
string[] response = materialInputService.Getfabgopoints();
return SUCCESS(response);
}
/// <summary>
/// agv从仓库到车间 进料
/// </summary>
/// <param name="start_point"></param>
/// <param name="end_point"></param>
/// <returns></returns>
[HttpGet("go_workshop")]
public IActionResult GoWorkshop(string start_point, string end_point, string agvCode )
{
if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point)||string.IsNullOrEmpty(agvCode))
{
SUCCESS(null);
}
var response = materialInputService.AGV_schedule(start_point, end_point, agvCode);
return SUCCESS(response);
}
/// <summary>
/// 紧急停止agv
/// </summary>
/// <param name="reqCode"></param>
/// <returns></returns>
[HttpGet("emergency_stop_agv")]
public IActionResult EmergencyStopAgv(string reqCode)
{
if (string.IsNullOrEmpty(reqCode))
{
return SUCCESS(null);
}
var response = materialInputService.EmergencyStopAgv(reqCode);
return SUCCESS(response);
}
/// <summary>
/// agv完成任务
/// </summary>
/// <returns></returns>
[HttpPost("agv_final_task")]
public IActionResult AgvFinalTask()
{
return null;
}
/// <summary>
/// 完成配料任务
/// 1.更改站点托盘 ？？
/// 2.完成的配料任务不可见
/// 3.生产上线
/// 4.扣除毛坯库
/// </summary>
/// <returns></returns>
[HttpGet("finishBatchingTask")]
public IActionResult FinishBatchingTask(string start_point, string end_point, string taskId)
{
if (string.IsNullOrEmpty(start_point))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(end_point))
{
return SUCCESS(null);
}
if (string.IsNullOrEmpty(taskId))
{
return SUCCESS(null);
}
var response = materialInputService.FinishBatchingTask(start_point, end_point, taskId);
return SUCCESS(response);
}
/// <summary>
/// 空车返程
/// </summary>
/// <param name="start_point"></param>
/// <param name="end_point"></param>
/// <returns></returns>
[HttpGet("emptycarreturn")]
public IActionResult Emptycarreturn(string start_point, string end_point, string agvCode = "1743 ")
{
if (string.IsNullOrEmpty(start_point) || string.IsNullOrEmpty(end_point))
{
SUCCESS(null);
}
var response = materialInputService.AGV_schedule(start_point, end_point,agvCode);
return SUCCESS(response);
}
/// <summary>
/// 车间返程起点
/// </summary>
/// <returns></returns>
[HttpGet("emptycarreturn_start")]
public IActionResult Emptycarreturn_start()
{
string[] response = materialInputService.Emptycarreturn_start();
return SUCCESS(response);
}
/// <summary>
/// 车间返程终点
/// </summary>
/// <returns></returns>
[HttpGet("emptycarreturn_end")]
public IActionResult Emptycarreturn_end()
{
string[] response = materialInputService.Emptycarreturn_end();
return SUCCESS(response);
}
}
}

152
server/ZR.Admin.WebApi/Controllers/mes/mm/MmAgvLocationController.cs Normal file
View File

@@ -0,0 +1,152 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Model.Dto;
using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Service.mes.mm.IService;
using ZR.Model.MES.mm;
//创建时间：2024-04-26
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// agv位置表
/// </summary>
[Verify]
[Route("mes/mm/MmAgvLocation")]
public class MmAgvLocationController : BaseController
{
/// <summary>
/// agv位置表接口
/// </summary>
private readonly IMmAgvLocationService _MmAgvLocationService;
public MmAgvLocationController(IMmAgvLocationService MmAgvLocationService)
{
_MmAgvLocationService = MmAgvLocationService;
}
/// <summary>
/// 查询agv位置表列表
/// </summary>
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "materialManagement:mmagvlocation:list")]
public IActionResult QueryMmAgvLocation([FromQuery] MmAgvLocationQueryDto parm)
{
var response = _MmAgvLocationService.GetList(parm);
return SUCCESS(response);
}
/// <summary>
/// 查询agv位置表详情
/// </summary>
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "materialManagement:mmagvlocation:query")]
public IActionResult GetMmAgvLocation(int Id)
{
var response = _MmAgvLocationService.GetInfo(Id);
var info = response.Adapt<MmAgvLocation>();
return SUCCESS(info);
}
/// <summary>
/// 添加agv位置表
/// </summary>
/// <returns></returns>
[HttpPost]
[ActionPermissionFilter(Permission = "materialManagement:mmagvlocation:add")]
[Log(Title = "agv位置表", BusinessType = BusinessType.INSERT)]
public IActionResult AddMmAgvLocation([FromBody] MmAgvLocationDto parm)
{
var modal = parm.Adapt<MmAgvLocation>().ToCreate(HttpContext);
var response = _MmAgvLocationService.AddMmAgvLocation(modal);
return SUCCESS(response);
}
/// <summary>
/// 更新agv位置表
/// </summary>
/// <returns></returns>
[HttpPut]
[ActionPermissionFilter(Permission = "materialManagement:mmagvlocation:edit")]
[Log(Title = "agv位置表", BusinessType = BusinessType.UPDATE)]
public IActionResult UpdateMmAgvLocation([FromBody] MmAgvLocationDto parm)
{
var modal = parm.Adapt<MmAgvLocation>().ToUpdate(HttpContext);
var response = _MmAgvLocationService.UpdateMmAgvLocation(modal);
return ToResponse(response);
}
/// <summary>
/// 删除agv位置表
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[ActionPermissionFilter(Permission = "materialManagement:mmagvlocation:delete")]
[Log(Title = "agv位置表", BusinessType = BusinessType.DELETE)]
public IActionResult DeleteMmAgvLocation(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);
if (idsArr.Length <= 0) { return ToResponse(ApiResult.Error($"删除失败Id 不能为空")); }
var response = _MmAgvLocationService.Delete(idsArr);
return ToResponse(response);
}
/// <summary>
/// 区域信息
/// </summary>
/// <returns></returns>
[HttpGet("listAreaOptions")]
public IActionResult ListAreaOptions()
{
var response = _MmAgvLocationService.ListAreaOptions();
return SUCCESS(response);
}
[HttpGet("update_status")]
public IActionResult Updatestatus(int index, int status)
{
if (status == 0)
{
status = 1;
}else if (status == 1)
{
status = 0;
}
var response = _MmAgvLocationService.Updatestatus(index, status);
return SUCCESS(response);
}
/// <summary>
/// 查询agv状态
/// </summary>
/// <param name="agvCode"></param>
/// <returns></returns>
[HttpGet("call_agv_status")]
public IActionResult CallagvStatus(int agvCode)
{
if (agvCode == 0)
{
return SUCCESS(null);
}
var response= _MmAgvLocationService.CallagvStatus(agvCode);
return SUCCESS(response);
}
}
}

52
server/ZR.Admin.WebApi/Controllers/mes/mm/MmFinishedwarehouseController.cs Normal file
View File

@@ -0,0 +1,52 @@
using ZR.Admin.WebApi.Filters;
using Microsoft.AspNetCore.Mvc;
using ZR.Service.mes.mm;
using ZR.Service.mes.mm.IService;
namespace ZR.Admin.WebApi.Controllers.mes.mm
{
/// <summary>
/// 成品入库
/// </summary>
[Verify]
[Route("mes/mm/MmFinishedwarehouse")]
public class MmFinishedwarehouseController : BaseController
{
IMmFinishedwarehouseService finishedwarehouseService;
public MmFinishedwarehouseController(IMmFinishedwarehouseService finishedwarehouseService)
{
this. finishedwarehouseService=finishedwarehouseService;
}
/// <summary>
/// 成品入库位置
/// </summary>
/// <returns></returns>
[HttpGet("finish_point")]
public IActionResult Finish_point()
{
string[] response = finishedwarehouseService.Finish_point();
return SUCCESS(response);
}
/// <summary>
/// 包装箱字位置
/// </summary>
/// <returns></returns>
[HttpGet("finish_point_pack")]
public IActionResult Finish_point_pack()
{
string[] response = finishedwarehouseService.Finish_point_pack();
return SUCCESS(response);
}
}
}