From fc39ad22a6bda069d53d9aff1c83a69579737d44 Mon Sep 17 00:00:00 2001
From: 杨乐 <yang.le.192@qq.com>
Date: 星期五, 14 一月 2022 19:35:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
DBUtility/业务单据/ClsXt_BaseBill.cs | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs" "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
index 53b2ee58..ce3b7a0 100644
--- "a/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
+++ "b/DBUtility/\344\270\232\345\212\241\345\215\225\346\215\256/ClsXt_BaseBill.cs"
@@ -201,12 +201,12 @@
throw (e);
}
}
- //鍒犻櫎瀛愯〃
+ //淇濆吇璁″垝鍒犻櫎瀛愯〃1
public void DeleteBillSub(Int64 lngBillKey)
{
oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString());
}
- //鍒犻櫎瀛愯〃
+ //淇濆吇璁″垝鍒犻櫎瀛愯〃2
public void DeleteBillSub2(Int64 lngBillKey)
{
if (MvarItemKeySub2 != "")
@@ -463,9 +463,10 @@
//鍗曟嵁鍙锋槸鍚﹂噸澶�
public virtual bool IsExistBillNo(ref string sReturn, string sBillNo, ClsPub.Enum_BillStatus oBillStatus, Int64 lngBillKey)
{
+ string sSql = "";
try
{
- string sSql = "";
+
if (oBillStatus == ClsPub.Enum_BillStatus.BillStatus_AddNew)
{
sSql = "Select HInterID from " + MvarItemKey + " where hbilltype='" + BillType + "'and HBillNO ='" + sBillNo + "'";
@@ -486,8 +487,8 @@
}
catch (Exception e)
{
- sReturn = e.Message;
- throw (e);
+ sReturn = e.Message+"sql:"+ sSql;
+ return false;
}
}
#endregion
--
Gitblit v1.9.1