From 7def1cc8cad93ca565c5ba13e48bdbaeed2fe828 Mon Sep 17 00:00:00 2001
From: yxj <yxj@hz-kingdee.com>
Date: 星期一, 11 十二月 2023 15:39:34 +0800
Subject: [PATCH] 出门确认单、发出确认单上传方法取消事务回滚,销售出库、生产入库多源单上传、物料扫码方法增加写入日志;DAL引用更新

---
 CLOUDWEB/WebService1.asmx.cs |   83 ++++++++++++++++++++++++++++++++++++-----
 1 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 00ca3fb..a344bcf 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -4040,7 +4040,7 @@
                 oMain.HPeriod = sPeriod;
 
                 DataSet Ds;
-                oCn.BeginTran();
+                //oCn.BeginTran();
                 //鐢熸垚鍑洪棬纭鍗�
                 //鎻掑叆瀛愯〃
                 oCn.RunProc("EXEC h_p_Sc_DoorOutCheckBillSub_Insert_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "','" + sHSourceType + "'");
@@ -4062,13 +4062,13 @@
                 //}
 
                 sErrMsg = "鏂板鍗曟嵁鎴愬姛锛�";
-                oCn.Commit();
+                //oCn.Commit();
                 return true;
             }
             catch (Exception e)
             {
                 sErrMsg = "鐢熸垚鍑洪棬纭鍗曞け璐ワ紒" + e.Message;
-                oCn.RollBack();
+                //oCn.RollBack();
                 return false;
             }
         }
@@ -11204,6 +11204,7 @@
 
         private bool SaveSellOutBill_CLD(Model.ClsKf_SellOutBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
         {
+            string sRemark = "";
             SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             DataSet Ds;
             try
@@ -11214,6 +11215,8 @@
 
                 //鎻掑叆瀛愯〃
                 oCn.RunProc("EXEC h_p_Kf_SellOutBillSub_Insert " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'");
+
+                sRemark = sRemark + " 锛涘啓鍏ュ瓙琛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 //鎻掑叆涓昏〃
                 oCn.RunProc("Insert Into Kf_ICStockBillMain   " +
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
@@ -11226,14 +11229,20 @@
                 ", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
                 ", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
                 ") ");
+
+                sRemark = sRemark + " 锛涘啓鍏ヤ富琛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 //鏇存柊鍏宠仈鏁伴噺
                 oCn.RunProc("exec h_p_Xs_UpDateSeOutStockRelation_Add " + oMain.HInterID.ToString());
+
+                sRemark = sRemark + " 锛涙洿鏂板叧鑱旀暟閲�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
 
                 if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
                 {
                     //瀹℃牳鍗曟嵁
                     oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
                 }
+
+                sRemark = sRemark + " 锛涘洖濉鏍镐汉" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 oCn.Commit();
             }
             catch (Exception e)
@@ -11248,6 +11257,8 @@
                 string sJson_CheckFlag = "";    //鐢熸垚鍗曟嵁鏄惁瀹℃牳鏍囧織
                 //鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
                 Ds = oCn.RunProcReturn("exec h_p_Kf_GetSellOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetSellOutBill_CLD");
+
+                sRemark = sRemark + " 锛涜繑鍥濧PI鏁版嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                 {
                     sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�"; 
@@ -11449,6 +11460,8 @@
                         sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
                     }
 
+                    sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                     //鐢熸垚 閿�鍞嚭搴� 
                     string HReturn;
                     ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
@@ -11462,6 +11475,7 @@
                         ////鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
                         oCn.RunProc("exec h_p_Sc_UpDateSelfFildSellOut '" + oMain.HBillNo + "'");
                         //
+                        sRemark = sRemark + " 鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                         if (oSystemParameterMain.Kf_SellOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
                         {
                             if (sJson_CheckFlag == "N")     //閫掑姞鏄惁瀹℃牳锛孨涓轰笉瀹℃牳
@@ -11487,12 +11501,16 @@
                         }
                         if (HReturn.Contains("\"IsSuccess\":false") == true)
                         {
+                            LogService.Write("鐢熸垚閿�鍞嚭搴撳崟澶辫触" + sRemark);
                             sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + HReturn + sJson;
                             //oCn.RollBack();
                             return false;
                         }
                         else
                         {
+
+                            sRemark = sRemark + " 锛涚敓鎴怌LOUD鍗曟嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                             if (oSystemParameterMain.WMS_CampanyName == "闊╃數")
                             {
                                 //閿�鍞嚭搴撴椂鍙嶅啓鍙戣揣閫氱煡鍗曘�侀攢鍞鍗�
@@ -11500,6 +11518,8 @@
                                 {
                                     //澶栭攢鍙嶅啓鍙戣揣閫氱煡鍗曘�侀攢鍞鍗曟暟閲�
                                     oCn.RunProc("EXEC h_p_ToCLD_BackDataDELIVERYNOTICE '" + oMain.HBillNo + "'");
+
+                                    sRemark = sRemark + " 锛涘閿�鍙嶅啓鍙戣揣閫氱煡鍗曘�侀攢鍞鍗曟暟閲�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                                 }
                                 else if (Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_XSLX"]) == "鍐呴攢"
                                         || Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_XSLX"]) == "OEM"
@@ -11507,15 +11527,18 @@
                                 {
                                     //鍐呴攢銆丱EM鍜岀數鍟� 鍏抽棴鍙戣揣閫氱煡鍗曘�侀攢鍞鍗�
                                     oCn.RunProc("EXEC h_p_ToCLD_BackDataDELIVERYNOTICE_Close '" + oMain.HBillNo + "'");
+                                    sRemark = sRemark + " 锛涘唴閿�銆丱EM鍜岀數鍟� 鍏抽棴鍙戣揣閫氱煡鍗曘�侀攢鍞鍗�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                                 }
                             }
 
 
+                            LogService.Write("鐢熸垚閿�鍞嚭搴撳崟鎴愬姛锛�" + sRemark);
                             return true;
                         }
                     }
                     else
                     {
+                        LogService.Write("鐢熸垚閿�鍞嚭搴撳崟澶辫触锛佺櫥褰曞け璐�" + sRemark);
                         sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛佺櫥褰曞け璐ワ紒";
                         //oCn.RollBack();
                         return false;
@@ -11524,6 +11547,7 @@
             }
             catch (Exception e1)
             {
+                LogService.Write("鐢熸垚閿�鍞嚭搴撳崟澶辫触鍥炴粴" + sRemark);
                 sErrMsg = "鐢熸垚閿�鍞嚭搴撳崟澶辫触锛�" + e1.Message;
                 //oCn.RollBack();
                 return false;
@@ -17588,6 +17612,7 @@
         /// <returns></returns>
         public bool SaveProductInBill_MulSource_CLD(Model.ClsKf_ProductInBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sHBillNo, ref string sErrMsg)
         {
+            string sRemark = "";
             SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             try
             {
@@ -17605,6 +17630,8 @@
 
                 //鎻掑叆瀛愯〃
                 oCn.RunProc("EXEC h_p_Kf_ProductInBillSub_Insert " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'");
+
+                sRemark = sRemark + " 锛涘啓鍏ュ瓙琛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 //鎻掑叆涓昏〃
                 oCn.RunProc("Insert Into Kf_ICStockBillMain   " +
                 "(HBillType,HBillSubType,HInterID,HBillNo,HDate,HMainSourceBillType" +
@@ -17617,8 +17644,11 @@
                 ", " + oMain.HSupID.ToString() + "," + oMain.HWHID.ToString() + "," + oMain.HSCWHID.ToString() + "," + oMain.HEmpID.ToString() + "," + oMain.HManagerID.ToString() + "," + oMain.HSecManagerID.ToString() +
                 ", " + oMain.HKeeperID.ToString() + "," + oMain.HDeptID.ToString() + ",'" + oMain.HExplanation + "','" + oMain.HInnerBillNo + "'," + DBUtility.ClsPub.BoolToString(oMain.HRedBlueFlag) +
                 ") ");
+                sRemark = sRemark + " 锛涘啓鍏ヤ富琛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                 //鏇存柊鍏宠仈鏁伴噺
                 oCn.RunProc("exec h_p_Sc_UpDateICMORelation_Add " + oMain.HInterID.ToString());
+
+                sRemark = sRemark + " 锛涘洖濉叧鑱旀暟閲�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
 
                 if (oSystemParameterMain.Kf_ProductInBill_AutoCheck == "Y") //绯荤粺鍙傛暟  鑷姩瀹℃牳 
                 {
@@ -17628,6 +17658,8 @@
                 //鏍规嵁鍗曟嵁ID鑾峰彇鎵弿鐨勭粍缁囨湁鍝嚑涓�
                 string tt = "";
                 Ds1 = oCn.RunProcReturn("exec h_p_Kf_GetOrgIDByTemp_CLD " + oMain.HInterID.ToString(), "h_p_Kf_GetOrgIDByTemp_CLD");
+
+                sRemark = sRemark + " 锛涜幏鍙栫粍缁囦釜鏁�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
 
                 if (Ds1 == null || Ds1.Tables[0].Rows.Count == 0)
                 {
@@ -17645,6 +17677,9 @@
                         HOrgID = Pub_Class.ClsPub.isLong(Ds1.Tables[0].Rows[y][0]);
                         //鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
                         Ds = oCn.RunProcReturn("exec h_p_Kf_GetProductInBillByOrgID_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'," + HOrgID.ToString(), "h_p_Kf_GetProductInBillByOrgID_CLD");
+
+                        sRemark = sRemark + " 锛涜幏鍙朅PI鏁版嵁" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                         if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
                         {
                             sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
@@ -17798,6 +17833,8 @@
                     ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
                     string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
                     bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+
+                    sRemark = sRemark + " 锛涜幏鍙栭獙璇丆LOUD璐﹀彿瀵嗙爜" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                     if (bLogin)
                     {
                         var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.BatchSave",
@@ -26189,6 +26226,7 @@
         [WebMethod]
         public bool set_SavePonderationBillMain_Temp_BarCode(string sBarCode, Int64 HBillID, string HBillType, string HBillNo, string HMaker, Int64 HWhID, Int64 HSPID, Double HQty, bool HRedBlueFlag, bool SourceFlag, string HSourceBillNo, string HSourceBillType, Int64 HOWNERID, string HExpressNumber, ref string sHSourceBillNo, ref string sHSourceBillType, ref long sHSupID, ref string sHSupName, ref long sHDeptID, ref string sHDeptName, ref string sErrMsg)
         {
+            string sRemark = "";
             SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
             DAL.ClsKF_PonderationBillMain_Temp_Ctl tem = new DAL.ClsKF_PonderationBillMain_Temp_Ctl();
             Model.ClsKF_PonderationBillMain_Temp model = new Model.ClsKF_PonderationBillMain_Temp();
@@ -26216,6 +26254,8 @@
                 sErrMsg = "鑾峰彇绯荤粺鍙傛暟澶辫触锛� " + sErrMsg;
                 return false;
             }
+            sRemark = sRemark + "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HBillID + "锛涜幏鍙栫郴缁熷弬鏁�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
             //褰撳崟鎹弬鏁版槸 澶氬師鍗曟ā寮忔椂锛� 鍒� SourceFlag 璁剧疆涓� TRUE  Sc_ICMOReportBill_MulSourceBill(闊╃數鏄�)
             if (HBillType == "3711" && oSystemParameter.omodel.Sc_ICMOReportBill_MulSourceBill=="Y")
             {
@@ -26238,6 +26278,9 @@
                     //鏍规嵁鐗╂枡鏉$爜寰楀埌瀵瑰簲婧愬崟淇℃伅骞跺皢婧愬崟淇℃伅鏂板鍒版潯鐮佸嚭鍏ュ簱涓存椂琛紝甯﹀嚭琛ㄥご閮ㄩ棬銆佷緵搴斿晢
                     //h_p_WMS_BarCode_SourceBillType 甯﹀嚭鍘熷崟淇℃伅
                     DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_BarCode_SourceBillType " + HBillID.ToString() + ",'" + HBillType + "','" + sBarCode + "'", "h_p_WMS_BarCode_SourceBillType");
+
+                    sRemark = sRemark + " 锛涘叆搴撹幏鍙栨簮鍗曚俊鎭�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                     if (ds1 == null || ds1.Tables[0].Rows.Count == 0)
                     {
                         sErrMsg = "鎵弿鐗╂枡鏉$爜鍚庡垽鏂潯鐮佹簮鍗曚俊鎭紝鏈煡閿欒锛�";
@@ -26260,7 +26303,7 @@
                                 // 灏嗘簮鍗曚俊鎭啓鍏� 涓存椂缂撳瓨琛�
                                 if (tem.AddNew_Source(HBillID, HBillNo, HBillType, sHSourceBillNo, sHSourceBillType, sRedBlue, ref sErrMsg))
                                 {
-
+                                    sRemark = sRemark + " 锛涘叆搴撳啓鍏ユ簮鍗曚俊鎭�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                                 }
                                 else
                                 {
@@ -26296,6 +26339,9 @@
             {
                 DataSet dstt = oCn.RunProcReturn("exec h_p_WMS_GetOldBarCode_Insert " + HBillID.ToString() + ",'" + HBillType + "','" + sBarCode + "'," + HOWNERID, "h_p_WMS_GetOldBarCode_Insert");
                 //DataSet dstt = oCn.RunProcReturn("exec h_p_WMS_GetOldBarCode " + HBillID.ToString() + ",'" + sBarCode + "' ", "h_p_WMS_GetOldBarCode");
+
+                sRemark = sRemark + " 锛涢攢鍞嚭搴撳拰閫�搴撱�侀鏂欏嚭搴撴椂锛屽鏋滄潯鐮佹。妗堟壘涓嶅埌灏变粠鏃ф潯鐮佷粠鑾峰彇骞跺悓姝ヨ嚦鏈湴" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                 if (dstt == null || dstt.Tables[0].Rows.Count == 0)
                 {
                     sErrMsg = "鍚屾鏉$爜澶辫触锛�";
@@ -26327,6 +26373,9 @@
                 {
                     //鑾峰彇TMP涓殑鍘熷崟涓诲唴鐮佸拰瀛愬唴鐮� //鍒ゆ柇璇ユ潯鐮佹槸鍚﹀湪鍘熷崟鍒楄〃涓環_p_WMS_GetBarCodeSourceInterID
                     DataSet ds2 = oCn.RunProcReturn("exec h_p_WMS_GetBarCodeSourceInterID " + HBillID.ToString() + ",'" + sBarCode + "' ", "h_p_WMS_GetBarCodeSourceInterID");
+
+                    sRemark = sRemark + " 锛涘垽鏂槸鍚﹀湪婧愬崟涓�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff"); 
+                    
                     if (ds2 == null || ds2.Tables[0].Rows.Count == 0)
                     {
                         sErrMsg = "鎵弿鐗╂枡鏉$爜鍚庢湁婧愬崟鑷姩鑾峰彇涓�琛屾簮鍗曚俊鎭紝鏈煡閿欒锛�";
@@ -26422,6 +26471,9 @@
                         {
                             //鏍规嵁浠撳簱ID锛屽垽鏂槸鍚﹀惎鐢ㄤ粨浣�
                             DataSet ds3 = oCn.RunProcReturn(" select HSPFlag from Gy_Warehouse with(nolock) where HItemID= " + HWhID.ToString(), "Gy_Warehouse");
+
+                            sRemark = sRemark + " 锛涘嚭搴撳垽鏂粨搴撲粨浣嶆槸鍚﹀凡閫夋嫨" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                             if (ds3 == null || ds3.Tables[0].Rows.Count == 0)
                             {
                                 sErrMsg = "浠撳簱鍐呯爜閿欒锛�";
@@ -26440,7 +26492,6 @@
                         DAL.ClsKF_PonderationBillMain_Temp_View Tempdal = new DAL.ClsKF_PonderationBillMain_Temp_View();
                         if (Tempdal.CheckQtyByBarCode(HBillID, HBillType, sBarCode, ref HWhID, ref HSPID, sRelQty, ref sRelQty))
                         {
-
                         }
                         else
                         {
@@ -26454,12 +26505,16 @@
                                 sErrMsg = "搴撳瓨涓嶈冻锛屽凡鑾峰彇瀹為檯搴撳瓨鏁伴噺锛�";
                             }
                         }
+                        sRemark = sRemark + " 锛涘嚭搴撳垽鏂潯鐮佸簱瀛�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
                     }
                 }
                 else
                 {
                     //鍒ゆ柇骞惰幏鍙� 浠撳簱 浠撲綅淇℃伅(闄嶇瓑鍝� 鎵惧埌 闄嶇瓑鍝佸簱)
                     DataSet ds4 = oCn.RunProcReturn("exec h_p_WMS_GetBillWHID " + HBillID.ToString() + ",'" + HBillType + "','" + sBarCode + "'," + HWhID.ToString() + "," + HSPID.ToString(), "h_p_WMS_GetBillWHID");
+
+                    sRemark = sRemark + " 锛涘垽鏂苟鑾峰彇 浠撳簱 浠撲綅淇℃伅(闄嶇瓑鍝� 鎵惧埌 闄嶇瓑鍝佸簱)" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                     if (ds4 == null || ds4.Tables[0].Rows.Count == 0)
                     {
                         sErrMsg = "鍒ゆ柇骞惰幏鍙栦粨搴撲粨浣嶄俊鎭紝鏈煡閿欒锛�";
@@ -26488,6 +26543,8 @@
                         sErrMsg = sErrMsg;
                         return false;
                     }
+                    sRemark = sRemark + " 锛涘叆搴撹繑鍥炴潯鐮佹暟閲�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
                 }
             }
 
@@ -26548,6 +26605,9 @@
 
             //鐗╂枡鏉$爜鍐欏叆涓存椂琛ㄦ椂锛屽垽鏂粨搴撲粨浣嶆槸鍚︽纭�
             DataSet ds5 = oCn.RunProcReturn("exec h_p_WMS_CheckWHandSP " + model.HWhID.ToString() + "," + model.HStockPlaceID.ToString(), "h_p_WMS_CheckWHandSP");
+
+            sRemark = sRemark + " 锛涘垽鏂粨搴撲粨浣嶆槸鍚︽纭�" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+
             if (ds5 == null || ds5.Tables[0].Rows.Count == 0)
             {
                 sErrMsg = "鎵弿鐗╂枡鏉$爜瀛樺叆涓存椂琛ㄦ椂鍒ゆ柇浠撳簱浠撲綅鏄惁姝g‘,鏈煡閿欒锛�";
@@ -26572,6 +26632,9 @@
                 sErrMsg = "鎵弿澶辫触锛�" + sErrMsg;
                 return false;
             }
+            sRemark = sRemark + " 锛涘啓鍏ョ紦瀛樿〃" + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss:ffff");
+            LogService.Write("鎵弿鐗╂枡鏉$爜" + sRemark);
+
             return true;
         }
 
@@ -27589,13 +27652,13 @@
 
             try
             {
-                oCn.BeginTran();
+                //oCn.BeginTran();
                 //鐢熸垚鍑洪棬纭鍗�
                 DataSet Ds = oCn.RunProcReturn("exec h_p_Kf_SendConfirmationBill_Insert_New " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "'", "h_p_Kf_SendConfirmationBill_Insert_New");
                 if (Ds == null || Ds.Tables[0].Rows.Count == 0)
                 {
                     sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛屼笂浼犳彁浜ゅ彂鍑虹‘璁ゅ崟锛屽彂鐢熼敊璇紒";
-                    oCn.RollBack();
+                    //oCn.RollBack();
                     return false;
                 }
                 else
@@ -27603,13 +27666,13 @@
                     if (DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0][0]) == 1)
                     {
                         sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛�" + DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HRemark"]);
-                        oCn.RollBack();
+                        //oCn.RollBack();
                         return false;
                     }
                     else
                     {
                         sErrMsg = "鏂板鍗曟嵁鎴愬姛锛�";
-                        oCn.Commit();
+                        //oCn.Commit();
                         return true;
                     }
                 }
@@ -27617,7 +27680,7 @@
             catch (Exception e)
             {
                 sErrMsg = "鍗曟嵁鍙凤細" + HBillNo + "锛屽崟鎹甀D锛�" + HInterID + "锛岀敓鎴愬彂鍑虹‘璁ゅ崟澶辫触锛�" + e.Message;
-                oCn.RollBack();
+                //oCn.RollBack();
                 return false;
             }
         }

--
Gitblit v1.9.1