From ea79dd023ae2785d301e88b8133c0d5f553674cb Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期日, 31 八月 2025 21:59:02 +0800
Subject: [PATCH] 1.库位查询组织权限区分 2.PDA多组织切换
---
service/Warehouse/MesXsckManager.cs | 59 +++++++++++++++++++++++++++++------------------------------
1 files changed, 29 insertions(+), 30 deletions(-)
diff --git a/service/Warehouse/MesXsckManager.cs b/service/Warehouse/MesXsckManager.cs
index d5da216..6f52fa2 100644
--- a/service/Warehouse/MesXsckManager.cs
+++ b/service/Warehouse/MesXsckManager.cs
@@ -33,44 +33,43 @@
/// 鏍规嵁鍙戣揣閫氱煡鍗曡幏鍙栧搴斾唬鍙戣揣鏄庣粏 prc_rf_pda_scan_zout_showbl
/// </summary>
/// <returns>鍙戣揣閫氱煡鍗曟槑缁嗗垪琛�</returns>
- public List<ItemDetailModel> GetMesItemFHTZetailByBillNo(
- WarehouseQuery query)
+ public dynamic GetMesItemFHTZetailByBillNo(dynamic query)
{
if (string.IsNullOrEmpty(query.billNo))
throw new Exception("璇烽�夊崟鎹彿锛�");
- // 妫�鏌ュ彂璐ч�氱煡鍗曟槸鍚﹀瓨鍦ㄤ笖瀹℃牳
- var mesItem = Db.Queryable<SalesDeliver>()
- .Where(a => a.BillNo == query.billNo && a.FApproverStatus == true)
- .First();
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
- if (mesItem == null)
- throw new Exception("鍗曟嵁鍙蜂笉瀛樺湪鎴栨湭瀹℃牳锛�");
-
- if (mesItem.FinishStatus == true)
- throw new Exception("鍗曟嵁鍙峰凡瀹岀粨锛�");
+ if (string.IsNullOrEmpty(query.billNo?.ToString()))
+ throw new ArgumentException("鍗曟嵁鍙蜂笉鑳戒负绌�", nameof(query.billNo));
// 鑾峰彇鏈畬鎴愮殑鍙戣揣閫氱煡鍗曟槑缁�
- var blDetails = Db.Queryable<SalesDeliver, SalesDeliverDetail, SalesOrderDetail,MesItems>((a, b, c, d) =>
- new JoinQueryInfos(JoinType.Left, a.Id == b.Pid,
- JoinType.Left, b.SalesDetailId == c.Id,
- JoinType.Left, c.MaterialId == d.ItemId.ToString()))
- .Where((a, b) => a.BillNo == query.billNo
- && (b.FMustQty ?? 0) - (b.FRealQty ?? 0) > 0)
- .Select((a, b, c, d) => new ItemDetailModel
+ var parameters = new[]
+{
+ new SugarParameter("@billNo", query.billNo),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+ try
+ {
+ List<dynamic>? blDetails = Db.Ado.SqlQuery<dynamic>(
+ "EXEC Get_Mes_Item_FHTZetail_By_BillNo @billNo,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ return new
{
- ItemNo = d.ItemNo,
- ItemName = d.ItemName,
- ItemModel = d.ItemModel,
- FQty = b.FMustQty,
- SQty = b.FRealQty,
- FMaterialId = d.ItemId.ToString(),
- Id = b.Id.ToString()
-
- })
- .ToList();
-
- return blDetails;
+ items = items,
+ ysitems = ysitems
+ };
+ }
+ catch (Exception ex)
+ {
+ // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
+ throw new Exception($"{ex.Message}");
+ }
}
/// <summary>
--
Gitblit v1.9.3