From 93b2ce5475d7a82375fea8acd921bf01dcdd39da Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 03 九月 2025 09:29:07 +0800
Subject: [PATCH] 补料增加查询条件
---
entity/Base/ItemDetailModel.cs | 1
service/Warehouse/MesItemBlManager.cs | 41 ++++++++++++++++----
Controllers/Warehouse/MesItemBlController.cs | 26 +++++++++++-
3 files changed, 56 insertions(+), 12 deletions(-)
diff --git a/Controllers/Warehouse/MesItemBlController.cs b/Controllers/Warehouse/MesItemBlController.cs
index 0c04c6e..5505fed 100644
--- a/Controllers/Warehouse/MesItemBlController.cs
+++ b/Controllers/Warehouse/MesItemBlController.cs
@@ -14,7 +14,7 @@
/// </summary>
[Route("api/[controller]")]
[ApiController]
-public class MesItemBlController : ControllerBase
+public class MesItemBlController : BaseController
{
private readonly MesItemBlManager _manager = new();
private readonly MesPrintMangeer _mCf = new();
@@ -232,12 +232,12 @@
/// <response code="200">鎴愬姛鑾峰彇琛ユ枡鍗曞彿鍒楄〃</response>
/// <response code="400">鑾峰彇澶辫触</response>
[HttpPost("GetSCBLBillNo")]
- public ResponseResult GetSCBLBillNo(WarehouseQuery query)
+ public ResponseResult GetSCBLBillNo([FromBody] dynamic query)
{
try
{
dynamic resultInfos = new ExpandoObject();
- resultInfos.tbBillList = _manager.GetSCBLBillNo(query);
+ resultInfos.tbBillList = _manager.GetSCBLBillNo(query, RequestInfo);
return new ResponseResult
{
status = 0,
@@ -286,6 +286,26 @@
}
}
+ [HttpPost("GetLineInfo")]
+ public ResponseResult GetLineInfo([FromBody] dynamic query)
+ {
+ try
+ {
+ dynamic resultInfos = new ExpandoObject();
+ resultInfos.tbLineInfo = _manager.GetLineInfo(query, RequestInfo);
+ return new ResponseResult
+ {
+ status = 0,
+ message = "OK",
+ data = resultInfos
+ };
+ }
+ catch (Exception ex)
+ {
+ return ResponseResult.ResponseError(ex);
+ }
+ }
+
/// <summary>
/// 鎵弿鏉＄爜
/// </summary>
diff --git a/entity/Base/ItemDetailModel.cs b/entity/Base/ItemDetailModel.cs
index 423cbb1..ab5de75 100644
--- a/entity/Base/ItemDetailModel.cs
+++ b/entity/Base/ItemDetailModel.cs
@@ -5,6 +5,7 @@
//璋冩嫧鍑哄叆搴撳崟閫氱敤绫�
public class ItemDetailModel
{
+ public string ItemId { get; set; } // 鐗╁搧Id
public string ItemNo { get; set; } // 鐗╁搧缂栧彿
public string ItemName { get; set; } // 鐗╁搧鍚嶇О
public string ItemModel { get; set; } // 鐗╁搧鍨嬪彿
diff --git a/service/Warehouse/MesItemBlManager.cs b/service/Warehouse/MesItemBlManager.cs
index f7cc1d2..8c7ffaf 100644
--- a/service/Warehouse/MesItemBlManager.cs
+++ b/service/Warehouse/MesItemBlManager.cs
@@ -5,6 +5,7 @@
using NewPdaSqlServer.entity.Base;
using NewPdaSqlServer.util;
using SqlSugar;
+using System.Text;
namespace NewPdaSqlServer.service.Warehouse;
@@ -16,15 +17,22 @@
/// 鑾峰彇鐢熶骇琛ユ枡鍗曞彿鍒楄〃
/// </summary>
/// <returns>琛ユ枡鍗曞彿鍒楄〃</returns>
- public List<string> GetSCBLBillNo(WarehouseQuery query)
+ public List<string> GetSCBLBillNo(dynamic query, dynamic RequestInfo)
{
- var list = Db.Queryable<MesItemBl>()
- .Where(s => (s.Bl018 ?? false) == true
- //&& (s.Bl019 ?? false) == false
- && s.Bl008 == query.Type)
- .OrderByDescending(s => s.Bl006)
- .Select(s => s.BlNo)
- .ToList();
+ var orgId = RequestInfo.OrgId;
+ var sqlParams = new List<SugarParameter>
+ {
+ new("@orgId", orgId),
+ new("@type", query.type),
+ new("@dateTime", query.dateTime == "" ? null : query.dateTime),
+ new("@lineNo", query.lineNo)
+
+ };
+ var sql2 = new StringBuilder("exec prc_pda_itemBl_billNoList @type,@orgId,@dateTime,@lineNo");
+
+ var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+ var list = LineInfo.Select(s => (string)s.bl_no).ToList();
return list;
}
@@ -68,7 +76,7 @@
// .ToList();
//return (mesItemBl.Bl001, blDetails);
- var sql = string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
+ var sql = string.Format(@"SELECT c.id as ItemId,c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,A.BLD007 FQty,A.BLD008 SQty,A.BLD007 - A.BLD008 DSQty,
dbo.F_QX_GETRECODEPOTSE(A.bld012,'','','') as RecoKw,D.daa001
fROM MES_ITEM_BL_DETAIL A
LEFT JOIN MES_ITEM_BL B ON A.MID = B.ID
@@ -995,6 +1003,21 @@
return dto;
}
+ // 鑾峰彇浜х嚎鍒楄〃
+ public dynamic GetLineInfo(dynamic unity, dynamic RequestInfo)
+ {
+ var orgId = RequestInfo.OrgId;
+ var sqlParams = new List<SugarParameter>
+ {
+ new("@orgId", orgId)
+ };
+
+ var sql2 = new StringBuilder("exec prc_pda_itemBl_lineInfo @orgId");
+
+ var LineInfo = Db.Ado.SqlQuery<dynamic>(sql2.ToString(), sqlParams);
+
+ return LineInfo;
+ }
#endregion
#region 鐢熶骇瓒呴
--
Gitblit v1.9.3