~yxj/MES-WEB-API.git

			@@ -16,6 +16,7 @@
			public DBUtility.ClsPub.Enum_BillStatus BillStatus;//单据状态（新增，修改，浏览，更新单价，变更）
			private json objJsonResult = new json();
			public DataSet ds = new DataSet();
			public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN();
			public DLL.ClsSc_MouldRepairOutBill BillNew0 = new DLL.ClsSc_MouldRepairOutBill(); //模具改制出库对应单据类
			public DLL.ClsSc_MouldRepairOutBill BillOld0 = new DLL.ClsSc_MouldRepairOutBill(); //模具改制出库对应单据类

			@@ -27,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("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)
			{
			@@ -69,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");
			}

			@@ -91,7 +83,7 @@
			public object set_DeleteBill(string HInterID,string user)
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("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;
			@@ -192,11 +184,11 @@
			try
			{
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log("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;
			objJsonResult.Message = "无删除权限！";
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -336,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 = "保存成功！";
			@@ -363,217 +357,84 @@
			}
			#endregion

			#region [模具改制出单审核、反审核]
			/// <summary>
			/// 审核
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Sc_MouldRepairOutBill/set_CheckBill")]
			#region 器具改制出库单审核/反审核
			[Route("Sc_MouldRepairOutBill/AuditMouldRepairOutBill")]
			[HttpGet]
			public object set_CheckBill(int HInterID, string CurUserName)
			public object AuditMouldRepairOutBill(string HInterID, string user, int flag)
			{
			string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			DLL.ClsSc_MouldRepairOutBill oBill = new DLL.ClsSc_MouldRepairOutBill();
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//审核前判断是否允许
			string s = "";
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "，不允许审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID小于0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已作废!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HChecker.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已审核!不能再次审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//审核提交
			if (oBill.CheckBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)
			//flag=1 审核； flag=2 反审核
			//编辑权限
			if (!DBUtility.ClsPub.Security_Log_second("Sc_MouldRepairOut_SingleBill_Check", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！" + e.ToString();
			objJsonResult.Message = "无审核权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			/// <summary>
			/// 反审核
			/// </summary>
			/// <param name="HInterID">单据ID</param>
			/// <param name="CurUserName">审核人</param>
			/// <returns></returns>
			[Route("Sc_MouldRepairOutBill/set_AbandonCheck")]
			[HttpGet]
			public object set_AbandonCheck(int HInterID, string CurUserName)
			{
			string ModRightNameCheck = "Sc_MouldRepairOut_SingleBill_Check";
			DBUtility.ClsPub.CurUserName = CurUserName;
			DLL.ClsSc_MouldRepairOutBill oBill = new DLL.ClsSc_MouldRepairOutBill();
			try
			{
			//审核权限
			if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "反审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反审核前判断
			string s = "";
			if (!DBUtility.Xt_BaseBillFun.Fun_AllowCheckBill(oBill, ref s))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = s + "，不允许反审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (HInterID <= 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "HInterID小于0！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			//查看是否已审核,关闭,作废
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (oBill.omodel.HCloseMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已关闭!不能再次反审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HDeleteMan.Trim() != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据已作废!不能再次反审核！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (oBill.omodel.HChecker.Trim() == "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未审核!不需要反审核!";
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据不存在!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			//反审核提交AbandonCheck
			if (oBill.AbandonCheck(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo) == true)
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核失败!原因:" + DBUtility.ClsPub.sExeReturnInfo;
			objJsonResult.data = null;
			return objJsonResult;
			}
			}
			catch (Exception e)

			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);
			if (lngBillKey == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "反审核失败！" + e.ToString();
			objJsonResult.Message = "单据ID为空！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			DLL.ClsSc_MouldProdOutBill oBill = new DLL.ClsSc_MouldProdOutBill();
			if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			if (flag == 1)
			{
			if (oBill.omodel.HBillStatus == 2)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据已审核，无需再次审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string HCheckDate = DateTime.Now.Date.ToString();
			oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker ='" + user + "',HCheckDate='" + HCheckDate + "',HBillStatus=2 Where HBillType='3825' and HInterID=" + HInterID);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "审核成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}
			else
			{
			if (oBill.omodel.HBillStatus == 1)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "当前单据未审核，无需反审核";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			string HCheckDate = DateTime.Now.Date.ToString();
			oCn.RunProc(" Update Sc_MouldStockBillMain set HChecker=' ',HCheckDate=' ',HBillStatus=1 Where HBillType='3825' and HInterID=" + HInterID);
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "反审核成功！";
			objJsonResult.data = 1;
			return objJsonResult;
			}
			}

			}
			else
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "单据未找到";
			objJsonResult.data = null;
			return objJsonResult;
			}
			@@ -603,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();
			@@ -610,13 +473,8 @@
			{
			ds = oCN.RunProcReturn(string.Format(@"SELECT HMaterID,模具代码 HMaterCode,模具名称 HMaterName,规格型号 HMaterSpec,
			批次 HBatchNo,设计寿命 HDesignLife, 剩余寿命 HLeaveLife, 使用寿命 HUseLife,应收数量 HQtyMust,
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark
			实收数量 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
			{
			@@ -624,16 +482,22 @@
			//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
			实收数量 HQty, HWHID, 仓库代码 HWHCode,仓库 HWHName,子备注 HRemark,HStockOrgID,HUnitID,计量单位代码,计量单位
			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)
			{