~yxj/MES-WEB-API.git

			@@ -35,7 +35,7 @@
			public bool sRedBlueFlag = false;
			public bool SourceFlag = false;
			//public string sSourceType = "1601";
			// public bool sRedBlue = false;
			// public bool sRedBlue = false;
			public WebServer webserver = new WebServer();
			public DataSet ds = new DataSet();
			public ClsGy_BarCodeBill_WMS_Model_View oView = new ClsGy_BarCodeBill_WMS_Model_View();
			@@ -44,6 +44,7 @@
			private JsonResult objJsonResult = new JsonResult();
			public WebS.WebService1 oWebs = new WebS.WebService1();
			public WebS.ClsKf_ICStockBill_WMS WebSoBar = new WebS.ClsKf_ICStockBill_WMS();
			public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();

			/// <summary>
			/// 委外入库/扫条码/直接调webservice
			@@ -82,24 +83,11 @@
			try
			{
			ds = webserver.GetKf_PonderationBillMain_TempList(HBillType, sWhere);
			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;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception e)
			{
			@@ -119,7 +107,7 @@
			[HttpGet]
			public Object get_CheckTypeByBarCode_All_Json(string sCode, Int64 sInterID, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID, string sExpressNumber)
			{
			oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID,sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			oBar = webserver.get_CheckTypeByBarCode_All(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, sExpressNumber, ref DBUtility.ClsPub.sErrInfo);
			if (oBar == null)
			{
			objJsonResult.code = "0";
			@@ -178,13 +166,14 @@
			return objJsonResult;
			}
			}

			/// <summary>
			/// 生成委外入库单
			/// </summary>
			/// <returns></returns>
			[Route("Kf_EntrustInBill/set_SaveEntrustInBill_Json")]
			[HttpPost]
			public object set_SaveEntrustInBill_Json([FromBody]JObject oMain)
			public object set_SaveEntrustInBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			@@ -255,7 +244,7 @@
			/// <returns></returns>
			[Route("Kf_EntrustInBill/set_SaveEntrustInBill_New_Json")]
			[HttpPost]
			public object set_SaveEntrustInBill_New_Json([FromBody]JObject oMain)
			public object set_SaveEntrustInBill_New_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			@@ -398,7 +387,7 @@
			/// <returns></returns>
			[Route("Kf_EntrustInBill/set_SaveEntrustInBackBill_Json")]
			[HttpPost]
			public object set_SaveEntrustInBackBill_Json([FromBody]JObject oMain)
			public object set_SaveEntrustInBackBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			@@ -448,5 +437,144 @@
			return objJsonResult;
			}
			}


			#region 委外出库
			/// <summary>
			/// 委外出库/提交/直接调用webservice
			/// </summary>
			/// <returns></returns>
			[Route("Kf_EntrustInBill/set_SaveEntrustOutBill_Json")]
			[HttpPost]
			public object set_SaveEntrustOutBill_Json([FromBody] JObject oMain)
			{
			var _value = oMain["oMain"].ToString();
			string msg1 = _value.ToString();
			try
			{
			List<Model.ClsKf_EntrustInBillMain> lsmain = new List<Model.ClsKf_EntrustInBillMain>();
			ListModels oListModels = new ListModels();
			lsmain = oListModels.getEntrustInBillMainByJson(msg1);
			lsmain[0].HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year);
			lsmain[0].HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd"));
			lsmain[0].HBillType = "1211";

			WebAPI.WebS.ClsKf_EntrustInBillMain websLsmain = new WebS.ClsKf_EntrustInBillMain();

			websLsmain.HInterID = lsmain[0].HInterID;
			websLsmain.HInnerBillNo = "";
			websLsmain.HDate = lsmain[0].HDate;
			websLsmain.HBillNo = lsmain[0].HBillNo;
			websLsmain.HBillType = lsmain[0].HBillType;
			websLsmain.HBillerID = DBUtility.ClsPub.isLong(DBUtility.ClsPub.CurUserID);
			websLsmain.HDeptID = lsmain[0].HDeptID;
			websLsmain.HEmpID = lsmain[0].HEmpID;
			websLsmain.HRemark = "";
			websLsmain.HRedBlueFlag = lsmain[0].HRedBlueFlag;
			websLsmain.HMaker = lsmain[0].HMaker;
			websLsmain.HSupID = lsmain[0].HSupID;
			websLsmain.HSecManagerID = lsmain[0].HSecManagerID;
			websLsmain.HSCWHID = lsmain[0].HSCWHID;
			websLsmain.HKeeperID = lsmain[0].HKeeperID;
			websLsmain.HMainSourceBillType = "1604";
			websLsmain.HMangerID = lsmain[0].HMangerID;
			websLsmain.HWHID = lsmain[0].HWHID;
			websLsmain.HExplanation = lsmain[0].HExplanation;
			websLsmain.HBillType = "1211";//固定值

			string sSourceBillType = "1604";

			if (webserver.set_SaveEntrustInBill_New(websLsmain, sSourceBillType, 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 = websLsmain;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{

			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "上传失败！异常" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}

			/// <summary>
			/// 委外出库扫描源单，将源单信息写入条码临时表
			/// </summary>
			/// <param name="HSourceBillNo"></param>
			/// <returns></returns>
			[Route("Kf_EntrustInBill/GetWW_PPBomBillMainByHSourceBillNo")]
			[HttpGet]
			public object GetWW_PPBomBillMainByHSourceBillNo(string HSourceBillType, string HSourceBillNo, Int64 sInterID, string sBillNo)
			{
			try
			{
			string sWhere = " Where 单据号 like '%" + HSourceBillNo.Trim() + "%'";
			if (HSourceBillType == "1604")
			{
			ds = oCn.RunProcReturn("Select HBillNo,HSupID,s.HName HSupName from WW_PPBomBillMain a left join Gy_Supplier s on a.HSupID=s.HItemID Where HBillNo='" + HSourceBillNo+"'", "WW_PPBomBillMain");
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录,源单类型有错误！";
			objJsonResult.data = null;
			return objJsonResult; ;
			}

			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
			{
			if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, "1211", HSourceBillNo, HSourceBillType, "蓝字", ref DBUtility.ClsPub.sErrInfo))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "写入临时表失败！" + DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			}
			catch (Exception ex)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			}
			}