From 9344dcd4f7febe85870a023090271d9e90ad46be Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期六, 30 八月 2025 14:19:21 +0800
Subject: [PATCH] 1.多组织权限分配 2.登录优化
---
Controllers/Wom/WomdaaController.cs | 36 +++++++++++++++++++++++++++++++++---
1 files changed, 33 insertions(+), 3 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 809832b..b4dc967 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;
@@ -10,8 +11,9 @@
[ApiController]
[Route("api/[controller]")]
-public class WomdaaController : ControllerBase
+public class WomdaaController : BaseController
{
+
private readonly WomdaaManager m = new();
private readonly MesPrintMangeer _mCf = new();
@@ -28,7 +30,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetProductionPickDaa001(query);
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query, OrgId);
return new ResponseResult
{
status = 0,
@@ -50,10 +52,13 @@
[HttpPost("GetItemsByDaa001")]
public ResponseResult GetItemsByDaa001(WarehouseQuery query)
{
+ // 浠� HttpContext.Items 鑾峰彇 orgId
+ var orgId = HttpContext.Request.Headers["OrgId"].ToString();
+
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetItemsByDaa001(query);
+ resultInfos.tbBillList = m.GetItemsByDaa001(query, OrgId);
return new ResponseResult
{
status = 0,
@@ -121,6 +126,31 @@
}
}
+
+ /// <summary>
+ /// 鐢熶骇棰嗘枡鐐瑰嚮鐗╂枡鏄庣粏鑾峰彇鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <returns></returns>
+ [HttpPost("GetBarKwByItem")]
+ public ResponseResult GetBarKwByItem(dynamic unity)
+ {
+ try
+ {
+ 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>
--
Gitblit v1.9.3