MES-WEB-API.git

			@@ -1,5 +1,6 @@
			using DBUtility;
			using Model;
			using Newtonsoft.Json;
			using Newtonsoft.Json.Linq;
			using SQLHelper;
			using System;
			@@ -128,8 +129,10 @@

			//WebS.WebService1 oWebs1 = new WebS.WebService1();
			//WebSoBar = oWebs1.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
			WebSoBar = get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			//Model.ClsKf_ICStockBill_WMS WebSoBar = new Model.ClsKf_ICStockBill_WMS();
			WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			WebS.WebService1 oWebs = new WebS.WebService1();
			WebSoBar = oWebs.get_SourceBarCode_MateOut(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, sMaker, sPPQty, sPlanMode, sFIFOWHID, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			//oBar = webserver.get_CheckTypeByBarCode_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			@@ -469,6 +472,7 @@
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HRemark = lsmain[0].HRemark;
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillType = "1204";//固定值

			if (webserver.set_SaveMateOutBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			@@ -498,7 +502,7 @@
			}
			}
			/// <summary>
			/// 生成生产领料单(红字)
			/// 生成生产退料单
			/// </summary>
			/// <returns></returns>
			[Route("MateOut/set_SaveMateOutBackBill_Json")]
			@@ -533,6 +537,7 @@
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HRemark = lsmain[0].HRemark;
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HBillType = "1244";//固定值

			if (webserver.set_SaveMateOutBackBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			@@ -802,6 +807,44 @@
			}


			//选中表体根据单据主ID返回收料通知单一些信息
			[Route("QCStockInCheckBill/DisBillEntryList_Webs_New_Json1")]
			[HttpGet]
			public object DisBillEntryList_Webs_New_Json1(long HInterID,long HEntryID)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			ds = oCN.RunProcReturn("select * from h_v_QCStockInCheckBillList where HInterID = " + HInterID + " and HEntryID = " + HEntryID + "", "h_v_QCStockInCheckBillList");
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			//DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			//刷新表体返回条码库存信息
			[Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack")]
			[HttpGet]
			@@ -826,6 +869,55 @@
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}


			//刷新表体返回条码库存信息网页PDA版
			[Route("KF_ICInventoryByMaterID/GetBillEntry_TmpList_Pack1")]
			[HttpGet]
			public object GetBillEntry_TmpList_Pack1(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere)
			{
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			List<object> columnNameList = new List<object>();
			DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventoryByMaterIDList1 '" + HBarCode + "'," + sHWHID + "," + sHSPID+","+ HOWNERID+",'"+ sWhere+"'", "h_p_KF_ICInventoryByMaterIDList");
			//添加列名
			foreach (DataColumn col in ds.Tables[0].Columns)
			{
			Type dataType = col.DataType;
			string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
			columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			//DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			objJsonResult.list = columnNameList;
			return objJsonResult;
			}
			}
			@@ -1052,5 +1144,6 @@
			return objJsonResult;
			}
			}

			}
			}