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

出入库，后道标签打印调整（后道标签打印有问题）

Browse Source
This commit is contained in:
赵正易
2025-08-28 10:10:15 +08:00
parent 781a519803
commit 0350a43055
21 changed files with 1350 additions and 420 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseDefectController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd基础缺陷项
/// </summary>
[Verify]
// [Verify]
[Route("/mes/qc/BackEnd/QcBackEndBaseDefect")]
public class QcBackEndBaseDefectController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseGroupController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd班组
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndBaseGroup")]
public class QcBackEndBaseGroupController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseLabelAnalysisController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd基础标签解析
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndBaseLabelAnalysis")]
public class QcBackEndBaseLabelAnalysisController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndBaseSiteController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd基础站点
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndBaseSite")]
public class QcBackEndBaseSiteController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndLogWorkorderController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd工单操作日志
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndLogWorkorder")]
public class QcBackEndLogWorkorderController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndRecordLabelScanController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd扫码标签记录
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndRecordLabelScan")]
public class QcBackEndRecordLabelScanController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndRecordWorkorderDefectController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd工单缺陷项记录
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndRecordWorkorderDefect")]
public class QcBackEndRecordWorkorderDefectController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndServiceStatisticsController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd统计报表业务模块
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackEndServiceStatistics")]
public class QcBackEndServiceStatisticsController : BaseController
{

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackEndServiceWorkorderController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 质量BackEnd工单业务模块
/// </summary>
[Verify]
// [Verify]
[Route("/mes/qc/BackEnd/QcBackEndServiceWorkorder")]
public class QcBackEndServiceWorkorderController : BaseController
{

9
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackendBaseOutpackageController.cs
View File

@@ -12,7 +12,7 @@ namespace ZR.Admin.WebApi.Controllers
/// 质量后道外箱标签打印配置
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackendBaseOutpackage")]
public class QcBackendBaseOutpackageController : BaseController
{
@@ -34,7 +34,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="parm"></param>
/// <returns></returns>
[HttpGet("list")]
[ActionPermissionFilter(Permission = "business:qcbackendbaseoutpackage:list")]
[AllowAnonymous]
public IActionResult QueryQcBackendBaseOutpackage(
[FromQuery] QcBackendBaseOutpackageQueryDto parm
)
@@ -49,7 +49,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <param name="Id"></param>
/// <returns></returns>
[HttpGet("{Id}")]
[ActionPermissionFilter(Permission = "business:qcbackendbaseoutpackage:query")]
[AllowAnonymous]
public IActionResult GetQcBackendBaseOutpackage(int Id)
{
var response = _QcBackendBaseOutpackageService.GetInfo(Id);
@@ -64,6 +64,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPost]
[AllowAnonymous]
public IActionResult AddQcBackendBaseOutpackage([FromBody] QcBackendBaseOutpackageDto parm)
{
var modal = parm.Adapt<QcBackendBaseOutpackage>().ToCreate(HttpContext);
@@ -79,6 +80,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpPut]
[AllowAnonymous]
public IActionResult UpdateQcBackendBaseOutpackage(
[FromBody] QcBackendBaseOutpackageDto parm
)
@@ -95,6 +97,7 @@ namespace ZR.Admin.WebApi.Controllers
/// </summary>
/// <returns></returns>
[HttpDelete("{ids}")]
[AllowAnonymous]
public IActionResult DeleteQcBackendBaseOutpackage(string ids)
{
int[] idsArr = Tools.SpitIntArrary(ids);

2
ZR.Admin.WebApi/Controllers/mes/qc/backend/QcBackendRecordLabelPrintController.cs
View File

@@ -11,7 +11,7 @@ namespace ZR.Admin.WebApi.Controllers
/// <summary>
/// 后道标签打印记录
/// </summary>
[Verify]
//[Verify]
[Route("/mes/qc/BackEnd/QcBackendRecordLabelPrint")]
public class QcBackendRecordLabelPrintController : BaseController
{

170
ZR.Admin.WebApi/Controllers/mes/wms/WmPDAOutboundController.cs Normal file
View File

@@ -0,0 +1,170 @@
using Microsoft.AspNetCore.Mvc;
using ZR.Admin.WebApi.Filters;
using ZR.Model.MES.wms.Dto;
using ZR.Service.mes.wms.IService;
namespace ZR.Admin.WebApi.Controllers
{
/// <summary>
/// PDA出库控制器
/// </summary>
[Route("mes/wms/pdaOutbound")]
public class WmPDAOutboundController : BaseController
{
private readonly IWmOutOrderService _wmOutOrderService;
public WmPDAOutboundController(IWmOutOrderService wmOutOrderService)
{
_wmOutOrderService = wmOutOrderService;
}
/// <summary>
/// (PDA出库)获取出库单列表【出库中，已完成】
/// </summary>
/// <param name="parm">查询参数</param>
/// <returns>出库单列表</returns>
[HttpGet("GetPdaOutOrderPageList")]
[AllowAnonymous]
public IActionResult GetPdaOutOrderPageList([FromQuery] WmPDAOutOrderPageQueryDto parm)
{
try
{
var result = _wmOutOrderService.GetPdaOutOrderPageList(parm);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)获取出库计划列表
/// </summary>
/// <param name="parm">查询参数</param>
/// <returns>出库计划列表</returns>
[HttpGet("GetPdaOutOrderPlanPageList")]
[AllowAnonymous]
public IActionResult GetPdaOutOrderPlanPageList([FromQuery] WmPDAOutOrderPlanPageQueryDto parm)
{
try
{
var result = _wmOutOrderService.GetPdaOutOrderPlanPageList(parm);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)获取出库计划中所包含的物料的清单
/// </summary>
/// <param name="shipmentNum">出库单号</param>
/// <returns>出库计划列表</returns>
[HttpGet("GetPdaOutOrderPlanOptions")]
[AllowAnonymous]
public IActionResult GetPdaOutOrderPlanOptions(string shipmentNum)
{
try
{
var result = _wmOutOrderService.GetPdaOutOrderPlanOptions(shipmentNum);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)获取出库计划中某物料实际库存变动信息
/// </summary>
/// <param name="shipmentNum">出库单号</param>
/// <param name="materialCode">物料号</param>
/// <param name="batchCode">批次号</param>
/// <returns>出库计划列表</returns>
[HttpGet("GetPdaOutOrderPlanActualData")]
[AllowAnonymous]
public IActionResult GetPdaOutOrderPlanActualData(string shipmentNum, string materialCode, string batchCode)
{
try
{
var result = _wmOutOrderService.GetPdaOutOrderPlanActualData(shipmentNum, materialCode, batchCode);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)更新出库计划
/// </summary>
/// <param name="shipmentNum">出库单号</param>
/// <returns>是否更新成功</returns>
[HttpPost("UpdatePdaOutOrderPlan")]
[AllowAnonymous]
public IActionResult UpdatePdaOutOrderPlan(string shipmentNum)
{
try
{
var result = _wmOutOrderService.UpdatePdaOutOrderPlan(shipmentNum);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)根据出库计划出库 返回 ok 成功，其余都是异常
/// </summary>
/// <param name="parm">出库信息</param>
/// <returns>出库结果</returns>
[HttpPost("PdaOutboundByOutOrderPlan")]
[AllowAnonymous]
public IActionResult PdaOutboundByOutOrderPlan([FromBody] WmPDAOutboundDto parm)
{
try
{
var result = _wmOutOrderService.PdaOutboundByOutOrderPlan(parm);
if(result == "ok")
{
return SUCCESS(result);
}
else
{
return ToResponse(new ApiResult(500, result));
}
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
/// <summary>
/// (PDA出库)出库单完成
/// </summary>
/// <param name="shipmentNum">出库单号</param>
/// <returns>是否完成</returns>
[HttpPost("CompleteOutOrder")]
[AllowAnonymous]
public IActionResult CompleteOutOrder(string shipmentNum)
{
try
{
var result = _wmOutOrderService.CompleteOutOrder(shipmentNum);
return SUCCESS(result);
}
catch (Exception ex)
{
return ToResponse(new ApiResult(500, ex.Message));
}
}
}
}