~yxj/MES-WEB-API.git

			@@ -345,6 +345,159 @@
			}



			//根据拖条码返回条码档案表唯一码信息
			[Route("GroupOrder/GetBillEntry_TmpListGroupOrder")]
			[HttpGet]
			public object GetBillEntry_TmpListGroupOrder(string HBarCode)
			{
			try
			{
			ds = webserver.GetBarCode(HBarCode);
			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;
			}
			}



			//根据网格选中记录去修改条码档案、组托单子表记录并重新生成组托单sum表
			[Route("GroupOrderBill/Edit")]
			[HttpGet]
			public object Edit(string HBarCode1, Int64 HQty)
			{

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			try
			{
			oCN.RunProc("update Gy_BarCodeBill set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
			oCN.RunProc("update Sc_PackUnionBillSub set HQty = " + HQty.ToString() + " where HBarCode = '" + HBarCode1 + "'");
			DataSet ds = oCN.RunProcReturn("exec h_p_DisPlayBarCode '" + HBarCode1 + "'", "h_p_DisPlayBarCode");

			long HInterIDTTM = 0;
			long HInterID = 0;
			string HBarCode_Pack = "";
			string HBarCode = "";
			string HUser = "";
			HInterIDTTM = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID_TTM"]);
			HBarCode_Pack = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HBarCode_Pack"]);
			HUser = DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMaker"]);
			HInterID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HInterID"]);
			oCN.RunProc("exec h_p_WMS_PackUnionBill_SumSubBill " + HInterIDTTM.ToString() + ",'" + HBarCode_Pack + "','3783','" + HUser + "'," + HInterID.ToString()); //根据箱条码，写入 SUM表，SUM条码档案
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "修改成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//DataSet DS1 = webserver.GetBarCode(HBarCode); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);

			//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


			//if (DS1 == null \|\| DS1.Tables[0].Rows.Count <= 0)
			// {
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			// objjson.data = null;
			// return objjson;
			// }
			// else
			// {
			// objjson.code = "0";
			// objjson.count = 1;
			// objjson.Message = "获取成功!";
			// objjson.data = DS1.Tables[0];
			// return objjson;
			// }
			//}
			catch (Exception ex)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			//根据网格选中记录的唯一码去删除条码档案组托单子表组托单sum表的唯一码数据
			[Route("GroupOrderBill/Delete")]
			[HttpGet]
			public object Delete(string HBarCode1)
			{

			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			try
			{
			oCN.RunProc("delete from Gy_BarCodeBill where HBarCode = '" + HBarCode1 + "'");
			oCN.RunProc("delete from Sc_PackUnionBillSub where HBarCode = '" + HBarCode1 + "'");
			oCN.RunProc("delete from Sc_PackUnionBillSub_Sum where HBarCode = '" + HBarCode1 + "'"); //HSPID = DBUtility.ClsPub.isLong(ds.Tables[0].Rows[0]["HSPID"]);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo);


			//if (DS1 == null \|\| DS1.Tables[0].Rows.Count <= 0)
			// {
			// objjson.code = "0";
			// objjson.count = 0;
			// objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			// objjson.data = null;
			// return objjson;
			// }
			// else
			// {
			// objjson.code = "0";
			// objjson.count = 1;
			// objjson.Message = "获取成功!";
			// objjson.data = DS1.Tables[0];
			// return objjson;
			// }
			//}
			catch (Exception ex)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "删除失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}


			//根据黑点/白点返回不良代码、不良内码
			[Route("Web/GetHWBDot")]
			[HttpGet]
			@@ -679,23 +832,26 @@
			}
			}


			/// <summary>
			/// 获取供应商列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetSupplierList_Json")]
			[HttpGet]
			public object GetSupplierList_Json(string Supplier)
			public object GetSupplierList_Json(string Supplier, Int64 HOrgID)
			{
			sWhere = " Where HStopFlag=0 and HEndFlag=1";
			sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID =" + HOrgID + "";
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (Supplier != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' ) ";
			sWhere = sWhere + " and ( HNumber like '%" + Supplier + "%' or HName like '%" + Supplier + "%' or HUSEORGID like '%" + Supplier + "%' ) ";
			}
			try
			{
			ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			WebS.WebService1 oWeb = new WebS.WebService1();
			ds = oWeb.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			//ds = webserver.GetSupplierList(sWhere, ref DBUtility.ClsPub.sErrInfo);
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)
			{
			objjson.code = "0";
			@@ -1078,7 +1234,7 @@
			//sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString();
			if (sWhere != "")
			{
			sWhere = sWhere + " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
			sWhere = " and ( HNumber like '%" + sWhere + "%' or HName like '%" + sWhere + "%' ) ";
			}
			try
			{