From 971e03ccbe5124d4761f56e71025453d1d4742bc Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期三, 17 九月 2025 14:17:08 +0800
Subject: [PATCH] 111
---
Controllers/Wom/WomdaaController.cs | 51 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 38 insertions(+), 13 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 685e347..3b5c3ca 100644
--- a/Controllers/Wom/WomdaaController.cs
+++ b/Controllers/Wom/WomdaaController.cs
@@ -1,5 +1,6 @@
锘縰sing System.Dynamic;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.Filters;
using NewPdaSqlServer.Dto.service;
using NewPdaSqlServer.entity;
using NewPdaSqlServer.service.@base;
@@ -12,8 +13,8 @@
[Route("api/[controller]")]
public class WomdaaController : BaseController
{
- private readonly MesPrintMangeer _mCf = new();
private readonly WomdaaManager m = new();
+ private readonly MesPrintMangeer _mCf = new();
#region 鐢熶骇棰嗘枡
@@ -28,8 +29,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList =
- m.GetProductionPickDaa001(query, RequestInfo);
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -79,13 +79,15 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.ScanCode(query);
- if (resultInfos.tbBillList.result == "2")
+ if(resultInfos.tbBillList.result == "2")
+ {
return new ResponseResult
{
status = Convert.ToInt32(resultInfos.tbBillList.result),
message = resultInfos.tbBillList.strMsg,
data = resultInfos
};
+ }
return new ResponseResult
{
status = 0,
@@ -135,6 +137,30 @@
{
dynamic resultInfos = new ExpandoObject();
resultInfos.tbBillList = m.GetBarKwByItem(unity);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
+ /// <summary>
+ /// 鐢熶骇棰嗘枡鐐瑰嚮鐗╂枡鏄庣粏鑾峰彇鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarKwByItemCK")]
+ public ResponseResult GetBarKwByItemCK(dynamic unity)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetBarKwByItemCK(unity);
return new ResponseResult
{
status = 0,
@@ -268,7 +294,7 @@
return ResponseResult.ResponseError(ex);
}
}
-
+
/// <summary>
/// 淇敼
@@ -293,10 +319,10 @@
return ResponseResult.ResponseError(ex);
}
}
-
#endregion
#region 鐜板満绠＄悊
+
/// <summary>
/// 鎵弿娉ㄥ鐮侊紝鑾峰彇宸ュ崟鍜屾潯鐮佷俊鎭�
@@ -535,7 +561,7 @@
/// <summary>
- /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
+ /// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -623,8 +649,7 @@
// 鍏堝垵濮嬪寲tbBillList灞炴��
resultInfos.tbBillList = new ExpandoObject();
resultInfos.tbBillList.ZsBarInfo = m.getHgBarInfo(query);
- resultInfos.tbBillList.Traceability =
- m.getTraceabilityByLsBar(query);
+ resultInfos.tbBillList.Traceability = m.getTraceabilityByLsBar(query);
return new ResponseResult
{
status = 0,
@@ -689,7 +714,7 @@
/// <summary>
- /// AGV鍛煎彨绾夸綋鍒楄〃
+ /// AGV鍛煎彨绾夸綋鍒楄〃
/// </summary>
/// <param name="query"></param>
/// <returns></returns>
@@ -716,8 +741,8 @@
#endregion
- #region pda璋冪敤AGV鐩稿叧
+ #region pda璋冪敤AGV鐩稿叧
/// <summary>
/// AGV閫佹
/// </summary>
@@ -741,7 +766,7 @@
}
}
- /// <summary>
+ /// <summary>
/// AGV鍛煎彨
/// </summary>
[HttpPost("handleAGVCall")]
@@ -765,7 +790,7 @@
}
/// <summary>
- /// AGV妫�楠屽鐞�
+ /// AGV妫�楠屽鐞�
/// </summary>
[HttpPost("handleAgvJy")]
public ResponseResult HandleAgvJy([FromBody] dynamic query)
--
Gitblit v1.9.3