From 2ed39b33a7f3dd6a7bd2e66b7ee5de78e00861f1 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期二, 26 八月 2025 11:08:11 +0800
Subject: [PATCH] 1.OA正式库切换
---
service/Wom/WomdaaManager.cs | 84 +++++++++++++++++++++++++++++++-----------
1 files changed, 62 insertions(+), 22 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 1c101e1..e5a8733 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -203,7 +203,7 @@
// })
// .ToList();
- var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,
+ var sql =string.Format(@"SELECT c.item_no ItemNo,c.item_name ItemName,c.item_model ItemModel,b.dab006 FQty,b.dab007 SQty,b.dab006 - b.dab007 DSQty ,C.item_id FMaterialId ,
dbo.F_QX_GETRECODEPOTSE(B.dab003,'','','') as RecoKw
FROM WOMDAB B
LEFT JOIN WOMDAA A ON A.guid = B.daaGuid
@@ -265,32 +265,41 @@
/// <returns></returns>
public dynamic getZsBarInfo(dynamic query)
{
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
- var sql = string.Format(@"SELECT TOP 1 A.barCode AS zsBarcode,
- D.name AS lineName,
- D.line_no,
- B.daa001,
- C.item_no,
- C.item_name,
- C.item_model,
- A.quantity as barQty,
- B.daa008 as sumQty,
- isnull((SELECT count(1) FROM WORK_COLLECT WHERE processNo = '{0}' AND ABOUT_GUID = A.ABOUT_GUID),0) AS finQty,
- isnull((SELECT TOP 1 processNo FROM WORK_COLLECT WHERE WORK_COLLECT.barCode = '{1}' AND checkResult = '鈭�' ORDER BY WORK_COLLECT.createDate DESC ),'') AS lastGx
-FROM WORK_TRAC_CODE A
- LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
- LEFT JOIN MES_ITEMS C ON B.daa002 = C.item_id
- LEFT JOIN MES_WORKSHOP_LINE D ON A.lineId = D.id
-WHERE A.barCode = '{1}'", query.GX, query.Zsbarcode);
+ if (string.IsNullOrEmpty(query.Zsbarcode?.ToString()))
+ throw new ArgumentException("杩芥函鐮佷笉鑳戒负绌�", nameof(query.Zsbarcode));
- var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
+ if (string.IsNullOrEmpty(query.GX?.ToString()))
+ throw new ArgumentException("宸ュ簭涓嶈兘涓虹┖", nameof(query.GX));
- if (ZsBarInfo.Count < 1)
+ var parameters = new[]
+ {
+ new SugarParameter("@pi_trac_barcode", query.Zsbarcode),
+ new SugarParameter("@pi_gx", query.GX),
+ new SugarParameter("@inP1", null),
+ new SugarParameter("@inP2", null),
+ new SugarParameter("@inP3", null),
+ new SugarParameter("@inP4", null)
+ };
+
+ try
{
- throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄤ笉瀛樺湪");
- }
+ var ZsBarInfo = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selZsBarInfo @pi_trac_barcode,@pi_gx,@inP1,@inP2,@inP3,@inP4", parameters);
- return ZsBarInfo;
+ if (ZsBarInfo.Count < 1)
+ {
+ throw new Exception($"璇ヨ拷婧爜{query.Zsbarcode}涓嶅瓨鍦ㄦ垨宸茬粦瀹�");
+ }
+
+ return ZsBarInfo;
+ }
+ catch (Exception ex)
+ {
+ // 淇濈暀鍘熸湁寮傚父澶勭悊閫昏緫
+ throw new Exception($"{ex.Message}");
+ }
}
//鑾峰彇鐢熶骇
@@ -309,6 +318,37 @@
return Traceability;
}
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public dynamic GetBarKwByItem(dynamic unity)
+ {
+ if (unity == null)
+ throw new ArgumentNullException(nameof(unity), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+
+ if (string.IsNullOrEmpty(unity.itemId?.ToString()))
+ throw new ArgumentException("鐗╂枡ID涓嶈兘涓虹┖", nameof(unity.itemId));
+
+ try
+ {
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@itemId", unity.itemId)
+ };
+
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId", parameters);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
+ }
+
+ }
+
+
public dynamic ProductBinding(dynamic query)
{
if (query == null) throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓� null");
--
Gitblit v1.9.3