JTAPI.git - Gitblit

			@@ -383,8 +383,8 @@
			var dynamicParams = new DynamicParameters();
			try
			{
			//获取当前扫码设备是否申请维修记录
			sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status='REPA' or status='COMP'";
			//获取当前扫码设备是否存在已申请或已维修状态数据
			sql = @"select * from TEqp_RepairRequest where eqp_code=@eqpcode and status<>'CONFIR'";
			dynamicParams.Add("@eqpcode", eqpcode);
			var data0 = DapperHelper.selectdata(sql, dynamicParams);
			if (data0.Rows.Count > 0)
			@@ -579,7 +579,7 @@
			#endregion

			#region[设备维修提交]
			public static ToMessage RepairScanDeviceSave(string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
			public static ToMessage RepairScanDeviceSave(string docu_code, string username, string eqpcode, string wkshpcode, string faultdescr, string is_stoprepair, string repaircontent, string replaceparts, HttpFileCollection files)
			{
			var sql = "";
			string wxwo = "", numvalue = "";
			@@ -607,7 +607,7 @@
			string imgPath1 = "", imgPath2 = "", AbsolutePath = "";
			HttpPostedFile file = files[i];
			string imgName = DateTime.Now.ToString("yyyyMMddhhmmss") + i.ToString();
			string keyname = files.AllKeys[i].ToString();
			string keyname = files.AllKeys[i].ToString().Substring(0, files.AllKeys[i].ToString().IndexOf(";"));
			if (keyname == "files1")
			{
			imgPath1 = "/DeviceImage/image1/" + imgName + file.FileName; //通过此对象获取文件名
			@@ -618,7 +618,6 @@
			imgPath2 = "/DeviceImage/image2/" + imgName + file.FileName; //通过此对象获取文件名
			AbsolutePath = System.Web.HttpContext.Current.Server.MapPath(imgPath2);
			}

			file.SaveAs(AbsolutePath); //将上传的东西保存
			//循环写维修记录对应图片表
			sql = @"insert into TEqp_RepairImage(source_wo,wo_type,img1url,img2url)
			@@ -637,8 +636,8 @@
			}
			}
			//写入维修记录表
			sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown)
			values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown)";
			sql = @"insert into TEqp_Repair(repair_code,docu_date,status,wksp_code,eqp_code,repair_person,repair_date,repair_content,repair_part,failure_descript,is_shutdown,source_wo)
			values(@repair_code,@docu_date,@status,@wksp_code,@eqp_code,@repair_person,@repair_date,@repair_content,@repair_part,@failure_descript,@is_shutdown,@source_wo)";
			list.Add(new
			{
			str = sql,
			@@ -654,9 +653,13 @@
			repair_content = repaircontent,
			repair_part = replaceparts,
			failure_descript = faultdescr,
			is_shutdown = is_stoprepair
			is_shutdown = is_stoprepair,
			source_wo = docu_code
			}
			});
			//更新维修申请单状态
			sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
			list.Add(new { str = sql, parm = new { docu_code = docu_code, wkshpcode = wkshpcode, eqpcode = eqpcode, status = "COMP" } });

			//回写字典表,更新当前流水号
			sql = @"update T_CodeRules set value=@cunm2 where rightcode=@RightCode";
			@@ -731,7 +734,7 @@
			#endregion

			#region[维修验证详情信息]
			public static ToMessage RepairVerificationScanDeviceDataSub(string eqpcode, string wkshpcode)
			public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code, string eqpcode, string wkshpcode)
			{
			string sql = "";
			var dynamicParams = new DynamicParameters();
			@@ -741,7 +744,8 @@
			//根据设备编码\车间编码获取维修详情
			sql = @"select repair_code,failure_descript,is_shutdown,repair_content,repair_part
			from TEqp_Repair
			where wksp_code=@wkshpcode and eqp_code=@eqpcode";
			where repair_code=@repair_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
			dynamicParams.Add("@repair_code", repair_code);
			dynamicParams.Add("@wkshpcode", wkshpcode);
			dynamicParams.Add("@eqpcode", eqpcode);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			@@ -763,7 +767,7 @@
			dict.Add("repair_part", data.Rows[0]["repair_part"].ToString()); //更换备件

			//获取更换备件上传图片
			sql = @"select img1ur2 from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
			sql = @"select img2url from TEqp_RepairImage where source_wo=@source_wo and wo_type='COMP'";
			dynamicParams.Add("@source_wo", data.Rows[0]["repair_code"].ToString());
			var data1 = DapperHelper.selectdata(sql, dynamicParams);
			if (data1.Rows.Count > 0)
			@@ -798,9 +802,14 @@
			{
			var sql = "";
			List<object> list = new List<object>();
			var dynamicParams = new DynamicParameters();
			try
			{
			list.Clear();
			//根据设备维修单查找源单(维修申请单)
			sql = @"select source_wo from TEqp_Repair where repair_code=@repairwo";
			dynamicParams.Add("@repairwo", repairwo);
			var data = DapperHelper.selectdata(sql, dynamicParams);
			//更新设备维修记录验证人员、验证时间、验证结果、验证状态
			sql = @"update TEqp_Repair set status=@status,is_verifi=@is_verifi,verify_result=@verify_result,verify_person=@verify_person,verify_date=@verify_date
			where repair_code=@repair_code and wksp_code=@wksp_code and eqp_code=@eqp_code";
			@@ -819,6 +828,9 @@
			eqp_code = eqpcode
			}
			});
			//更新维修申请单状态
			sql = @"update TEqp_RepairRequest set status=@status where docu_code=@docu_code and wksp_code=@wkshpcode and eqp_code=@eqpcode";
			list.Add(new { str = sql, parm = new { docu_code = data.Rows[0]["source_wo"].ToString(), wkshpcode = wkshpcode, eqpcode = eqpcode, status = "CONFIR" } });

			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			@@ -901,7 +913,9 @@
			from TAnDon_Roul_ConFig A
			inner join TAnDonType B on A.andotype_code=B.code
			inner join TEqpInfo E on A.wkshp_code=e.wksp_code
			left join(select type,wkshp_code,eqp_code from TAnDon_Task_Info where eqp_code=@eqpcode and wkshp_code=@wkshpcode and status='START') F on A.wkshp_code=F.wkshp_code and E.code=F.eqp_code
			left join(
			select type,wkshp_code,eqp_code from TAnDon_Task_Info where eqp_code=@eqpcode and wkshp_code=@wkshpcode and status='START'
			) F on A.wkshp_code=F.wkshp_code and E.code=F.eqp_code and B.code=F.type
			where A.wkshp_code=@wkshpcode and E.code=@eqpcode and A.enable='N'";
			dynamicParams.Add("@wkshpcode", wkshpcode);
			dynamicParams.Add("@eqpcode", eqpcode);
			@@ -916,7 +930,7 @@
			mn.flag = data.Rows[i]["FLAG"].ToString();
			mn.children = new List<AnDnDateSub>();
			//根据呼叫类型id查找绑定人员
			sql = @"select U.usercode,U.username
			sql = @"select U.usercode,U.username,U.rid
			from TAnDon_Roul_ConFigUser A
			inner join TUser U on A.usercode=U.usercode
			where A.ando_cogfigid=@id";
			@@ -927,6 +941,8 @@
			for (int j = 0; j < data0.Rows.Count; j++)
			{
			AnDnDateSub sn = new AnDnDateSub();
			sn.rid= data0.Rows[j]["RID"].ToString();//rid
			sn.alias = data0.Rows[j]["RID"].ToString() + data0.Rows[j]["USERCODE"].ToString(); //别名
			sn.usercode = data0.Rows[j]["USERCODE"].ToString();
			sn.username = data0.Rows[j]["USERNAME"].ToString();
			mn.children.Add(sn);
			@@ -960,16 +976,19 @@
			public static ToMessage AppDeviceAnDengCallSave(string username, string eqpcode, string wkshpcode, List<AnDnDate> json)
			{
			string sql = "";
			int AnDnID = 0; //最大id
			var dynamicParams = new DynamicParameters();
			List<object> list = new List<object>();
			List<string> list1 = new List<string>();
			ChatHub chthub = new ChatHub();
			try
			{
			list.Clear();
			//执行消息推送
			chthub.SendByGroupList(username, wkshpcode, eqpcode, json);
			for (int i = 1; i <= json.Count; i++)
			//获取主表最大ID
			AnDnID = DapperHelper.insertReturnId("TAnDon_Task_Info");
			for (int i = 0; i < json.Count; i++)
			{
			AnDnID = AnDnID + 1;//自增1
			string code = json[i].code.ToString();
			string name = json[i].name.ToString();
			sql = @"select * from TAnDon_Task_Info where wkshp_code=@wkshpcode and eqp_code=@eqpcode and type=@typecode and status='START'";
			@@ -986,10 +1005,6 @@
			}
			else
			{
			//获取主表最大ID
			sql = @"select ISNULL(IDENT_CURRENT('TK_Wrk_Record')+@num,1) as id";
			dynamicParams.Add("@num", i);
			var dt = DapperHelper.selectdata(sql, dynamicParams);
			//写入安灯呼叫表
			sql = @"insert into TAnDon_Task_Info(wkshp_code,eqp_code,type,start_date,start_user,status)
			values(@wkshp_code,@eqp_code,@type,@start_date,@start_user,@status)";
			@@ -1006,6 +1021,7 @@
			status = "START"
			}
			});

			for (int j = 0; j < json[i].children.Count; j++)
			{
			//写入安灯记录推送人员表
			@@ -1016,17 +1032,21 @@
			str = sql,
			parm = new
			{
			m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
			m_id = AnDnID,
			//m_id = int.Parse(dt.Rows[0]["ID"].ToString()),
			wkshp_code = wkshpcode,
			eqp_code = eqpcode,
			type = code,
			resp_user = json[i].children[i].usercode,
			resp_user = json[i].children[j].usercode,
			alias= json[i].children[j].alias,
			status = "N"
			}
			});
			}
			}
			}
			//极光推送
			mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
			bool aa = DapperHelper.DoTransaction(list);
			if (aa)
			{
			@@ -1065,7 +1085,7 @@
			try
			{
			//获取对应设备及所属车间的安灯呼叫记录
			sql = @"select A.eqp_code,B.name as eqp_name,T.org_name,A.type as typecode,D.name as typename
			sql = @"select A.eqp_code,B.name as eqp_name,T.org_code as wksp_code,T.org_name as wksp_name,A.type as typecode,D.name as typename
			from TAnDon_Task_Info A
			left join TEqpInfo B on A.eqp_code=B.code
			left join TOrganization T on B.wksp_code=T.org_code
			@@ -1107,7 +1127,7 @@
			try
			{
			list.Clear();
			for (int i = 1; i <= json.Count; i++)
			for (int i = 0; i <json.Count; i++)
			{
			string code = json[i].code.ToString();
			string name = json[i].name.ToString();