From bc6ac881fd5cb8cd71f27b28394977d1e200da3e Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期二, 21 十二月 2021 15:15:52 +0800
Subject: [PATCH] Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API
---
WebAPI/WebServer.cs | 217 +++++++++++++++++++++++++++++++++++-------------------
1 files changed, 140 insertions(+), 77 deletions(-)
diff --git a/WebAPI/WebServer.cs b/WebAPI/WebServer.cs
index abac15c..6509869 100644
--- a/WebAPI/WebServer.cs
+++ b/WebAPI/WebServer.cs
@@ -5,7 +5,7 @@
using System.Data;
using System.Linq;
using System.Web;
-using Kingdee.BOS.WebApi.Client;
+//using Kingdee.BOS.WebApi.Client;
namespace WebAPI
@@ -122,6 +122,7 @@
//return dal.GetList(sWhere);
}
#endregion
+
#region 涓�閿壂鐮� 鍏ュ簱妯″潡
@@ -1120,6 +1121,7 @@
}
#endregion
+
#region 澶栬喘閫�鏂� 澶栬喘鍏ュ簱锛堢孩瀛楋級 *
@@ -3989,6 +3991,25 @@
//sErrMsg = "淇濆瓨璋冩嫧鍗曞け璐ワ紒" + sErrMsg;
//return false;
}
+
+ public bool set_MoveStockStepOutBill(WebAPI.WebS.ClsKf_MoveStockStepOutBillMain oMain, string sHSourceType, ref string sErrMsg)
+ {
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SaveMoveStockStepOutBill_New(oMain, sHSourceType, ref sErrMsg))
+ {
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
+ return false;
+ }
+
+
+ }
+
+
//鍒犻櫎璁板綍
public bool set_DelPonderationBillMain_Temp_InterIDAndSource(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType, ref string sErrMsg)
{
@@ -4484,6 +4505,33 @@
return false;
}
}
+
+ public bool set_SaveICMOReportBill_Json(WebAPI.WebS.ClsSc_ICMOReportBillMain oMain, string sHSourceType, ref string sErrMsg)
+ {
+ //BLL.ClsKf_POStockInBill bll = new BLL.ClsKf_POStockInBill();
+ //return bll.set_SavePOStockInBill_New(oMain, sHSourceType, ref DBUtility.ClsPub.sExeReturnInfo);
+ WebS.WebService1 oWebs = new WebS.WebService1();
+ if (oWebs.set_SaveICMOReportBill_New(oMain, sHSourceType, ref sErrMsg))
+ {
+ //鍒ゆ柇鏄惁鍙嶅啓鎴愬姛
+ //if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
+ //{
+ sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo;
+ return true;
+ //}
+ //else
+ //{
+ // sErrMsg = "淇濆瓨鎴愬姛锛�" + oMain.HBillNo + "鐘舵�佸弽鍐欏け璐ワ紒";
+ // return true;
+ //}
+ }
+ else
+ {
+ sErrMsg = "鍗曟嵁鍙凤細" + oMain.HBillNo + ", 鍗曟嵁ID锛�" + oMain.HInterID + ";" + sErrMsg;
+ return false;
+ }
+ }
+
/// <summary>
/// 鐢熸垚澶栬喘鍏ュ簱鍗昁3
@@ -6106,48 +6154,48 @@
//鐢熸垚 濮斿鍑哄簱
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",
- new object[] { "SUB_PickMtrl", sJson });
+ //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",
+ // new object[] { "SUB_PickMtrl", sJson });
- if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "SUB_PickMtrl", sJson2 });
+ // if (oSystemParameterMain.Kf_EntrustOutBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ // {
+ // string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ // var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ // new object[] { "SUB_PickMtrl", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "SUB_PickMtrl", sJson3 });
+ // string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ // var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ // new object[] { "SUB_PickMtrl", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
- }
- else
- {
- HReturn = result.ToString();
- }
- if (HReturn.Contains("\"IsSuccess\":false") == true)
- {
- sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒" + HReturn + sJson;
- oCn.RollBack();
- return false;
- }
- else
- {
- oCn.Commit();
+ // HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ // }
+ // else
+ // {
+ // HReturn = result.ToString();
+ // }
+ // if (HReturn.Contains("\"IsSuccess\":false") == true)
+ // {
+ // sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒" + HReturn + sJson;
+ // oCn.RollBack();
+ // return false;
+ // }
+ // else
+ // {
+ // oCn.Commit();
return true;
- }
- }
- else
- {
- sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
- oCn.RollBack();
- return false;
- }
+ //}
+ //}
+ //else
+ //{
+ // sErrMsg = "鐢熸垚濮斿鍑哄簱鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
}
}
catch (Exception e)
@@ -7232,48 +7280,48 @@
//鐢熸垚 鍏朵粬鍏ュ簱鍗� 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",
- new object[] { "STK_MISCELLANEOUS", sJson });
+ //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",
+ // new object[] { "STK_MISCELLANEOUS", sJson });
- if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
- {
- string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
- new object[] { "STK_MISCELLANEOUS", sJson2 });
+ // if (oSystemParameterMain.Kf_OtherInBill_AutoCheck == "Y") //绯荤粺鍙傛暟 鑷姩瀹℃牳
+ // {
+ // string sJson2 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ // var result2 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Submit",
+ // new object[] { "STK_MISCELLANEOUS", sJson2 });
- string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
- var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
- new object[] { "STK_MISCELLANEOUS", sJson3 });
+ // string sJson3 = "{\"CreateOrgId\":0,\"Numbers\":[\"" + oMain.HBillNo + "\"]}";
+ // var result3 = client.Execute<string>("Kingdee.BOS.WebApi.ServicesStub.DynamicFormService.Audit",
+ // new object[] { "STK_MISCELLANEOUS", sJson3 });
- HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
- }
- else
- {
- HReturn = result.ToString();
- }
- if (HReturn.Contains("\"IsSuccess\":false") == true)
- {
- sErrMsg = "鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson;
- oCn.RollBack();
+ // HReturn = result.ToString() + "," + result2.ToString() + "," + result3.ToString();
+ // }
+ // else
+ // {
+ // HReturn = result.ToString();
+ // }
+ // if (HReturn.Contains("\"IsSuccess\":false") == true)
+ // {
+ // sErrMsg = "鍏朵粬鍏ュ簱鍗曞け璐ワ紒" + HReturn + sJson;
+ // oCn.RollBack();
return false;
- }
- else
- {
- oCn.Commit();
- return true;
- }
- }
- else
- {
- sErrMsg = "鍏朵粬鍏ュ簱鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
- oCn.RollBack();
- return false;
- }
+ //}
+ //else
+ //{
+ // oCn.Commit();
+ // return true;
+ //}
+ //}
+ //else
+ //{
+ // sErrMsg = "鍏朵粬鍏ュ簱鍗曞け璐ワ紒鐧诲綍澶辫触锛�";
+ // oCn.RollBack();
+ // return false;
+ //}
}
}
catch (Exception e)
@@ -7769,5 +7817,20 @@
}
#endregion
+ #region [鑾峰彇鎵撳嵃妯℃澘]
+ /// <summary>
+ /// 鎵撳嵃妯℃澘鍒楄〃
+ /// </summary>
+ /// <param name="sWhere"></param>
+ /// <param name="sErr"></param>
+ /// <returns></returns>
+ public DataSet GetOpenTmpList(string sWhere, ref string sErr)
+ {
+ SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
+ DataSet ds = new DataSet();
+ ds = oCn.RunProcReturn("select * from h_v_IF_OpenTmpList " + sWhere, "h_v_IF_OpenTmpList");
+ return ds;
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.1