From c2bac53ff77d91dfffb4bda9b0bcbf6556fda9a1 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 13:25:23 +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 | 103 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 97 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
index db6a442..2c444c7 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms/Controller/LMesOperateController.cs
@@ -2,13 +2,10 @@
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
{
@@ -40,6 +37,7 @@
{
try
{
+
var list = await _mesOperateAppService.LMesCallMaterialAsync(input);
return new CmsApiResponse<List<CallMaterialOutput>>()
{
@@ -47,6 +45,17 @@
Code = 200,
Message = "LMes鍙枡鎴愬姛"
};
+ //*/
+ /*
+ //妯℃嫙杩斿洖鏁版嵁
+ List<CallMaterialOutput> list = new List<CallMaterialOutput>();
+ return new CmsApiResponse<List<CallMaterialOutput>>()
+ {
+ Data = list,
+ Code = 200,
+ Message = "LMes鍙枡鎴愬姛"
+ };
+ //*/
}
catch (Exception ex)
{
@@ -62,14 +71,17 @@
}
+
+
+
/// <summary>
/// LMes缁勭洏
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
[HttpPost]
- [Route("LMes鈥嬧�婸alletizing鈥嬧��")]
- public async Task<CmsApiResponse<WmsMaterialStockDto>> LMes鈥嬧�婸alletizing鈥嬧�婣sync(WmsMaterialStockCreateDto input)
+ [Route("LMesPick")]
+ public async Task<CmsApiResponse<WmsMaterialStockDto>> LMesPickAsync([FromBody] WmsMaterialStockCreateDto input)
{
try
{
@@ -93,5 +105,84 @@
}
}
+
+ /// <summary>
+ /// 鏍规嵁鏉′欢鑾峰彇鍑哄叆搴撳崟鎹鎯�
+ /// </summary>
+ /// <param name="input">鏌ヨ鍙傛暟</param>
+ /// <returns></returns>
+ [HttpPost]
+ [Route("FindListByFilter")]
+ public virtual async Task<CmsApiResponse<List<WmsMaterialStockDto>>> FindListByFilterAsync([FromBody] GetWmsMaterialStockInput input)
+ {
+ try
+ {
+ input.StorageTypeNo = Domain.Shared.Enums.PlaceTypeEnum.XUNIKUWEI;
+ 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