~yxj/MES-WEB-API.git

			@@ -1132,7 +1132,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SavePOStockInBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -1622,7 +1622,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveEntrustInBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -1860,7 +1860,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveProductInBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -2315,7 +2315,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveMateOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -2872,7 +2872,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveSellOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -3909,7 +3909,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveMoveStockBill(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -4024,28 +4024,28 @@



			public bool set_SaveMoveStockBill_PD(WebAPI.WebS.ClsKf_MoveStockBillMain oMain, string sHSourceType, ref string sErrMsg)
			{
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveMoveStockBill_PD(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			{
			sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + sErrMsg;
			return false;
			}
			//public bool set_SaveMoveStockBill_PD(WebAPI.WebS.ClsKf_MoveStockBillMain oMain, string sHSourceType, ref string sErrMsg)
			//{
			// WebS.WebService1 oWebs = new WebS.WebService1();
			// if (oWebs.set_SaveMoveStockBill_PD(oMain, sHSourceType, ref sErrMsg))
			// {
			// sErrMsg = "保存成功！" + oMain.HBillNo;
			// return true;
			// }
			// else
			// {
			// sErrMsg = "单据号：" + oMain.HBillNo + ", 单据ID：" + oMain.HInterID + ";" + 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;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -4622,12 +4622,12 @@
			//判断是否反写成功
			if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			{
			sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			//sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			return true;
			}
			}
			@@ -4663,6 +4663,33 @@
			return false;
			}
			}


			//public bool set_SavePOInStockBill_NEW_Json(WebAPI.WebS.ClsCg_POInStockBillMain oMain, 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_SavePOInStockBill_Json(oMain, 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>
			@@ -5030,7 +5057,7 @@
			// sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			// return true;
			//}
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -5111,7 +5138,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveMateOutBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -5573,12 +5600,12 @@
			//判断是否反写成功
			if (set_UpdateHStatus(oMain.HInterID, oMain.HExplanation.ToString()))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			{
			sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			//sErrMsg = "保存成功！" + oMain.HBillNo + "状态反写失败！";
			return true;
			}
			}
			@@ -5843,7 +5870,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveEntrustOutBackBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -6369,7 +6396,7 @@
			WebS.WebService1 oWebs = new WebS.WebService1();
			if (oWebs.set_SaveEntrustOutBill_New(oMain, sHSourceType, ref sErrMsg))
			{
			sErrMsg = "保存成功！" + oMain.HBillNo;
			//sErrMsg = "保存成功！" + oMain.HBillNo;
			return true;
			}
			else
			@@ -7965,6 +7992,22 @@
			}
			#endregion

			#region [获取默认打印模板]
			/// <summary>
			/// 默认打印模板
			/// </summary>
			/// <param name="sWhere"></param>
			/// <param name="sErr"></param>
			/// <returns></returns>
			public DataSet GetDefaultOpenTmp(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

			//返回条码临时表
			/// <summary>
			/// 返回条码临时表