From c1a7481b105fcf74d819fee180788f6b5115c417 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 05 十一月 2025 14:28:58 +0800
Subject: [PATCH] 委外功能修改测通
---
service/Wom/WwGdManager.cs | 244 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 242 insertions(+), 2 deletions(-)
diff --git a/service/Wom/WwGdManager.cs b/service/Wom/WwGdManager.cs
index 34953f2..498fcf3 100644
--- a/service/Wom/WwGdManager.cs
+++ b/service/Wom/WwGdManager.cs
@@ -194,6 +194,30 @@
}
/// <summary>
+ /// 閫夊彇鍒楄〃
+ /// </summary>
+ /// <param name="unity"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ public dynamic GetWWCKsq(dynamic unity, dynamic RequestInfo)
+ {
+ var orgId = RequestInfo.OrgId;
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@pi_selectKey", unity.selectKey),
+ new SugarParameter("@pi_type", unity.type), // 鍙�夊弬鏁�
+ new SugarParameter("@pi_orgId", orgId), // 鍙�夊弬鏁�
+ new SugarParameter("@inP1", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP2", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP3", null), // 鍙�夊弬鏁�
+ new SugarParameter("@inP4", null), // 鍙�夊弬鏁�
+ // ...鍏朵粬鍙�夊弬鏁�
+ };
+ var result = Db.Ado.SqlQuery<dynamic>("EXEC prc_pda_wwcksq_list @pi_selectKey, @pi_type, @pi_orgId , @inP1, @inP2, @inP3, @inP4", parameters);
+ return result;
+ }
+
+ /// <summary>
/// 鍒楄〃鏄庣粏
/// </summary>
/// <param name="query"></param>
@@ -735,6 +759,212 @@
}
#endregion
+
+ /// <summary>
+ /// 濮斿鍑哄簱鐢宠鍗曞彿鑾峰彇鏄庣粏
+ /// </summary>
+ /// <param name="query"></param>
+ /// <param name="RequestInfo"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ /// <exception cref="ArgumentNullException"></exception>
+ /// <exception cref="ArgumentException"></exception>
+ public dynamic GetItemsByWwckNo(WarehouseQuery query, dynamic RequestInfo)
+ {
+ if (string.IsNullOrEmpty(query.daa001)) throw new Exception("璇烽�夊伐鍗曞彿锛�");
+ if (query == null)
+ throw new ArgumentNullException(nameof(query), "鍙傛暟瀵硅薄涓嶈兘涓簄ull");
+ if (string.IsNullOrEmpty(query.daa001?.ToString()))
+ throw new ArgumentException("宸ュ崟鍙蜂笉瀛樺湪", nameof(query.daa001));
+
+ var orgId = RequestInfo.OrgId;
+ if (orgId == null)
+ throw new Exception("缁勭粐涓嶅瓨鍦紒");
+
+ var parameters = new[]
+ {
+ new SugarParameter("@daa001", query.daa001),
+ new SugarParameter("@pi_orgId", orgId),
+ 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 prc_pda_wwcksq_detailList @daa001,@pi_orgId,@inP1,@inP2,@inP3,@inP4", parameters);
+ var items = blDetails.Where(x => x.DSQty > 0).ToList(); // 寰呮壂鐗╂枡
+ var ysitems = blDetails.Where(x => x.SQty > 0).ToList(); // 宸叉壂鐗╂枡
+ var planNo = blDetails.FirstOrDefault()?.ErpProductionOrderNo?.ToString();// 鑾峰彇宸ュ崟璁″垝鍙�
+ return new
+ {
+ daa001 = query.daa001,
+ PlanNo = planNo,
+ items = items,
+ ysitems = ysitems,
+ allList = blDetails
+ };
+ }
+ catch (Exception ex)
+ {
+ throw new Exception($"{ex.Message}");
+ }
+ }
+
+ /// <summary>
+ /// w濮斿鍑哄簱
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public ProductionPickDto WwckScanCode(WarehouseQuery query)
+ {
+ var _strMsg = "";
+ var _intSum = "";
+ using (var conn = new SqlConnection(DbHelperSQL.strConn))
+ {
+ if (query.userName.IsNullOrEmpty()) throw new Exception("鐢ㄦ埛鍚嶄笉鍏佽涓虹┖");
+ if (query.daa001.IsNullOrEmpty()) throw new Exception("棰嗘枡鍗曞彿涓嶅厑璁镐负绌�");
+ if (query.barcode.IsNullOrEmpty()) throw new Exception("鏉＄爜涓嶅厑璁镐负绌�");
+
+ using (var cmd = new SqlCommand("[PRC_PDA_WWCK_SCAN]", conn))
+ {
+ try
+ {
+ conn.Open();
+ cmd.CommandType = CommandType.StoredProcedure;
+ //SqlParameter[] parameters =
+ //{
+ // new("@outMsg", SqlDbType.NVarChar, 300),
+ // new("@outSum", SqlDbType.NVarChar, 300),
+ // new("@barcode_num", SqlDbType.NVarChar, 300),
+ // new("@split_num", SqlDbType.NVarChar, 300),
+ // new("@c_User", query.userName),
+ // new("@p_biLL_no", query.daa001),
+ // new("@p_item_barcode", query.barcode)
+ //};
+
+ var parameters = new SqlParameter[]
+ {
+ new SqlParameter("@C_USER", SqlDbType.NVarChar, 100) { Value = query.userName ?? string.Empty },
+ new SqlParameter("@P_BILL_NO", SqlDbType.NVarChar, 50) { Value = query.billNo ?? string.Empty },
+ new SqlParameter("@P_ITEM_BARCODE", SqlDbType.NVarChar, 100) { Value = query.barcode ?? string.Empty },
+ new SqlParameter("@P_BL_NO", SqlDbType.NVarChar, 100) { Value = query.blNo ?? string.Empty },
+ new SqlParameter("@P_TYPE", SqlDbType.NVarChar, 20) { Value = query.Type ?? string.Empty },
+ new SqlParameter("@OUT_MSG", SqlDbType.NVarChar, 2000) { Direction = ParameterDirection.Output },
+ new SqlParameter("@OUT_SUM", SqlDbType.Int) { Direction = ParameterDirection.Output },
+ new SqlParameter("@BARCODE_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ },
+ new SqlParameter("@SPLIT_NUM", SqlDbType.Decimal) {
+ Direction = ParameterDirection.Output,
+ Precision = 18,
+ Scale = 10
+ }
+ };
+
+ parameters[5].Direction = ParameterDirection.Output;
+ parameters[6].Direction = ParameterDirection.Output;
+ parameters[7].Direction = ParameterDirection.Output;
+ parameters[8].Direction = ParameterDirection.Output;
+ foreach (var parameter in parameters)
+ cmd.Parameters.Add(parameter);
+ cmd.ExecuteNonQuery();
+ _strMsg = parameters[5].Value.ToString();
+ _intSum = parameters[6].Value.ToString();
+
+ var barcodeNum = parameters[7].Value.ToString();
+ var splitNum = parameters[8].Value.ToString();
+
+ var result = Convert.ToInt32(_intSum);
+ if (result <= 0) throw new Exception(_strMsg);
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.daa001,
+ barcodeNum = barcodeNum,
+ splitNum = splitNum,
+ barcode = query.barcode,
+ strMsg = _strMsg,
+ result = _intSum
+ };
+
+ return dto;
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+ finally
+ {
+ conn.Close();
+ }
+ }
+ }
+ }
+
+ /// <summary>
+ /// 濮斿鎷嗗垎鍑哄簱鎷嗗垎
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ /// <exception cref="Exception"></exception>
+ public ProductionPickDto WwckScanCodeCF(WarehouseQuery query)
+ {
+ // Validate input parameters
+ if (string.IsNullOrEmpty(query.userName))
+ throw new Exception("鐢ㄦ埛鍚嶄笉鑳戒负绌猴紒");
+
+ if (string.IsNullOrEmpty(query.barcode))
+ throw new Exception("璇锋壂鎻忔潯鐮侊紒");
+
+ if ((query.Num ?? 0) <= 0)
+ throw new Exception("璇疯緭鍏ユ纭殑鍙戞枡鏁伴噺锛�");
+
+ if (string.IsNullOrEmpty(query.blNo))
+ throw new Exception("琛ユ枡鍗曞彿涓嶈兘涓虹┖锛�");
+
+ // Prepare parameters for the stored procedure
+ var parameters = new List<SugarParameter>
+ {
+ new SugarParameter("@C_USER", query.userName),
+ new SugarParameter("@P_BILL_NO", query.billNo),
+ new SugarParameter("@P_ITEM_BARCODE", query.barcode),
+ new SugarParameter("@P_BL_NO", query.blNo),
+ new SugarParameter("@P_TYPE", query.Type),
+ new SugarParameter("@NUM", query.Num),
+ new SugarParameter("@OUT_MSG", "", System.Data.DbType.String, ParameterDirection.Output),
+ new SugarParameter("@OUT_SUM", 0, System.Data.DbType.Int32, ParameterDirection.Output),
+ new SugarParameter("@OUT_CF_BAR", "", System.Data.DbType.String, ParameterDirection.Output)
+ };
+
+ // Execute the stored procedure
+ Db.Ado.UseStoredProcedure().ExecuteCommand("PRC_PDA_WWCK_SCAN_CF", parameters);
+
+ // Get output parameters
+ var outMsg = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_MSG")?.Value?.ToString();
+ var outSum = Convert.ToInt32(parameters.FirstOrDefault(p => p.ParameterName == "@OUT_SUM")?.Value ?? -1);
+ var outCfBar = parameters.FirstOrDefault(p => p.ParameterName == "@OUT_CF_BAR")?.Value?.ToString();
+
+ // Handle the result
+ if (outSum == -1)
+ {
+ throw new Exception(outMsg ?? "鎿嶄綔澶辫触");
+ }
+
+
+ var dto = new ProductionPickDto
+ {
+ daa001 = query.billNo,
+ barcode = query.barcode,//鍘熸潯鐮�
+ cfBarcode = outCfBar//鎷嗗垎鍚庢潯鐮�
+ };
+
+ return dto;
+ }
#region 濮斿琛ユ枡
@@ -1314,7 +1544,7 @@
// 妫�鏌ヨˉ鏂欏崟鐘舵��
var mesItemBl = Db.Queryable<MesItemBl>()
- .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == false)
+ .Where(a => a.BlNo == query.blNo && (a.Bl018 ?? false) == true)
.First();
if (mesItemBl == null)
@@ -1382,9 +1612,19 @@
if (itemOut == null)
{
+ var outNoType = "WWBL(濮斿琛ユ枡)";
+ if (query.Type == "濮斿琛ユ枡")
+ {
+ outNoType = "WWBL(濮斿琛ユ枡)";
+ }
+ else
+ {
+ outNoType = "WWCL(濮斿瓒呴)";
+ }
+
// 鍒涘缓鏂扮殑鍑哄簱鍗�
var outId = Guid.NewGuid();
- var outNo = BillNo.GetBillNo("BL(宸ュ崟琛ユ枡)");
+ var outNo = BillNo.GetBillNo(outNoType);
// 鎻掑叆鍑哄簱鍗曚富琛�
executeCommand += db.Insertable(new MesInvItemOuts
--
Gitblit v1.9.3