From ef409d6ed01cf7da29f0033f0180b192f18d1e1c Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 30 四月 2026 08:52:46 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/KuKa/BeiJingBeiQiAGV
---
项目代码/WIDESEA_WCSServer/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
index 54c50a4..6805c44 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WIDESEA_WCSServer/WIDESEAWCS_Server/Controllers/PDA/PDAController.cs"
@@ -2,11 +2,14 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseRepository;
using WIDESEAWCS_DTO.Agv;
using WIDESEAWCS_DTO.PDA;
using WIDESEAWCS_IBasicInfoRepository;
+using WIDESEAWCS_IBasicInfoService;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
+using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Repository;
namespace WIDESEAWCS_Server.Controllers.PDA
@@ -19,20 +22,37 @@
private readonly ITaskService _taskService;
private readonly ITaskRepository _taskRepository;
private readonly IRouterRepository _routerRepository;
+ private readonly IDt_MaterialInfoRepository _MaterialInfoRepository;
+ private readonly IDt_ContainerInfoRepository _ContainerInfoRepository;
+ private readonly IUnitOfWorkManage _unitOfWorkManage;
+ private readonly IDt_MaterialInfoService _IDt_MaterialInfoService;
- public PDAController(IDt_StationManagerRepository stationMangerRepository, ITaskService taskService, ITaskRepository taskRepository, IRouterRepository routerRepository)
+
+ public PDAController(IDt_StationManagerRepository stationMangerRepository, ITaskService taskService, ITaskRepository taskRepository, IRouterRepository routerRepository, IDt_MaterialInfoRepository materialInfoRepository, IDt_ContainerInfoRepository containerInfoRepository, IDt_MaterialInfoService iDt_MaterialInfoService)
{
_stationMangerRepository = stationMangerRepository;
_taskService = taskService;
_taskRepository = taskRepository;
_routerRepository = routerRepository;
+ _MaterialInfoRepository = materialInfoRepository;
+ _ContainerInfoRepository = containerInfoRepository;
+ _IDt_MaterialInfoService = iDt_MaterialInfoService;
}
-
+ /// <summary>
+ /// 鏂板缁勭洏淇℃伅
+ /// </summary>
+ /// <param name="containerbindingDTO"></param>
+ /// <returns></returns>
[HttpPost, HttpGet, Route("ContainerbindingAsync"), AllowAnonymous]
public async Task<WebResponseContent> ContainerbindingAsync([FromBody] ContainerbindingDTO containerbindingDTO)
{
- WebResponseContent content = new WebResponseContent();
- return content.OK();
+ return await _IDt_MaterialInfoService.ContainerbindingAsync(containerbindingDTO);
+ }
+
+ [HttpPost, HttpGet, Route("DeleteGroupPlateAsync"), AllowAnonymous]
+ public async Task<WebResponseContent> DeleteGroupPlateAsync(string PalletCode)
+ {
+ return await _IDt_MaterialInfoService.DeleteGroupPlateAsync(PalletCode);
}
}
--
Gitblit v1.9.3