From 79edcd87697f5cce97e461443fac1e4e655f6dae Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周一, 19 5月 2025 16:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs | 161 +++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 154 insertions(+), 7 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
index ad56343..15338d0 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
@@ -1,12 +1,11 @@
锘縰sing CMS.Extensions.Abp.AspNetCore.Mvc.Filters;
using CMS.Plugin.HIAWms.Application.Contracts.Dtos.CommonDto;
+using CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsMaterialStocks;
using CMS.Plugin.HIAWms.Application.Contracts.Services;
+using CmsQueryExtensions;
+using CmsQueryExtensions.Entitys;
using Microsoft.AspNetCore.Mvc;
-using System;
using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
namespace CMS.Plugin.HIAWms.Controller
{
@@ -19,10 +18,12 @@
public class LMesOperateController : ControllerBase
{
private readonly ILMesOperateAppService _mesOperateAppService;
+ private readonly IWmsMaterialStockAppService _wmsmaterialstockAppService;
- public LMesOperateController(ILMesOperateAppService mesOperateAppService)
+ public LMesOperateController(ILMesOperateAppService mesOperateAppService, IWmsMaterialStockAppService wmsmaterialstockAppService)
{
_mesOperateAppService = mesOperateAppService;
+ _wmsmaterialstockAppService = wmsmaterialstockAppService;
}
/// <summary>
@@ -32,9 +33,155 @@
/// <returns></returns>
[HttpPost]
[Route("LMesCallMaterial")]
- public async Task<List<CallMaterialOutput>> LMesCallMaterialAsync(List<LMesCallMaterialInput> input)
+ public async Task<CmsApiResponse<List<CallMaterialOutput>>> LMesCallMaterialAsync(List<LMesCallMaterialInput> input)
{
- return await _mesOperateAppService.LMesCallMaterialAsync(input);
+ try
+ {
+
+ var list = await _mesOperateAppService.LMesCallMaterialAsync(input);
+ return new CmsApiResponse<List<CallMaterialOutput>>()
+ {
+ Data = list,
+ Code = 200,
+ Message = "LMes鍙枡鎴愬姛"
+ };
+ //*/
+ /*
+ //妯℃嫙杩斿洖鏁版嵁
+ List<CallMaterialOutput> list = new List<CallMaterialOutput>();
+ return new CmsApiResponse<List<CallMaterialOutput>>()
+ {
+ Data = list,
+ Code = 200,
+ Message = "LMes鍙枡鎴愬姛"
+ };
+ //*/
+ }
+ catch (Exception ex)
+ {
+ //throw; //涓嶈鎶涘嚭寮傚父锛屽惁鍒欏鏂逛細鎺ユ敹澶辫触鍛�
+ return new CmsApiResponse<List<CallMaterialOutput>>()
+ {
+ Data = null,
+ Code = 500,
+ Message = ex.Message
+ };
+ }
+
+ }
+
+
+
+
+
+ /// <summary>
+ /// LMes缁勭洏
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("LMesPick")]
+ public async Task<CmsApiResponse<WmsMaterialStockDto>> LMesPickAsync([FromBody] WmsMaterialStockCreateDto input)
+ {
+ try
+ {
+ var list = await _wmsmaterialstockAppService.CreateAsync(input);
+ return new CmsApiResponse<WmsMaterialStockDto>()
+ {
+ Data = list,
+ Code = 200,
+ Message = "LMes缁勭洏鎴愬姛"
+ };
+ }
+ catch (Exception ex)
+ {
+ //throw; //涓嶈鎶涘嚭寮傚父锛屽惁鍒欏鏂逛細鎺ユ敹澶辫触鍛�
+ return new CmsApiResponse<WmsMaterialStockDto>()
+ {
+ Data = null,
+ Code = 500,
+ Message = ex.Message
+ };
+ }
+
+ }
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯�
+ /// </summary>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindListByFilter")]
+ public virtual async Task<CmsApiResponse<List<WmsMaterialStockDto>>> FindListByFilterAsync([FromBody] GetWmsMaterialStockInput input)
+ {
+ try
+ {
+ var list = await _wmsmaterialstockAppService.FindListByFilterAsync(input);
+ return new CmsApiResponse<List<WmsMaterialStockDto>>()
+ {
+ Data = list,
+ Code = 200,
+ Message = ""
+ };
+
+ /*
+ //妯℃嫙杩斿洖鏁版嵁
+ List<WmsMaterialStockDto> list = new List<WmsMaterialStockDto>();
+ list.Add(new WmsMaterialStockDto<List<WmsMaterialStockDto>>()
+ {
+ ContainerNo = "TP202",
+ PlaceNo = "FJKW01"
+ });
+ return new CmsApiResponse<List<WmsMaterialStockDto>>()
+ {
+ Data = list,
+ Code = 200,
+ Message = ""
+ };
+ //*/
+ }
+ catch (Exception ex)
+ {
+ //throw; //涓嶈鎶涘嚭寮傚父锛屽惁鍒欏鏂逛細鎺ユ敹澶辫触鍛�
+ return new CmsApiResponse<List<WmsMaterialStockDto>>()
+ {
+ Data = null,
+ Code = 500,
+ Message = ex.Message
+ };
+ }
+ }
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍗曚釜鍑哄叆搴撳崟鎹鎯�
+ /// </summary>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindSingleByFilter")]
+ public virtual async Task<CmsApiResponse<WmsMaterialStockDto>> FindSingleByFilterAsync([FromBody] GetWmsMaterialStockInput input)
+ {
+
+ try
+ {
+ var list = await _wmsmaterialstockAppService.FindSingleByFilterAsync(input);
+ return new CmsApiResponse<WmsMaterialStockDto>()
+ {
+ Data = list,
+ Code = 200,
+ Message = ""
+ };
+ }
+ catch (Exception ex)
+ {
+ //throw; //涓嶈鎶涘嚭寮傚父锛屽惁鍒欏鏂逛細鎺ユ敹澶辫触鍛�
+ return new CmsApiResponse<WmsMaterialStockDto>()
+ {
+ Data = null,
+ Code = 500,
+ Message = ex.Message
+ };
+ }
}
}
}
--
Gitblit v1.9.3