From 379489a8353e1a6ccb80f57c6f00e2ae73c7e073 Mon Sep 17 00:00:00 2001
From: yxj <1qaz@123>
Date: 星期二, 05 七月 2022 16:54:36 +0800
Subject: [PATCH] 直接调拨单无源单生成CLOUD单据回滚事务修改
---
CLOUDWEB/WebService1.asmx.cs | 183 ++++++++++++++++++++-------------------------
1 files changed, 83 insertions(+), 100 deletions(-)
diff --git a/CLOUDWEB/WebService1.asmx.cs b/CLOUDWEB/WebService1.asmx.cs
index fa501bb..2a34859 100644
--- a/CLOUDWEB/WebService1.asmx.cs
+++ b/CLOUDWEB/WebService1.asmx.cs
@@ -5997,7 +5997,32 @@
//鐩存帴璋冩嫧
private bool SaveMoveOut_CLD(Model.ClsKf_MoveStockBillMain oMain, Pub_Class.ClsXt_SystemParameterMain oSystemParameterMain, ref string sErrMsg)
{
+ //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
+ if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
+ {
+ sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
+ return false;
+ }
+
+ //鑾峰彇CLOUD璐﹀彿瀵嗙爜
+ string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
+ string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
+ DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
+ if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
+ {
+ }
+ else
+ {
+ sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
+ sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
+ }
+
+ string HReturn;
+ ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
+ string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
+ bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+
try
{
DataSet Ds;
@@ -6023,12 +6048,6 @@
",'" + oMain.HStockStyle + "','" + oMain.HTransferDirect + "','" + oMain.HShipType + "'" +
", " + oMain.HSTOCKORGID.ToString() + "," + oMain.HOWNERID.ToString() +
") ");
-
- if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- //瀹℃牳鍗曟嵁
- oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
- }
if (oSystemParameterMain.WMS_MouldManagerCtl == "Y") //绯荤粺鍙傛暟 鍚敤鍣ㄥ叿绠＄悊
{
@@ -6191,31 +6210,7 @@
string sJson_End = " ] }}";
string sJson = sJson_Main + sJson_Entry + sJson_End;
- //浠庨厤缃枃浠惰幏鍙� CLOUD缃戝潃銆佽处濂椾俊鎭�佺櫥褰曠敤鎴枫�佺櫥褰曞瘑鐮�
- if (!Pub_Class.ClsPub.GetCLOUDLoginInfo(ref Pub_Class.ClsPub.sExeReturnInfo))
- {
- sErrMsg = Pub_Class.ClsPub.sExeReturnInfo;
- return false;
- }
-
- //鑾峰彇CLOUD璐﹀彿瀵嗙爜
- string sCLOUDUseName = Pub_Class.ClsPub.sCLOUDUseName;
- string sCLOUDPsd = Pub_Class.ClsPub.sCLOUDPsd;
- DataSet ds11 = get_SaveCLOUDUseNameandPsd(oMain.HInterID);
- if (ds11 == null || ds11.Tables[0].Rows.Count == 0)
- {
- }
- else
- {
- sCLOUDUseName = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserName"]);
- sCLOUDPsd = DBUtility.ClsPub.isStrNull(ds11.Tables[0].Rows[0]["HCloudUserPsd"]);
- }
-
- //鐢熸垚 鐩存帴璋冩嫧 1涓墿鏂�1鍗�
- string HReturn;
- ApiClient client = new ApiClient(Pub_Class.ClsPub.sCLOUDUrl);
- string dbId = Pub_Class.ClsPub.sCLOUDAcc; //AotuTest117
- bool bLogin = client.Login(dbId, sCLOUDUseName, sCLOUDPsd, 2052);
+ //鐢熸垚閲戣澏浜戝崟鎹�
if (bLogin)
{
var result = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Save",
@@ -6224,22 +6219,8 @@
//鐢熸垚鍗曟嵁鍚庢洿鏂拌嚜瀹氫箟瀛楁
oCn.RunProc("exec h_p_Sc_UpDateSelfFildMove '" + oMain.HBillNo + "','-1'");
- if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "STK_TransferDirect", sJson2 });
+ HReturn = result.ToString();
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "STK_TransferDirect", sJson3 });
-
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
- }
- else
- {
- HReturn = result.ToString();
- }
if (HReturn.Contains("\"IsSuccess\":false") == true)
{
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + HReturn + sJson;
@@ -6249,12 +6230,11 @@
else
{
oCn.Commit();
- return true;
}
}
else
{
- sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒閲戣澏浜戠櫥褰曞け璐ワ紒";
oCn.RollBack();
return false;
}
@@ -6265,6 +6245,52 @@
sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
oCn.RollBack();
return false;
+ }
+
+ if (oSystemParameterMain.Kf_MoveStockBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ {
+ try
+ {
+ oCn.BeginTran();
+ //瀹℃牳WMS鍗曟嵁
+ oCn.RunProc("Update Kf_ICStockBillMain Set HChecker='" + oMain.HMaker + "',HCheckDate=convert(varchar(10),getdate(),120),HBillStatus=2 where HInterID= " + oMain.HInterID.ToString());
+
+ //鎻愪氦銆佸鏍搁噾铦朵簯鍗曟嵁
+ HReturn = "";
+ string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ new object[] { "STK_TransferDirect", sJson2 });
+
+ string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ new object[] { "STK_TransferDirect", sJson3 });
+
+ HReturn = result2.ToString() + "," + result3.ToString();
+
+ if (HReturn.Contains("\"IsSuccess\":false") == true)
+ {
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紝瀹℃牳鍗曟嵁澶辫触锛�" + HReturn;
+ oCn.RollBack();
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鐢熸垚骞跺鏍哥洿鎺ヨ皟鎷ㄥ崟鎴愬姛锛佸崟鎹彿涓猴細" + oMain.HBillNo;
+ oCn.Commit();
+ return true;
+ }
+ }
+ catch (Exception e)
+ {
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曞け璐ワ紒" + e.Message;
+ oCn.RollBack();
+ return false;
+ }
+ }
+ else
+ {
+ sErrMsg = "鐢熸垚鐩存帴璋冩嫧鍗曟垚鍔燂紒鍗曟嵁鍙蜂负锛�" + oMain.HBillNo;
+ return true;
}
}
@@ -7363,7 +7389,6 @@
if (SaveMoveOut_CLD(oMain, oSystemParameterMain, ref sErrMsg))
{
//"淇濆瓨鎴愬姛锛�";
- sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
return true;
}
else
@@ -34575,61 +34600,19 @@
//婧愬崟鏉＄爜
else if (sBarBillType == "婧愬崟鏉＄爜")
{
- DataSet Ds = oCn.RunProcReturn(" select HSourceName from Xt_BarCodeType where HSourceNumber= '" + sBarCodePrefix + "' and HBillType= '" + HBillType + "'", "Xt_BarCodeType");
-
- if (Ds == null || Ds.Tables[0].Rows.Count == 0)
+ if (sBarBillName == "鍏ュ簱鐢宠鍗�")
{
- sErrMsg = "鎵�鎵簮鍗曟潯鐮佷笉灞炰簬姝ゆā鍧楁簮鍗曡寖鍥达紒";
- return null;
+ oBar = get_SourceBarCode_OtherIn(HBillID, HBillNo, HBillType, sBarCode, "1241", HMaker, HOWNERID, ref sErrMsg);
+ if (oBar == null)
+ {
+ return null;
+ }
+ return oBar;
}
else
{
- sBarBillName = Pub_Class.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HSourceName"]);
- //鎵弿婧愬崟鏉＄爜鏃跺垽鏂槸鍚﹀凡缁忔壂鎻忚繃婧愬崟淇℃伅
- if (SourceFlag)
- {
- sErrMsg = "鏄庣粏淇℃伅鍒楄〃宸叉湁鎵爜璁板綍锛屼笉鍏佽澶氭鎵弿婧愬崟鏉＄爜锛�";
- return null;
- }
- else
- {
- if (sBarBillName == "鍙戣揣閫氱煡鍗�" && HBillType == "1205")
- {
- DAL.Cls_S_IF_SeOutStockBill_Lite dal = new DAL.Cls_S_IF_SeOutStockBill_Lite();
- DataSet DS;
- //鏍规嵁鍗曟嵁鍙疯幏鍙栬繃婊ゆ潯浠�
- string sWhere = " Where 鍗曟嵁鍙� like '" + sBarCode + "'";
- DS = dal.DisSourceBillList(sWhere);
- if (DS == null || DS.Tables[0].Rows.Count <= 0)
- {
- sErrMsg = "娌℃湁杩斿洖浠讳綍璁板綍锛�";
- return null;
- }
- oBar.HBarType = "婧愬崟鏉＄爜";
- oBar.HSourceBillNo = Convert.ToString(DS.Tables[0].Rows[0]["HBillNo"]);
- oBar.HSourceBillType = Convert.ToString(DS.Tables[0].Rows[0]["HBillType"]);
- oBar.HSupID = Convert.ToInt64(DS.Tables[0].Rows[0]["HSupID"]);
- oBar.HSupName = Convert.ToString(DS.Tables[0].Rows[0]["HSupName"]);
- oBar.HDeptID = Convert.ToInt64(DS.Tables[0].Rows[0]["HDeptID"]);
- oBar.HDeptName = Convert.ToString(DS.Tables[0].Rows[0]["HDeptName"]);
- oBar.HCustom = Convert.ToString(DS.Tables[0].Rows[0]["HCustom"]);
- }
- else
- {
- sErrMsg = "婧愬崟绫诲瀷鍚嶇О璁剧疆涓嶆纭紒";
- return null;
- }
- // 灏嗘簮鍗曚俊鎭啓鍏� 涓存椂缂撳瓨琛�
- if (tem.AddNew_Source(HBillID, HBillNo, HBillType, oBar.HSourceBillNo, oBar.HSourceBillType, sRedBlue, ref sErrMsg))
- {
- return oBar;
- }
- else
- {
- sErrMsg = "淇濆瓨婧愬崟淇℃伅澶辫触锛�" + sErrMsg;
- return null;
- }
- }
+ sErrMsg = "婧愬崟绫诲瀷鍚嶇О璁剧疆涓嶆纭紒";
+ return null;
}
}
else
--
Gitblit v1.9.1