From 29c58a44a8f725637e7b18fbfc2dc826ba430561 Mon Sep 17 00:00:00 2001
From: 南骏 池 <chiffly@163.com>
Date: 星期五, 19 九月 2025 23:15:22 +0800
Subject: [PATCH] 1.委外领料申请（未完成） 2.物料分区
---
service/Wom/WomdaaManager.cs | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index 3861ba6..5256320 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -50,12 +50,12 @@
{
new SugarParameter("@daa001", query.daa001),
new SugarParameter("@pi_orgId",orgId),
- new SugarParameter("@inP1", null),
+ new SugarParameter("@inP1", query.userName),
new SugarParameter("@inP2", null),
new SugarParameter("@inP3", null),
new SugarParameter("@inP4", null)
};
- var womdabs = Db.Ado.SqlQuery<ItemDetailModel>("EXEC prc_pda_scll_detailList @daa001", parameters);
+ var womdabs = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_detailList @daa001,@pi_orgId,@inP1", parameters);
var DS_list = womdabs.Where(s => s.DSQty > 0).ToList();
var YS_list = womdabs.Where(s => s.SQty > 0).ToList();
@@ -69,7 +69,7 @@
throw new Exception("璇ュ伐鍗曚俊鎭笉瀛樺湪锛岃鏍稿锛�");
}
- var dto = new ProductionPickDto
+ var dto = new
{
daa001 = query.daa001,
daaInfo = womdaa,
@@ -397,6 +397,37 @@
}
+ /// <summary>
+ /// 鑾峰彇鐗╂枡鐩稿叧鏉＄爜淇℃伅
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public dynamic GetBarKwByItemCK(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),
+ new SugarParameter("@inP1", unity.type),
+ new SugarParameter("@inP2", unity.billNo)
+ };
+
+ return Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_scll_selBarMx @itemId,@inP1,@inP2", parameters);
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"鑾峰彇鏉＄爜淇℃伅澶辫触锛歿ex.Message}");
+ }
+
+ }
public dynamic ProductBinding(dynamic query)
{
@@ -474,10 +505,11 @@
if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.userName));
- var sql = string.Format(@"SELECT QUANTITY,
+ var sql = string.Format(@"SELECT QUANTITY,agvPostion,
ISNULL((SELECT COUNT(1) FROM MES_INV_ITEM_BARCODES_TBMX WHERE ABOUT_TB_BARCODE = '{0}'), 0) AS YSum,
DAA001
FROM MES_INV_ITEM_BARCODES A LEFT JOIN WOMDAA B ON A.ABOUT_GUID = B.guid
+left join MES_WORKSHOP_LINE C ON DAA015 = C.id AND iSAgV = 1
WHERE ITEM_BARCODE = '{0}' ", query.Kbbarcode);
var ZsBarInfo = Db.Ado.SqlQuery<dynamic>(sql);
@@ -1421,6 +1453,7 @@
{
new("@pi_user", SqlDbType.NVarChar, 100) { Value = query.userAccount },
new("@pi_kb_barcode", SqlDbType.NVarChar, 100) { Value = query.KbBar },
+ new("@in1", SqlDbType.NVarChar, 100) { Value = query.AgvDw },
new("@outMsg", SqlDbType.NVarChar, 2500) { Direction = ParameterDirection.Output },
new("@outSum", SqlDbType.Int) { Direction = ParameterDirection.Output }
};
@@ -1431,8 +1464,8 @@
var result = new
{
- message = parameters[2].Value?.ToString(),
- status = Convert.ToInt32(parameters[3].Value)
+ message = parameters[3].Value?.ToString(),
+ status = Convert.ToInt32(parameters[4].Value)
};
if (result.status <= 0)
--
Gitblit v1.9.3