MES-WEB-API.git

			@@ -25,37 +25,45 @@
			#region 器具维修派工单查询
			[Route("Sc_MouldRepairSendWorkBill/GetMouldRepairSendWorkBillList")]
			[HttpGet]
			public object GetMouldRepairSendWorkBillList(string sWhere)
			public object GetMouldRepairSendWorkBillList(string sWhere,string user)
			{
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBillList", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无查看权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			if (sWhere == null \|\| sWhere.Equals(""))
			{
			ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill ", "h_v_Sc_MouldRepairSendWorkBill");
			ds = oCN.RunProcReturn("select * from h_v_Sc_MouldRepairSendWorkBill order by hmainid desc ", "h_v_Sc_MouldRepairSendWorkBill");
			}
			else
			{
			string sql1 = "select * from h_v_Sc_MouldRepairSendWorkBill where 1 = 1 ";
			string sql = sql1 + sWhere;
			string sql = sql1 + sWhere+ " order by hmainid desc ";
			ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldRepairSendWorkBill");
			}

			if (ds == null \|\| ds.Tables[0].Rows.Count == 0)
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有返回任何记录！";
			objJsonResult.data = null;
			return objJsonResult;
			}
			else
			{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			}
			//if (ds.Tables[0].Rows.Count != 0 \|\| ds != null)
			//{
			objJsonResult.code = "1";
			objJsonResult.count = 1;
			objJsonResult.Message = "Sucess！";
			objJsonResult.data = ds.Tables[0];
			return objJsonResult;
			//}
			//else
			//{
			//objJsonResult.code = "0";
			//objJsonResult.count = 0;
			//objJsonResult.Message = "无数据";
			//objJsonResult.data = null;
			//return objJsonResult;
			//}
			}
			catch (Exception e)
			{
			@@ -101,10 +109,19 @@
			string msg2 = sArray[0].ToString();
			string msg3 = sArray[1].ToString();

			int hentryid = int.Parse(sArray[2].ToString());//子表的顺序id
			int OperationType = int.Parse(sArray[3].ToString());//数据类型 1添加 3修改
			int OperationType = int.Parse(sArray[2].ToString());//数据类型 1添加 3修改
			string msg4 = sArray[3].ToString();
			try
			{
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Edit", 1, false, msg4))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "无保存权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			omodel = Newtonsoft.Json.JsonConvert.DeserializeObject<ClsSb_MouldRepairWorkBillMain>(msg2);
			string BillType = "3843";

			@@ -165,10 +182,10 @@
			" where HInterID=" + omodel.HInterID.ToString());

			//删除子表
			oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "' and HEntryID='" + hentryid + "'");
			oCN.RunProc("delete from Sc_MouldRepairSendWorkBillSub where HInterID='" + omodel.HInterID.ToString() + "'");
			}
			//保存子表
			objJsonResult = AddBillSub(msg3, hentryid);
			objJsonResult = AddBillSub(msg3);
			if (objJsonResult.code == "0")
			{
			objJsonResult.code = "0";
			@@ -194,7 +211,7 @@
			}
			}

			public json AddBillSub(string msg3, int hentryid)
			public json AddBillSub(string msg3)
			{
			DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<ClsSb_MouldRepairWorkBillSub>>(msg3);
			int i = 1;
			@@ -206,7 +223,7 @@
			",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" +
			",HRepairID,HRepairExplanation,HManagerID,HMoney" +
			") values("
			+ omodel.HInterID.ToString() + "," + (hentryid == -1 ? i : hentryid) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			+ omodel.HInterID.ToString() + "," + (i) + ",'" + oSub.HCloseMan + "','" + DateTime.Now + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" +
			"," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() +
			"," + oSub.HRepairID.ToString() + ",'" + oSub.HRepairExplanation + "'," + oSub.HManagerID.ToString() + "," + oSub.HMoney.ToString() +
			") ");
			@@ -225,37 +242,30 @@
			#region 器具维修派工单删除
			[Route("Sc_MouldRepairSendWorkBill/MouldDeleteBill")]
			[HttpGet]
			public object MouldDeleteBill(long HInterID, string User, string ModRightNameDelete)
			public object MouldDeleteBill(long HInterID, string user)
			{
			try
			{
			//判断权限
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameDelete, 1, true, User))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "没有删除权限";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

			if (oBill.omodel.HBillStatus > 1)
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Delete", 1, false, user))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据当前处于不能删除的状态";
			objJsonResult.count = 0;
			objJsonResult.Message = "没有删除权限";
			objJsonResult.data = null;
			return objJsonResult;
			}
			oBill.ShowBill(HInterID, ref DBUtility.ClsPub.sExeReturnInfo);

			if (oBill.omodel.HChecker != "")
			{
			objJsonResult.code = "0";
			objJsonResult.count = 1;
			objJsonResult.Message = "单据当前已审核";
			objJsonResult.Message = "单据已经审核,不能删除！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			if (oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo))
			{
			objJsonResult.code = "1";
			@@ -289,19 +299,19 @@
			[HttpGet]
			public object CheckDeOAuditBill(int HInterID, int IsAudit, string CurUserName)
			{
			// string ModRightNameCheck = ""; 该模块的审核功能

			DBUtility.ClsPub.CurUserName = CurUserName; //存储用户名
			try
			{
			//判断是否有审核权限
			//if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, true, CurUserName))
			//{
			// objJsonResult.code = "0";
			// objJsonResult.count = 0;
			// objJsonResult.Message = "审核失败！无权限！";
			// objJsonResult.data = null;
			// return objJsonResult;
			//}
			if (!DBUtility.ClsPub.Security_Log("Sc_MouldRepairSendWorkBill_Check", 1, false, CurUserName))
			{
			objJsonResult.code = "0";
			objJsonResult.count = 0;
			objJsonResult.Message = "审核失败！无权限！";
			objJsonResult.data = null;
			return objJsonResult;
			}

			//判断id 是否大于0
			if (HInterID <= 0)
			@@ -313,6 +323,7 @@
			return objJsonResult;
			}


			//转换id
			Int64 lngBillKey = 0;
			lngBillKey = DBUtility.ClsPub.isLong(HInterID);