From bcc9c855dd85492894be8a783fc9216e6b0898e8 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 22 十月 2025 15:19:54 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_PdaService
---
service/base/WmsBaseMangeer.cs | 47 ++++++++++++++---------------------------------
1 files changed, 14 insertions(+), 33 deletions(-)
diff --git a/service/base/WmsBaseMangeer.cs b/service/base/WmsBaseMangeer.cs
index cb1ba5b..e3eadf8 100644
--- a/service/base/WmsBaseMangeer.cs
+++ b/service/base/WmsBaseMangeer.cs
@@ -31,20 +31,6 @@
string barcode, string sectionCode, string stockId, string stockOrgId,
string billNo, string transactionNo)
{
- // 鍙傛暟楠岃瘉
- if (string.IsNullOrEmpty(edtUserNo))
- throw new ArgumentException("鎿嶄綔浜哄伐鍙蜂笉鑳戒负绌�", nameof(edtUserNo));
- if (string.IsNullOrEmpty(barcode))
- throw new ArgumentException("鐗╂枡鏉＄爜涓嶈兘涓虹┖", nameof(barcode));
- if (string.IsNullOrEmpty(sectionCode))
- throw new ArgumentException("搴撲綅缂栫爜涓嶈兘涓虹┖", nameof(sectionCode));
- if (string.IsNullOrEmpty(stockId))
- throw new ArgumentException("浠撳簱ID涓嶈兘涓虹┖", nameof(stockId));
- if (string.IsNullOrEmpty(stockOrgId))
- throw new ArgumentException("搴撳瓨缁勭粐ID涓嶈兘涓虹┖", nameof(stockOrgId));
- if (string.IsNullOrEmpty(transactionNo))
- throw new ArgumentException("浜嬪姟绫诲瀷涓嶈兘涓虹┖", nameof(transactionNo));
-
var outputMsg = "";
var outputStatus = -1;
@@ -60,7 +46,7 @@
new("@pi_sectionCode", SqlDbType.NVarChar, 100) { Value = sectionCode },
new("@pi_stockId", SqlDbType.NVarChar, 100) { Value = stockId },
new("@pi_stockOrgId", SqlDbType.NVarChar, 100) { Value = stockOrgId },
- new("@pi_billno", SqlDbType.NVarChar, 100) { Value = string.IsNullOrEmpty(billNo) ? DBNull.Value : billNo },
+ new("@pi_billno", SqlDbType.NVarChar, 100) { Value = billNo },
new("@pi_transaction_no", SqlDbType.NVarChar, 10) { Value = transactionNo },
new("@pi_val1", SqlDbType.NVarChar, 100) { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
new("@pi_val2", SqlDbType.NVarChar, 100) { Value = DBNull.Value }, // 棰勭暀鎵╁睍瀛楁
@@ -136,32 +122,27 @@
/// <returns>璐т富绫诲瀷(BD_OwnerOrg/BD_Customer/BD_Supplier)</returns>
public string GetOwnerType(string ownerId)
{
- // 濡傛灉 ownerId 涓虹┖锛岃繑鍥為粯璁ょ殑璐т富绫诲瀷
if (string.IsNullOrEmpty(ownerId))
- return "BD_OwnerOrg"; // 榛樿涓虹粍缁囩被鍨�
+ throw new ArgumentNullException(nameof(ownerId));
- // 浼樺厛妫�鏌ョ郴缁熺粍缁�
if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
{
return "BD_OwnerOrg";
}
-
- // 妫�鏌ユ槸鍚︿负瀹㈡埛鎴栦緵搴斿晢锛堝畨鍏ㄧ殑鏁板瓧杞崲锛�
- if (int.TryParse(ownerId, out int ownerIdInt))
+ else if (Db.Queryable<MesCustomer>().Any(x => x.Id == Convert.ToInt32(ownerId)))
{
- if (Db.Queryable<MesCustomer>().Any(x => x.Id == ownerIdInt))
- {
- return "BD_Customer";
- }
-
- if (Db.Queryable<MesSupplier>().Any(x => x.Id == ownerIdInt))
- {
- return "BD_Supplier";
- }
+ return "BD_Customer";
}
-
- // 濡傛灉閮芥棤娉曞尮閰嶏紝杩斿洖榛樿缁勭粐绫诲瀷鑰屼笉鏄姏鍑哄紓甯�
- return "BD_OwnerOrg";
+ else if (Db.Queryable<MesSupplier>().Any(x => x.Id == Convert.ToInt32(ownerId)))
+ {
+ return "BD_Supplier";
+ }
+ else if (Db.Queryable<SysOrganization>().Any(x => x.Fid == ownerId))
+ {
+ return "BD_OwnerOrg";
+ }
+
+ throw new Exception("鏃犳硶纭畾璐т富绫诲瀷锛岃妫�鏌ヨ揣涓籌D鏄惁姝ｇ‘锛�");
}
--
Gitblit v1.9.3