~yxj/MES-WEB-API.git

			@@ -167,6 +167,7 @@
			{
			try
			{

			string sErrMsg = "";
			bool sBool = false;
			oView = webserver.get_InfoByBarCode_Source(sBarCode, sInterID, ref sBool, ref sErrMsg);
			@@ -233,6 +234,8 @@
			string msg1 = _value.ToString();
			try
			{


			List<Model.ClsKf_ICStockBillMain> lsmain = new List<Model.ClsKf_ICStockBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getICStockBillMainByJson(msg1);
			@@ -270,6 +273,60 @@
			/// 生成其他入库单
			/// </summary>
			/// <returns></returns>
			//[Route("OtherInStockBill/set_SaveOtherInStockBill_Json")]
			//[HttpPost]
			//public object set_SaveOtherInStockBill_Json([FromBody]JObject oMain)
			//{
			// var _value = oMain["oMain"].ToString();
			// string msg1 = _value.ToString();

			// try
			// {
			// List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
			// ListModels oListModels = new ListModels();
			// lsmain = oListModels.getOtherInBillMainByJson(msg1);
			// lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			// lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			// string sSourceBillType = lsmain[0].HBillType;

			// WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
			// websLsmain.HInterID = lsmain[0].HInterID;
			// websLsmain.HDate = lsmain[0].HDate;
			// websLsmain.HBillNo = lsmain[0].HBillNo;
			// websLsmain.HDeptID = lsmain[0].HDeptID;
			// websLsmain.HEmpID = lsmain[0].HEmpID;
			// websLsmain.HRemark = lsmain[0].HRemark;
			// websLsmain.HMaker = lsmain[0].HMaker;
			// websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			// websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;

			// WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
			// if (webserver.set_SaveOtherInBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 1;
			// objJsonResult.Message = "生成其他入库单成功！单据号为：";
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// else
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			// }
			// catch (Exception e)
			// {
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "上传失败！" + e.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			// }
			//}
			[Route("OtherInStockBill/set_SaveOtherInStockBill_Json")]
			[HttpPost]
			public object set_SaveOtherInStockBill_Json([FromBody]JObject oMain)
			@@ -277,14 +334,13 @@
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();


			try
			{
			List<Model.ClsKf_OtherInBillMain> lsmain = new List<Model.ClsKf_OtherInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getOtherInBillMainByJson(msg1);
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			//lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			//lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			string sSourceBillType = lsmain[0].HBillType;

			WebAPI.WebS.ClsKf_OtherInBillMain websLsmain = new WebS.ClsKf_OtherInBillMain();
			@@ -297,13 +353,17 @@
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID;
			websLsmain.HOWNERID = lsmain[0].HSTOCKORGID;
			websLsmain.HKeeperID = lsmain[0].HKeeperID;
			websLsmain.HBillType = "1203";//固定值
			websLsmain.HBillSubType = lsmain[0].HBillSubType;

			WebS.WebService1 oWebs = new WebS.WebService1();
			WebS.ClsXt_SystemParameterMain oSystemParameterMain = new WebS.ClsXt_SystemParameterMain();
			if (webserver.set_SaveOtherInBill_New(websLsmain, sSourceBillType, oSystemParameterMain, ref DBUtility.ClsPub.sErrInfo))
			if (oWebs.set_SaveOtherInBill_New(websLsmain, sSourceBillType, ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "生成其他入库单成功！单据号为：";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //成功！
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -311,7 +371,8 @@
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo; //失败！
			//objJsonResult.Message = "上传失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -362,6 +423,48 @@
			// }
			//}


			//刷新表体返回出入库条码临时表（领料出库简洁版）
			[Route("OtherInStockBill/DisBillEntryList_Webs_New_Json1")]
			[HttpGet]
			public object DisBillEntryList_Webs_New_Json1(long HBillID, string HBillNo, string HBillType, string sMouldManagerCtl, string sFIFOCtl)
			{
			try
			{
			WebS.WebService1 oWebs = new WebS.WebService1();
			ds = oWebs.GetBillEntry_TmpList(HBillID, HBillNo, HBillType, ref sMouldManagerCtl, ref sFIFOCtl, ref DBUtility.ClsPub.sErrInfo);
			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 = new
			{
			list = ds.Tables[0],
			list2 = ds.Tables[4]
			};
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			[Route("OtherInBill/Delete_Json")]
			[HttpGet]
			public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType)