Merge branch 'master' of http://101.37.171.70:10101/r/MES-WEB-API

wtt

2024-12-05 b541b4b3aed0ae5efcf9bf60eb8deb07b2ee944e

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷ÈÎÎñ/PM_WorkTaskBillController.cs

@@ -1572,9 +1572,10 @@
                }
                string HSendEmp = ds.Tables[0].Rows[0]["派单人"].ToString();//派单人
                string HCopyEmp = ds.Tables[0].Rows[0]["抄送人"].ToString();//抄送人
                string HPlanTimes = ds.Tables[0].Rows[0]["评估工时"].ToString();//评估工时
                string HWorkTaskDate = DateTime.Parse(ds.Tables[0].Rows[0]["日期"].ToString()).ToString("yyyy-MM-dd");//工作任务单据时间
                string HSelfTimes = ds.Tables[0].Rows[0]["自评工时"].ToString();//自评工时
                string HProjectName = ds.Tables[0].Rows[0]["项目名称"].ToString();//项目名称
                string HTaskDescription = ds.Tables[0].Rows[0]["任务描述"].ToString();
                //插入子表sql
                string sql = "insert into PM_WorkTaskReportBillSub" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
@@ -1599,7 +1600,7 @@
                    "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
                    ")";
                oCN.RunProc(sql);
                string messageContext = "日期= " + DateTime.Now + ",汇报人=" + reportMan + ",汇报内容=" + HReportNote + ",评估工时=" + HPlanTimes + "小时,自评工时=" + HSelfTimes + "小时,耗用工时=" + HRelTimes + "小时,任务名称=" + HName + ",项目名称=" + HProjectName; ;
                string messageContext = "单据日期= " + HWorkTaskDate + ",汇报人=" + reportMan + ",汇报内容=" + HReportNote +",任务描述 ="+ HTaskDescription +",完成标记="+ (HFinishFlag?"是":"否") + ",自评工时=" + HSelfTimes + "小时,耗用工时=" + HRelTimes + "小时,任务名称=" + HName + ",项目名称=" + HProjectName; ;
                _ = SendDingDingAsync(HSendEmp, messageContext, HCopyEmp);
            }

@@ -4093,5 +4094,45 @@
            return response;
        }
        #endregion



        //#region è‡ªåŠ¨åŠ è½½é¡µé¢è¡¨å¤´
        ///// <summary>
        ///// è¿”回项目阶段列表
        /////参数：string sql。
        /////返回值：object。
        ///// </summary>
        //[Route("Xt_DefineBillMainSet/getDefineBillMainSet")]
        //[HttpGet]
        //public object getDefineBillMainSet(string HModName, string user)
        //{
        //    try
        //    {
        //        string sql = "select * from h_v_Xt_DefineBillMainSet_AutoLoadList where HModName ='" + HModName + "' and HUser ='" + user + "' order by HArrangeOrder,HArrangeOrderSub";
        //        ds = oCN.RunProcReturn(sql, "Xt_DefineBillMainSet");

        //        if(ds!=null && ds.Tables[0].Rows.Count == 0)
        //        {
        //            sql = "select * from h_v_Xt_DefineBillMainSet_AutoLoadList where HModName ='" + HModName + "' and HUser ='admin' order by HArrangeOrder,HArrangeOrderSub";
        //            ds = oCN.RunProcReturn(sql, "h_v_Xt_DefineBillMainSet_AutoLoadList");
        //        }

        //        objJsonResult.code = "1";
        //        objJsonResult.count = 1;
        //        objJsonResult.Message = "Sucess！";
        //        objJsonResult.data = ds.Tables[0];
        //        return objJsonResult;
        //    }
        //    catch (Exception e)
        //    {
        //        objJsonResult.code = "0";
        //        objJsonResult.count = 0;
        //        objJsonResult.Message = "Exception！" + e.ToString();
        //        objJsonResult.data = null;
        //        return objJsonResult;
        //    }
        //}
        //#endregion
    }
}