VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -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 = "";
@@ -637,8 +637,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 +654,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 +735,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 +745,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 +768,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 +803,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 +829,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)