From 79e43ccffd15afcd99934ee43b706f6133398079 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 07 七月 2025 15:29:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
MESApplication/Controllers/WomdaaController.cs | 42 ++++++++++++++++++++++++++++++++++++++----
1 files changed, 38 insertions(+), 4 deletions(-)
diff --git a/MESApplication/Controllers/WomdaaController.cs b/MESApplication/Controllers/WomdaaController.cs
index b2ac255..fda3e60 100644
--- a/MESApplication/Controllers/WomdaaController.cs
+++ b/MESApplication/Controllers/WomdaaController.cs
@@ -1,4 +1,5 @@
锘縰sing System.Dynamic;
+using MES.Service.Dto.service;
using MES.Service.Modes;
using MES.Service.service;
using MES.Service.util;
@@ -12,14 +13,45 @@
{
private readonly WomdaaManager m = new();
- //TestUpdate
- [HttpPost("TestUpdate")]
- public ResponseResult TestUpdate([FromBody] Womdaa data)
+ #region 鐢熶骇棰嗘枡
+
+ //GetProductionPickDaa001
+ /// <summary>
+ /// 妯＄硦鏌ヨ宸ュ崟鍙峰苟杩斿洖
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetProductionPickDaa001")]
+ public ResponseResult GetProductionPickDaa001(WarehouseQuery query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.TestUpdate(data);
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ //GetItemsByDaa001
+ /// <summary>
+ /// 鏍规嵁宸ュ崟鍙疯幏鍙栦唬棰嗙墿鏂欐槑缁�
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetItemsByDaa001")]
+ public ResponseResult GetItemsByDaa001(WarehouseQuery query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetItemsByDaa001(query);
return new ResponseResult
{
status = 0,
@@ -177,4 +209,6 @@
return ResponseResult.ResponseError(ex);
}
}
+
+ #endregion
}
\ No newline at end of file
--
Gitblit v1.9.3