From 07be4d7d9002739b54170fdca63f0e8c7773e647 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期四, 11 十一月 2021 15:56:03 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DAL/仓库管理/ClsKf_ProductInBill.cs | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductInBill.cs" "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductInBill.cs"
index 576cc13..2055ed8 100644
--- "a/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductInBill.cs"
+++ "b/DAL/\344\273\223\345\272\223\347\256\241\347\220\206/ClsKf_ProductInBill.cs"
@@ -456,8 +456,28 @@
}
//鐢熸垚鍑哄叆搴撳崟鎹�
//鎻掑叆瀛愯〃
- oCn.RunProc("EXEC h_p_Kf_ProductInBillSub_Insert_StationOutBad " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + sHSourceType + "'");
- //鎻掑叆涓昏〃
+ DataSet DS2 = oCn.RunProcReturn("EXEC h_p_Kf_ProductInBillSub_Insert_StationOutBad " + omodel.HInterID.ToString() + ",'" + omodel.HBillNo + "','" + sHSourceType + "'", "h_p_Kf_ProductInBillSub_Insert_StationOutBad");
+ if (DS2 == null || DS2.Tables[0].Rows.Count == 0)
+ {
+ sErrMsg = "鍒ゆ柇鍐欏叆瀛愯〃鐘舵�佸け璐ワ紝鏈煡閿欒锛�";
+ if (oSystemParameterMain.WMS_CampanyName == "鏉窞鏅鸿" || oSystemParameterMain.WMS_CampanyName == "鏉窞鏂帿灏�") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ }
+ else
+ {
+ oCn.RollBack();
+ }
+ return false;
+ }
+ else
+ {
+ if (DBUtility.ClsPub.isStrNull(DS2.Tables[0].Rows[0][0]) != "OK")
+ {
+ sErrMsg = "鍐欏叆瀛愯〃澶辫触锛�";
+ return false;
+ }
+ }
+ //鎻掑叆涓昏〃
oCn.RunProc("Insert Into Kf_ICStockBillMain " +
"(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
",HYear,HPeriod,HRemark,HMaker,HMakeDate" +
--
Gitblit v1.9.1