~yxj/MES-WEB-API.git

			@@ -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>
			/// 生成外购入库单K3
			@@ -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
			}
			}