~yxj/MES-WEB-API.git

			@@ -63,6 +63,9 @@
			}





			/// <summary>
			/// 写入临时表扫源单的方法
			/// </summary>
			@@ -70,55 +73,153 @@
			/// <returns></returns>
			[Route("MateOut/set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json")]
			[HttpGet]
			public object set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json(string HSourceBillType,string HSourceBillNo, Int64 sInterID, string sBillNo)
			public object set_SavePonderationBillMain_Temp_Mate_Source_Fast_Json(Int64 sInterID, string sBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string sMaker, Double sPPQty, Int64 sPlanMode,Int64 sFIFOWHID, Int64 HOWNERID)
			{
			//try
			//{
			// // DataSet ds = new DataSet();
			// // WebServer webserver = new WebServer();
			// string sWhere = " Where 单据号 like '%" + HSourceBillNo.Trim() + "%'";
			// ds = webserver.GetSc_PPBomBillList(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
			// {
			// //HSupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSupID"]);
			// //HSupName = Convert.ToString(ds.Tables[0].Rows[0]["HSupName"]);
			// HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
			// HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
			// if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "蓝字", 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 ex)
			//{

			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有返回任何记录！"+ex.ToString();
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			try
			{
			// DataSet ds = new DataSet();
			// WebServer webserver = new WebServer();
			string sWhere = " Where 单据号 like '%" + HSourceBillNo.Trim() + "%'";
			ds = webserver.GetSc_PPBomBillList(sWhere);
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)

			//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);
			//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)
			{
			objJsonResult.code = "0";
			objJsonResult.code = "400";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			//DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning);
			}
			else
			{
			//HSupID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSupID"]);
			//HSupName = Convert.ToString(ds.Tables[0].Rows[0]["HSupName"]);
			HDeptID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HDeptID"]);
			HDeptName = Convert.ToString(ds.Tables[0].Rows[0]["HDeptName"]);
			if (webserver.set_SavePonderationBillMain_Temp_Source_Fast(sInterID, sBillNo, HBillType, HSourceBillNo, HSourceBillType, "蓝字", 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;
			}
			objJsonResult.code = "200";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = oBar;
			return objJsonResult;
			}
			}
			catch (Exception ex)
			catch (Exception e)
			{

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

			}

			public Model.ClsKf_ICStockBill_WMS get_SourceBarCode_MateOut(Int64 HInterID, string HBillNo, string HBillType, string HSourceBillNo, string HSourceBillType, string HMaker, Double HPTQty, Int64 HPlanMode, Int64 HFIFOWhID, Int64 HOWNERID, ref string sErrMsg)
			{
			//localhost/WEBS-WMS/get_SourceBarCode_MateOut?HInterID=131793&HBillNo=MATO00001643&HBillType=1204&HSourceBillNo=PPBOM202201164&HSourceBillType=3720&HMaker=Admin&HPTQty=0&HPlanMode=0&HFIFOWhID=0&HOWNERID=100439
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			Model.ClsKf_ICStockBill_WMS oBar = new Model.ClsKf_ICStockBill_WMS();
			Int64 sMulSourceFlag = 0; //多源单标志（0为非多源单模式，1为多源单模式）

			//获取系统参数
			Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter();
			if (oSystemParameter.ShowBill(ref sErrMsg) == false)
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；扫描源单时获取系统参数失败！ " + sErrMsg;
			return null;
			}

			if (oSystemParameter.omodel.Kf_MateOutBill_MulSourceBill.ToUpper() == "Y") //系统参数生产领料单-多源单模式
			{
			sMulSourceFlag = 1;
			}

			//将源单信息存入条码出入库临时表
			DataSet ds1 = oCn.RunProcReturn("exec h_p_WMS_AddSourceBarCode_MateOut " + HInterID.ToString() + ",'" + HBillNo + "','" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + sMulSourceFlag.ToString() + ",'" + HMaker + "'," + HPTQty.ToString() + "," + HPlanMode.ToString() + "," + HFIFOWhID.ToString() + "," + HOWNERID.ToString(), "h_p_WMS_AddSourceBarCode_MateOut");
			if (ds1 == null \|\| ds1.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；将源单信息存入条码出入库临时表失败！";
			return null;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0][0]) == 0)
			{
			//先进先出控制
			if (oSystemParameter.omodel.Kf_MateOutBill_FIFOCtl == "Y") //系统参数生产领料单-先进先出控制
			{
			DataSet FIFO = oCn.RunProcReturn("exec h_p_WMS_AddSourceFIFO_MateOut " + HInterID.ToString() + ",'" + HBillType + "','" + HSourceBillNo + "','" + HSourceBillType + "'," + HFIFOWhID.ToString(), "h_p_WMS_AddSourceFIFO_MateOut");
			if (FIFO == null \|\| FIFO.Tables[0].Rows.Count == 0)
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；存入先进先出临时表失败！";
			return null;
			}
			else
			{
			if (DBUtility.ClsPub.isLong(FIFO.Tables[0].Rows[0][0]) == 1)
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；" + DBUtility.ClsPub.isStrNull(FIFO.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			}
			}
			//oBar.HMulSourceFlag = sMulSourceFlag;
			oBar.HSourceBillType = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillType"]);
			oBar.HSourceBillNo = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HSourceBillNo"]);
			oBar.HDeptID = DBUtility.ClsPub.isLong(ds1.Tables[0].Rows[0]["HDeptID"]);
			oBar.HDeptName = DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HDeptName"]);
			return oBar;
			}
			else
			{
			sErrMsg = "单据号：" + HBillNo + "，单据ID：" + HInterID + "；" + DBUtility.ClsPub.isStrNull(ds1.Tables[0].Rows[0]["HRemark"]);
			return null;
			}
			}
			}

			@@ -472,27 +573,39 @@
			[HttpGet]
			public Object get_CheckTypeByBarCode_Json(string sCode, Int64 sInterID, string HBillType, string sBillNo, string sMaker, Int64 WhID, Int64 SPID, Double sQty, bool sRedBlue, bool SourceFlag, string sSourceBillNo, string sSourceType, Int64 HOWNERID)
			{
			string sExpressNumber = "";
			WebSoBar = oWebs.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_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			try
			{
			objJsonResult.code = "0";
			string sExpressNumber = "";
			WebSoBar = oWebs.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_Out(sCode, sInterID, HBillType, sBillNo, sMaker, WhID, SPID, sQty, sRedBlue, SourceFlag, sSourceBillNo, sSourceType, HOWNERID, ref DBUtility.ClsPub.sErrInfo);
			if (WebSoBar == null)
			{
			objJsonResult.code = "400";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "200";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = oBar;
			return objJsonResult;
			}
			}
			catch (Exception e)
			{
			objJsonResult.code = "500";
			objJsonResult.count = 0;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = null;
			objJsonResult.data = e.Message.ToString();
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sErrInfo;
			objJsonResult.data = oBar;
			return objJsonResult;
			}

			}

			[Route("MateOutBackBill/get_CheckTypeByBarCode_All_Json")]
			@@ -648,6 +761,46 @@
			}
			}

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

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