From d016d7ff02586fb9535baef4916cd339e18c7867 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期一, 22 十二月 2025 09:48:52 +0800
Subject: [PATCH] 增加新称重后端
---
Controllers/Wom/WomdaaController.cs | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 53 insertions(+), 4 deletions(-)
diff --git a/Controllers/Wom/WomdaaController.cs b/Controllers/Wom/WomdaaController.cs
index 1d26e46..22391f1 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,7 +11,7 @@
[ApiController]
[Route("api/[controller]")]
-public class WomdaaController : ControllerBase
+public class WomdaaController : BaseController
{
private readonly WomdaaManager m = new();
private readonly MesPrintMangeer _mCf = new();
@@ -28,7 +29,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetProductionPickDaa001(query);
+ resultInfos.tbBillList = m.GetProductionPickDaa001(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -50,10 +51,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, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -133,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,
@@ -531,6 +559,27 @@
}
}
+ //鏂扮О閲嶉〉闈紝鏆傛椂涓嶇敤
+ [HttpPost("GetWeightByXt_new")]
+ public ResponseResult GetWeightByXt_new(dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbBillList = m.GetWeightByXt_new(query);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鐜板満鏀舵枡鑾峰彇鍙�夊伐鍗曚俊鎭�
@@ -543,7 +592,7 @@
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = m.GetXcslDaa(query);
+ resultInfos.tbBillList = m.GetXcslDaa(query, RequestInfo);
return new ResponseResult
{
status = 0,
--
Gitblit v1.9.3