From d456623c6516e66cee457369a0a2b4bda2489bde Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期五, 14 五月 2021 16:01:21 +0800
Subject: [PATCH] 直接调拨单（源单：调拨申请单、无源单）上传生成CLOUD单据回滚修改
---
CLOUDWEB/WebService1.asmx.cs | 52 ++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 40 insertions(+), 12 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index 73da70b..495ab9d 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -5017,9 +5017,9 @@
private bool SaveMoveOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet Ds;
try
{
- DataSet Ds;
//
oCn.BeginTran();
//鍐欏叆WMS璋冩嫧鍗�
@@ -5046,13 +5046,22 @@
//瀹℃牳鍗曟嵁
oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
}
-
+ oCn.Commit();
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐�111锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ try
+ {
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveOutBill_CLD " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveOutBill_CLD");
if (Ds == null || Ds.Tables[0].Rows.Count == 0 || Ds.Tables[1].Rows.Count == 0)
{
sErrMsg = "鑾峰彇瀛愯〃淇℃伅澶辫触锛�";
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
else
@@ -5243,19 +5252,19 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson;
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
else
{
- oCn.Commit();
+ //oCn.Commit();
return true;
}
}
else
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
}
@@ -5263,7 +5272,7 @@
catch (Exception e)
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
}
@@ -6087,7 +6096,16 @@
//瀹℃牳鍗曟嵁
oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120) where HInterID= " + oMain.HInterID.ToString());
}
-
+ oCn.Commit();
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鐢熸垚棰嗘枡璋冩嫧鍗曞け璐�111锛�" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ try
+ {
//鏍规嵁TMP琛� 杩斿洖 瀛愯〃淇℃伅
DataSet Ds;
Ds = oCn.RunProcReturn("exec h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New " + oMain.HInterID.ToString() + ",'" + oMain.HBillNo + "'", "h_p_Kf_GetMoveStockBill_MoveStockRequest_CLD_New");
@@ -6099,6 +6117,15 @@
}
else
{
+ string sJson_StockStyle = "";
+ if (oSystemParameterMain.WMS_CampanyName == "闊╃數") //绯荤粺鍙傛暟 瀹㈡埛瀹氬埗鍖栧悕绉� 绌虹櫧涓洪�氱敤
+ {
+ sJson_StockStyle = "\"F_CHLX\":\"" + Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["F_CHLX"]) + "\","; //鍑鸿揣绫诲瀷
+ }
+ else
+ {
+ sJson_StockStyle = "";
+ }
string sJson_Main = "{\"Creator\":\"\",\"NeedUpDateFields\":[],\"NeedReturnFields\":[],\"IsDeleteEntry\":\"True\",\"SubSystemId\":\"\",\"IsVerifyBaseDataField\":\"false\"," +
"\"IsEntryBatchFill\":\"True\",\"ValidateFlag\":\"True\",\"NumberSearch\":\"True\",\"InterationFlags\":\"\"," +
"\"Model\":{ " +
@@ -6130,6 +6157,7 @@
//\"FThirdSystem\":\"\",
//\"FThirdSrcBillNo\":\"\",
//\"FThirdSrcId\":\"\",
+ sJson_StockStyle +
"\"FBillEntry\": [ ";
string sJson_Entry = "";
for (int i = 0; i < Ds.Tables[1].Rows.Count; i++)
@@ -6304,19 +6332,19 @@
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson;
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
else
{
- oCn.Commit();
+ //oCn.Commit();
return true;
}
}
else
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
}
@@ -6324,7 +6352,7 @@
catch (Exception e)
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
- oCn.RollBack();
+ //oCn.RollBack();
return false;
}
}
--
Gitblit v1.9.1