~yxj/MES-WEB-API.git

			@@ -28,32 +28,23 @@
			{
			try
			{
			ds = Sc_GetMouldRepairOutHouseBill(sWhere,Organization);
			if (ds == null)
			ds = Sc_GetMouldRepairOutHouseBill(sWhere, Organization);

			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, false, user))
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBillList", 1, true, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "查询数据异常，请与管理员联系！";
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}

			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "返回记录成功！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			catch (Exception ex)
			{
			@@ -70,11 +61,11 @@
			string sql1 = string.Format(@"select * from h_v_Sc_MouldRepairOutBillList where 库存组织='" + Organization + "'");
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by 日期 desc", "h_v_Sc_MouldRepairOutBillList");
			return new SQLHelper.ClsCN().RunProcReturn(sql1+ "order by hmainid desc", "h_v_Sc_MouldRepairOutBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by 日期 desc";
			string sql = sql1 + sWhere+ "order by hmainid desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
			}

			@@ -92,7 +83,7 @@
			public object set_DeleteBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -193,7 +184,7 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, true, msg4))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -337,6 +328,8 @@
			}
			if (bResult)
			{
			string sql = $"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ";
			oCn.RunProc(sql);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "保存成功！";
			@@ -371,7 +364,7 @@
			{
			//flag=1 审核； flag=2 反审核
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Check", 1, true, user))
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			@@ -471,6 +464,8 @@
			public object Sc_MouldRepairOutBillListCheckDetai(string sqlWhere)
			{
			DataSet ds;
			DataSet ds1;
			List<object> list = new List<object>();
			try
			{
			SQLHelper.ClsCN oCN = new SQLHelper.ClsCN();
			@@ -480,11 +475,6 @@
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			FROM h_v_Sc_MouldRepairOutBillList"), "h_v_Sc_MouldRepairOutBillList");

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			else
			{
			@@ -496,12 +486,18 @@
			FROM h_v_Sc_MouldRepairOutBillList where 1=1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");

			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.data = ds.Tables[0];
			}
			//查汇总
			ds1 = oCN.RunProcReturn(string.Format(@"select 物料代码,max(物料名称)物料名称,规格型号,max(单据号)单据号,批次,sum(实收数量)实收数量,
			hwhid,max(仓库代码)仓库代码,max(仓库)仓库,子备注 from h_v_Sc_MouldRepairOutBillList
			where 1=1 " + sqlWhere + " group by 物料代码,规格型号,hwhid,批次,子备注"), "h_v_Sc_MouldRepairOutBillList");

			list.Add(ds.Tables[0]);
			list.Add(ds1.Tables[0]);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "获取信息成功！";
			objJsonResult.list = list;
			}
			catch (Exception e)
			{