From 266afcd9d3b53e97b9a81e61efd095bbdbc8de9e Mon Sep 17 00:00:00 2001
From: tjx <t2856754968@163.com>
Date: 星期五, 17 十月 2025 01:17:27 +0800
Subject: [PATCH] 同步为建辉的版本
---
service/Wom/WomdaaManager.cs | 69 +++++-----------------------------
1 files changed, 10 insertions(+), 59 deletions(-)
diff --git a/service/Wom/WomdaaManager.cs b/service/Wom/WomdaaManager.cs
index a5cedcf..3861ba6 100644
--- a/service/Wom/WomdaaManager.cs
+++ b/service/Wom/WomdaaManager.cs
@@ -62,11 +62,7 @@
// 淇锛氳ˉ鍏呰幏鍙� womdaa 瀵硅薄
var daa001Value = query.daa001?.ToString();
- var daaInfoParameters = new[]
- {
- new SugarParameter("@daa001", query.daa001)
- };
- var womdaa = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", daaInfoParameters).FirstOrDefault();
+ var womdaa = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_getDaaInfo @daa001", parameters).First();
if (womdaa == null)
{
@@ -401,37 +397,6 @@
}
- /// <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)
{
@@ -509,11 +474,10 @@
if (string.IsNullOrEmpty(query.Kbbarcode?.ToString()))
throw new ArgumentException("鍗℃澘鏉＄爜涓嶅厑璁镐负绌�", nameof(query.userName));
- var sql = string.Format(@"SELECT QUANTITY,agvPostion,
+ var sql = string.Format(@"SELECT QUANTITY,
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);
@@ -764,13 +728,10 @@
cmd.Parameters.Add(parameter);
cmd.ExecuteNonQuery();
-
+
_strMsg = parameters[2].Value?.ToString() ?? "";
- if (int.TryParse(parameters[3].Value?.ToString(), out int status))
- _status = status;
- else
- _status = -1;
-
+ _status = Convert.ToInt32(parameters[3].Value ?? -1);
+
if (_status <= 0) throw new Exception(_strMsg);
return new {
@@ -912,10 +873,7 @@
cmd.ExecuteNonQuery();
_strMsg = parameters[3].Value?.ToString() ?? "";
- if (int.TryParse(parameters[4].Value?.ToString(), out int status))
- _status = status;
- else
- _status = -1;
+ _status = Convert.ToInt32(parameters[4].Value ?? -1);
if (_status <= 0) throw new Exception(_strMsg);
@@ -977,10 +935,7 @@
cmd.ExecuteNonQuery();
_strMsg = parameters[2].Value?.ToString() ?? "";
- if (int.TryParse(parameters[3].Value?.ToString(), out int status))
- _status = status;
- else
- _status = -1;
+ _status = Convert.ToInt32(parameters[3].Value ?? -1);
_weight = parameters[4].Value?.ToString() ?? "0";
if (_status <= 0) throw new Exception(_strMsg);
@@ -1187,10 +1142,7 @@
cmd.ExecuteNonQuery();
_strMsg = parameters[3].Value?.ToString() ?? "";
- if (int.TryParse(parameters[4].Value?.ToString(), out int status))
- _status = status;
- else
- _status = -1;
+ _status = Convert.ToInt32(parameters[4].Value ?? -1);
if (_status <= 0) throw new Exception(_strMsg);
@@ -1469,7 +1421,6 @@
{
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 }
};
@@ -1480,8 +1431,8 @@
var result = new
{
- message = parameters[3].Value?.ToString(),
- status = Convert.ToInt32(parameters[4].Value)
+ message = parameters[2].Value?.ToString(),
+ status = Convert.ToInt32(parameters[3].Value)
};
if (result.status <= 0)
--
Gitblit v1.9.3