yl
2022-10-25 dd651f9ce0156fc7db869da04e0c2004a1811c52
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -655,12 +655,12 @@
                        repair_part = replaceparts,
                        failure_descript = faultdescr,
                        is_shutdown = is_stoprepair,
                        source_wo= docu_code
                        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" } });
                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";
@@ -735,7 +735,7 @@
        #endregion
        #region[维修验证详情信息]
        public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code,string eqpcode, string wkshpcode)
        public static ToMessage RepairVerificationScanDeviceDataSub(string repair_code, string eqpcode, string wkshpcode)
        {
            string sql = "";
            var dynamicParams = new DynamicParameters();
@@ -914,7 +914,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);
@@ -973,16 +975,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'";
@@ -999,10 +1004,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)";
@@ -1019,6 +1020,7 @@
                                status = "START"
                            }
                        });
                        for (int j = 0; j < json[i].children.Count; j++)
                        {
                            //写入安灯记录推送人员表
@@ -1029,17 +1031,20 @@
                                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,
                                    status = "N"
                                }
                            });
                        }
                    }
                }
                //极光推送
                //mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
                bool aa = DapperHelper.DoTransaction(list);
                if (aa)
                {