~yxj/MES-WEB-API.git

			@@ -25,6 +25,7 @@
			public DataSet ds = new DataSet();
			private json objjson = new json();
			private json objJsonResult = new json();
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			//public static string sUrl = "http://183.129.128.86:9090/WEBS-WMSTest/WebService1.asmx";
			// private POInStockBillServices oclscg_poinstockbillmain = new POInStockBillServices();
			/// <summary>
			@@ -340,6 +341,159 @@
			objJsonResult.Message = "没有返回任何记录！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}



			//根据拖条码返回条码档案表唯一码信息
			[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;
			}
			}

			@@ -1882,7 +2036,7 @@
			}

			/// <summary>
			/// 获取核算方式列表
			/// 获取核算方式组列表
			/// </summary>
			/// <returns></returns>
			[Route("Web/GetClassTimePrjGroupList_Json")]
			@@ -1937,6 +2091,155 @@
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}

			[Route("Web/GetClassTimePrjGroupBillList_Json")]
			[HttpGet]
			public object GetClassTimePrjGroupBillList_Json(string sWhere,string user)
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有查看权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			string sql = "Select a.HItemID ,HNumber 核算方式组代码,HName 核算方式组名称,HDeptID,b.部门名称部门 from Gy_ClassTimePrjGroup a left join h_v_Gy_Department b on a.HDeptID=b.HItemID";
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			}
			else
			{
			sql = sql + sWhere;
			ds = oCN.RunProcReturn(sql, "Gy_ClassTimePrjGroup");
			}

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


			if (ds == null \|\| ds.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 = ds.Tables[0];
			return objjson;
			}
			}
			catch (Exception ex)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			}
			}
			#region 删除核算方式组
			/// <summary>
			/// 核算方式列表删除按钮
			///参数：string sql。
			///返回值：object。
			/// </summary>
			[Route("Web/DeleteClassTimePrjGroupBillList")]
			[HttpGet]
			public object DeleteClassTimePrjGroupBillList(long HItemID, string User)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Gy_ClassTimePrj_Delete", 1, false, User))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oCN.BeginTran();
			string sql = "delete from Gy_ClassTimePrjGroup where HItemID =" + HItemID;
			oCN.RunProc(sql);
			oCN.Commit();
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "删除成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			catch (Exception e)
			{
			oCN.RollBack();
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "Exception！" + e.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			#endregion
			/// <summary>
			/// 保存获取核算方式组
			/// </summary>
			/// <param name="msg"></param>
			/// <returns></returns>
			[Route("Web/SaveGetClassTimePrjGroupList")]
			[HttpGet]
			public object SaveGetClassTimePrjGroupList(string HNumber,string HName,string HDeptID,string refSav,string user,string HItem)
			{

			try
			{
			int HItemID = int.Parse(HItem);
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Gy_ClassTimePrj", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			string sql="";
			if (refSav== "Add")
			{
			sql = "Insert Into Gy_ClassTimePrjGroup " +
			"(HNumber,HName,HStopflag,HRemark,HShortNumber,HParentID,HLevel" +
			",HEndFlag,HHelpCode,HDeptID,HGroupID,HUseFlag" +
			") " +
			" values('" + HNumber + "','" + HName + "','','',0,0,0,0,''," + HDeptID + ",0,'未使用'" + ") ";
			}
			else
			{
			sql = "UpDate Gy_ClassTimePrjGroup set HNumber='" + HNumber + "',HName='" + HName + "',HDeptID=" + HDeptID+ " where HItemID="+ HItemID;
			}
			oCN.RunProc(sql);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			catch (Exception e)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "保存失败！" + e.ToString();
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			@@ -2109,50 +2412,99 @@
			/// <returns></returns>
			[Route("Web/GetSc_ICMOBillListView2")]
			[HttpGet]
			public object GetSc_ICMOBillListView2(string ICMOBill, int OrganizationID)
			public object GetSc_ICMOBillListView2(int page, int limit, string ICMOBill, int OrganizationID)
			{
			if (ICMOBill != "")
			{
			sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
			}
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			if (sWhere == null \|\| sWhere.Equals(""))
			SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			int count = 0;
			int pageNum = page;
			int pageSize = limit;
			string sWhere = "";
			if (ICMOBill == null \|\| ICMOBill.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
			sWhere = " where 1=1";
			}
			else
			{
			string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
			sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%'";
			}
			if (ds == null \|\| ds.Tables[0].Rows.Count <= 0)

			DataSet ds0 = oCn.RunProcReturn("select count(*) CountNum from h_v_Sc_ICMOBillList " + sWhere + "", "h_v_Sc_ICMOBillList");
			count = int.Parse(ds0.Tables[0].Rows[0]["CountNum"].ToString());
			//string sql = string.Format(@"select top " + pageSize + " hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from(select row_number() over (order by hmainid desc) as RowNumber,hmainid,日期,单据号,箱号条形码,净重,毛重,皮重,生产组织,部门,操作员,客户标签号,物料代码,物料名称,计量单位代码,计量单位名称,数量,制单人,制单日期 from h_v_PackUnionBillList " + sWhere + ") as A where RowNumber >" + pageSize + " *(" + pageNum + "-1)");
			string sql = string.Format(@"select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by hmainid offset ((" + pageNum + "-1)*" + pageSize + ") rows fetch next " + pageSize + " rows only");
			ds = new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_ICMOBillList");
			string aa = ds.Tables[0].Columns[0].ToString();

			if (ds.Tables[0].Rows.Count > 0)
			{
			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo;
			objjson.data = null;
			return objjson;
			objJsonResult.code = "1";
			objJsonResult.count = count;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = JsonConvert.DeserializeObject<DataTable>(JsonConvert.SerializeObject(ds.Tables[0], new IsoDateTimeConverter { DateTimeFormat = "yyyy-MM-dd HH:mm:ss" })); //序列化DataSet中的时间格式，然后再反序列化回来
			return objJsonResult;
			}
			else
			{
			objjson.code = "0";
			objjson.count = 1;
			objjson.Message = "获取成功!";
			objjson.data = ds.Tables[0];
			return objjson;
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "暂无记录！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception ex)
			{

			objjson.code = "0";
			objjson.count = 0;
			objjson.Message = "获取失败" + ex.ToString();
			objjson.data = null;
			return objjson;
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！" + ex.ToString();
			objJsonResult.data = null;
			return objJsonResult;
			}

			//if (ICMOBill != "")
			//{
			// sWhere = " where 1=1 and 单据号 like '%" + ICMOBill + "%' ";
			//}
			//try
			//{
			// SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			// if (sWhere == null \|\| sWhere.Equals(""))
			// {
			// ds = oCN.RunProcReturn("select * from h_v_Sc_ICMOBillList where 1=1 and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ", "h_v_Sc_ICMOBillList");
			// }
			// else
			// {
			// string sql = "select * from h_v_Sc_ICMOBillList " + sWhere + " and isnull(审核人,'')<>'' order by 单据号 desc,hsubid ";
			// ds = oCN.RunProcReturn(sql, "h_v_Sc_ICMOBillList");
			// }
			// if (ds == null \|\| ds.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 = ds.Tables[0];
			// return objjson;
			// }
			//}
			//catch (Exception ex)
			//{

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

			/// <summary>