~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, false, 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 制单日期 desc", "h_v_Sc_MouldRepairOutBillList");
			}
			else
			{
			string sql = sql1 + sWhere+ "order by 日期 desc";
			string sql = sql1 + sWhere+ "order by 制单日期 desc";
			return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");
			}

			@@ -139,9 +130,21 @@
			objJsonResult.data = null;
			return objJsonResult;
			}
			//删除前查找当前单据的所有器具ID
			//string swhere = "";
			//DataSet ds = oCn.RunProcReturn("select HMaterID from Sc_MouldStockBillSub where HinterID=" + HInterID, "Sc_MouldStockBillSub");
			//for (var i = 0; i < ds.Tables[0].Rows.Count; i++)
			//{
			// swhere = swhere + ds.Tables[0].Rows[i]["HMaterID"].ToString() + ",";
			//}
			//swhere = swhere.Substring(0, swhere.Length - 1);
			bool IsDete = oBill.DeleteBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo);
			if (IsDete)
			{
			//删除成功修改器具档案位置
			//string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 0,0,'{swhere}' ");
			string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
			oCn.RunProc(sql);
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo;
			@@ -330,15 +333,19 @@
			{
			// bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo);
			string sql = string.Format($"exec h_p_Sc_MouldChangeFileStatus 'out',{oBill.omodel.HInterID.ToString()} ");
			oCn.RunProc(sql);
			}
			else
			{
			bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo);
			//修改成功
			//string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID 1,{oBill.omodel.HInterID.ToString()},' ' ");
			string sql = string.Format($"exec h_p_Sc_MouldChangeNowWHID ");
			oCn.RunProc(sql);
			}
			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 = "保存成功！";
			@@ -470,7 +477,7 @@
			#region[器具改制出库单编辑时获取表体数据]
			[Route("Sc_MouldRepairOutBill/Sc_MouldRepairOutBillListCheckDetai1")]
			[HttpGet]
			public object Sc_MouldRepairOutBillListCheckDetai(string sqlWhere)
			public object Sc_MouldRepairOutBillListCheckDetai1(string sqlWhere)
			{
			DataSet ds;
			DataSet ds1;
			@@ -482,7 +489,7 @@
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldRepairOutBillList"), "h_v_Sc_MouldRepairOutBillList");
			}
			else
			@@ -491,7 +498,7 @@
			//string sql1 = "select HRepairCheckID,HRepairCheckContent,HManagerID,HRemark from Sc_MouldRepairCheckBillSub where 1 = 1 ";
			string sql1 = string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码 HUnitCode,计量单位 HUnitName
			FROM h_v_Sc_MouldRepairOutBillList where 1=1 ");
			string sql = sql1 + sqlWhere;
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairOutBillList");