From 254f71374c74cb9782ff85db0e39cf64d38c7ce2 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期三, 11 三月 2026 14:24:37 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/Controllers/条码管理/WEBSController.cs | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs" "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
index 7d1b8a0..b5586c1 100644
--- "a/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
+++ "b/WebAPI/Controllers/\346\235\241\347\240\201\347\256\241\347\220\206/WEBSController.cs"
@@ -14641,7 +14641,10 @@
// 鍗庤垷瀹㈡埛
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
- HBarCode = HBarCode.Split('-')[0];
+ if (!string.IsNullOrWhiteSpace(HBarCode))
+ {
+ HBarCode = HBarCode.Split('-')[0];
+ }
}
// Mode = 1 琛ㄧず 鎵爜妯″紡 Mode = 2 琛ㄧず 閫夊崟妯″紡
@@ -14650,8 +14653,8 @@
//鎵爜妯″紡闇�瑕佽В鏋愭潯鐮佽幏鍙朒InterID鍜孒EntryID
ds = oCn.RunProcReturn($@"
exec h_p_CheckBillBarCode_AnalysisBarcode
- @HBillType={HBillType},
- @HSourceBillType={HSourceBillType},
+ @HBillType='{HBillType}',
+ @HSourceBillType='{HSourceBillType}',
@HBarCode='{HBarCode}',
@user = '{user}'
", "h_p_CheckBillBarCode_AnalysisBarcode");
@@ -14671,14 +14674,14 @@
// 閫夊崟妯″紡鐩存帴閫掑叆HInterID 鍜� HEntryID 鏍规嵁 鍙栬川妫�鏂规鏉ユ簮 鑾峰彇 妫�楠岄」鐩�
if (oSystemParameter.omodel.WMS_CampanyName == "鍗庤垷")
{
- //鍗庤垷鍋氭湯浠剁殑鏃跺�� 瑕佺煡閬撴垜杩欎釜鏉＄爜 瀵瑰簲鐨勬暟閲忔槸澶氬皯锛屽彧鑳芥妸鏉＄爜浼犲叆杩涘幓杩涜鏌ユ壘
- ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType={HBillType},@HSourceBillType={HSourceBillType},
- @HInterID={HInterID},@HEntryID={HEntryID},@HBarCode={HBarCode}", "h_p_CheckBillBarCode_CheckItem");
+ //鍗庤垷鍋氭湯浠剁殑鏃跺�� 瑕佺煡閬撴垜杩欎釜鏉＄爜 瀵瑰簲鐨勬暟閲忔槸澶氬皯锛屽彧鑳芥妸鏉＄爜浼犲叆杩涘幓杩涜鏌ユ壘
+ ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
+ @HInterID='{HInterID}',@HEntryID='{HEntryID}',@HBarCode='{HBarCode}'", "h_p_CheckBillBarCode_CheckItem");
}
else
{
- ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType={HBillType},@HSourceBillType={HSourceBillType},
- @HInterID={HInterID},@HEntryID={HEntryID}", "h_p_CheckBillBarCode_CheckItem");
+ ds = oCn.RunProcReturn($@"exec h_p_CheckBillBarCode_CheckItem @HBillType='{HBillType}',@HSourceBillType='{HSourceBillType}',
+ @HInterID='{HInterID}',@HEntryID='{HEntryID}'", "h_p_CheckBillBarCode_CheckItem");
}
--
Gitblit v1.9.1