项目管理：数据关联、 项目工程：下推(阶段汇报)、下推(任务汇报)

duhe

2023-07-17 09302ffd04018e5b6958f2a44871980b1bbc454b

项目管理：数据关联、
项目工程：下推(阶段汇报)、下推(任务汇报)

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

@@ -801,6 +801,10 @@
        public class PM_WorkTaskReportBill_Main
        {
            public int HInterID;
            public int HProID;
            public int HProjectStageID;
            public string HMainSourceBillNo;
            public string HMainSourceBillType;
            public string HBillNo;
            public string HDate;
            public string HRemark;
@@ -919,6 +923,10 @@
                string HBillSubType = "";
                int HBillStatus = 1;
                int HInterID = mainList[0].HInterID;
                int HProID = mainList[0].HProID;
                int HProjectStageID = mainList[0].HProjectStageID;
                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
                string HMainSourceBillType = mainList[0].HMainSourceBillType;
                string HBillNo = mainList[0].HBillNo;
                string HDate = mainList[0].HDate;
                string HRemark = mainList[0].HRemark;
@@ -996,9 +1004,37 @@
                    //记录日志
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改项目阶段清单:" + HBillNo);
                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改项目阶段清单：" + HBillNo + "','LMES-项目阶段清单模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }else if(OperationType == 4 && ds.Tables[0].Rows.Count == 0)        //下推
                {
                    string sql = "insert into PM_WorkTaskReportBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate,HOrgID,HReportEmpID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
                        ",'" + HBillType +
                        "','" + HBillSubType +
                        "'," + HInterID +
                        ",'" + HDate +
                        "','" + HBillNo +
                        "'," + HBillStatus +
                        ",'" + HRemark +
                        "','" + HMaker +
                        "','" + HMakerDate +
                        "'," + HOrgID +
                        "," + HReportEmpID +
                        "," + HProID +
                        "," + HProjectStageID +
                        ",'" + HMainSourceBillType +
                        "','" + HMainSourceBillNo +
                        "')";

                    //主表
                    oCN.RunProc(sql);
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增任务汇报:" + HBillNo);
                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "新增任务汇报：" + HBillNo + "','LMES-任务汇报模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //保存子表
                objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType);
                objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType, HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);

                if (objJsonResult.code == "0")
                {
@@ -1026,44 +1062,88 @@
        }
        #endregion
        #region æ·»åŠ é¡¹ç›®é˜¶æ®µæ¸…单 å­è¡¨
        public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
        public json AddBillSub_WorkTaskReportBill(string msg3, long HInterID, string HBillNo, int OperationType, int HSourceInterID, int HSourceEntryID, string HSourceBillType, string HSourceBillNo)
        {
            List<PM_WorkTaskReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_WorkTaskReportBill_Sub>>(msg3);
            int i = 0;                                          //作为子表内码
            foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
            {
                i++;                                            //同一个主表下的子表的内码自增
            if(OperationType == 4) {
                foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
                {
                    i++;                                            //同一个主表下的子表的内码自增

                int HEntryID = i;
                string HProNumber = oSub.HProNumber;
                int HProjectStageID = oSub.HProjectStageID;
                string HName = oSub.HName;
                string HTaskNote = oSub.HTaskNote;
                string HType = oSub.HType;
                double HRelTimes = oSub.HRelTimes;
                string HReportNote = oSub.HReportNote;
                string HAdv = oSub.HAdv;
                string HRemark = oSub.HRemarkSub;
                    int HEntryID = i;
                    string HProNumber = oSub.HProNumber;
                    int HProjectStageID = oSub.HProjectStageID;
                    string HName = oSub.HName;
                    string HTaskNote = oSub.HTaskNote;
                    string HType = oSub.HType;
                    double HRelTimes = oSub.HRelTimes;
                    string HReportNote = oSub.HReportNote;
                    string HAdv = oSub.HAdv;
                    string HRemark = oSub.HRemarkSub;

                string sql = "insert into PM_WorkTaskReportBillSub" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
                    "'," + HEntryID +
                    ",'" + HRemark +
                    "','" + HProNumber +
                    "'," + HProjectStageID +
                    ",'" + HName +
                    "','" + HTaskNote +
                    "','" + HType +
                    "'," + HRelTimes +
                    ",'" + HReportNote +
                    "','" + HAdv +
                    "')";
                    string sql = "insert into PM_WorkTaskReportBillSub" +
                        "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
                        "values(" +
                        "" + HInterID +
                        ",'" + HBillNo +
                        "'," + HEntryID +
                        ",'" + HRemark +
                        "','" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HTaskNote +
                        "','" + HType +
                        "'," + HRelTimes +
                        ",'" + HReportNote +
                        "','" + HAdv +
                        "'," + HSourceInterID +
                        "," + HSourceEntryID +
                        ",'" + HSourceBillType +
                        "','" + HSourceBillNo +
                        "')";

                oCN.RunProc(sql);
                    oCN.RunProc(sql);
                }
            }
            else
            {
                foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
                {
                    i++;                                            //同一个主表下的子表的内码自增

                    int HEntryID = i;
                    string HProNumber = oSub.HProNumber;
                    int HProjectStageID = oSub.HProjectStageID;
                    string HName = oSub.HName;
                    string HTaskNote = oSub.HTaskNote;
                    string HType = oSub.HType;
                    double HRelTimes = oSub.HRelTimes;
                    string HReportNote = oSub.HReportNote;
                    string HAdv = oSub.HAdv;
                    string HRemark = oSub.HRemarkSub;

                    string sql = "insert into PM_WorkTaskReportBillSub" +
                        "(HInterID,HBillNo_bak,HEntryID,HRemark,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv) " +
                        "values(" +
                        "" + HInterID +
                        ",'" + HBillNo +
                        "'," + HEntryID +
                        ",'" + HRemark +
                        "','" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HTaskNote +
                        "','" + HType +
                        "'," + HRelTimes +
                        ",'" + HReportNote +
                        "','" + HAdv +
                        "')";

                    oCN.RunProc(sql);
                }
            }
            

            objJsonResult.code = "1";
            objJsonResult.count = 1;

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤³ÌÏîÄ¿/PM_ProjectBillController.cs

@@ -938,5 +938,113 @@
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›® ä¸‹æŽ¨(阶段汇报)-页面显示
        [Route("PM_ProjectBill/set_ProjectReport")]
        [HttpGet]
        public object ProjectBill_ProjectReport(string HInterID, string HProjectStageID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                List<DataTable> tables = new List<DataTable>();
                //查看权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //获取表头信息
                string sql = "exec h_p_PM_ProjectBill_setProjectReport " + HInterID + "," + HProjectStageID;
                ds = oCN.RunProcReturn(sql, "h_p_PM_ProjectBill_setProjectReport");
                tables.Add(ds.Tables[0]);
                tables.Add(ds.Tables[1]);
                if (ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "对应项目阶段不存在！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[1].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = tables;
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ç¨‹é¡¹ç›® ä¸‹æŽ¨(任务汇报)-页面显示
        [Route("PM_ProjectBill/set_WorkTaskReport")]
        [HttpGet]
        public object ProjectBill_WorkTaskReport(string HInterID, string HProjectStageID, string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();
                List<DataTable> tables = new List<DataTable>();
                //查看权限
                //if (!DBUtility.ClsPub.Security_Log("Gy_ProjectStage_Query", 1, false, user))
                //{
                //    objJsonResult.code = "0";
                //    objJsonResult.count = 0;
                //    objJsonResult.Message = "无查看权限！";
                //    objJsonResult.data = null;
                //    return objJsonResult;
                //}
                //获取表头信息
                string sql = "exec h_p_PM_ProjectBill_setWorkTaskReport " + HInterID + "," + HProjectStageID;
                ds = oCN.RunProcReturn(sql, "h_p_PM_ProjectBill_setWorkTaskReport");
                tables.Add(ds.Tables[0]);
                tables.Add(ds.Tables[1]);

                //添加列名
                foreach (DataColumn col in ds.Tables[1].Columns)
                {
                    Type dataType = col.DataType;
                    string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}";
                    columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//获取到DataColumn列对象的列名
                }

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.data = tables;
                objJsonResult.list = columnNameList;
                return objJsonResult;
            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "Exception！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion
    }
}

 WebAPI/Controllers/ÏîÄ¿¹ÜÀí/ÏîÄ¿½×¶Î/Gy_ProjectStageController.cs

@@ -1321,7 +1321,10 @@
            public int HInterID;
            public string HBillNo;
            public string HDate;
            public int HProID;
            public string HProNumber;
            public string HMainSourceBillNo;
            public string HMainSourceBillType;
            public int HProjectStageID;
            public string HProjectStageName;
            public string HStageNote;
@@ -1434,6 +1437,9 @@
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                }else if (OperationType == 4)
                {

                }

                msg2 = "[" + msg2.ToString() + "]";
@@ -1448,7 +1454,10 @@
                int HInterID = mainList[0].HInterID;
                string HBillNo = mainList[0].HBillNo;
                string HDate = mainList[0].HDate;
                int HProID = mainList[0].HProID;
                string HProNumber = mainList[0].HProNumber;
                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
                string HMainSourceBillType = mainList[0].HMainSourceBillType;
                int HProjectStageID = mainList[0].HProjectStageID;
                string HStageNote = mainList[0].HStageNote;
                string HRelationGoods = mainList[0].HRelationGoods;
@@ -1465,7 +1474,7 @@
                string HMakerDate = mainList[0].HMakerDate;
                string HUpdater = mainList[0].HUpdater;
                string HUpdaterDate = mainList[0].HUpdaterDate;

                

                if (OperationType == 2)
                {
@@ -1552,9 +1561,48 @@
                    //记录日志
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",修改项目阶段汇报:" + HBillNo);
                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "修改项目阶段汇报：" + HBillNo + "','LMES-项目阶段汇报模块','" + DBUtility.ClsPub.IPAddress + "','修改单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }else if(OperationType == 4 && ds.Tables[0].Rows.Count == 0 )           //下推-新增
                {
                    string sql = "insert into PM_ProjectReportBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HBillStatus,HRemark,HMaker,HMakeDate" +
                        ",HProNumber,HProjectStageID,HStageNote,HRelationGoods,HIsKey,HReportEmpID,HReportNote,HReportGoods,HReceiveEmp,HCopyEmp,HRate,HOrgID,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillType,HMainSourceBillNo) " +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
                        ",'" + HBillType +
                        "','" + HBillSubType +
                        "'," + HInterID +
                        ",'" + HDate +
                        "','" + HBillNo +
                        "'," + HBillStatus +
                        ",'" + HRemark +
                        "','" + HMaker +
                        "','" + HMakerDate +
                        "','" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HStageNote +
                        "','" + HRelationGoods +
                        "'," + HIsKey +
                        "," + HReportEmpID +
                        ",'" + HReportNote +
                        "','" + HReportGoods +
                        "','" + HReceiveEmp +
                        "','" + HCopyEmp +
                        "'," + HRate +
                        "," + HOrgID +
                        "," + HProID +
                        "," + HProjectStageID +
                        ",'" + HMainSourceBillType +
                        "','" + HMainSourceBillNo +
                        "')";

                    //主表
                    oCN.RunProc(sql);
                    LogService.Write("用户:" + user + ",日期:" + DateTime.Now + ",新增项目阶段汇报:" + HBillNo);
                    oCN.RunProc("Insert into System_log (GeginDate, userid, WorkstationName, WorkList, SystemName, NetuserName, State) select GETDATE(),'" + user + "','" + HComputerName + "','" + "新增项目阶段汇报：" + HBillNo + "','LMES-项目阶段汇报模块','" + DBUtility.ClsPub.IPAddress + "','新增单据'", ref DBUtility.ClsPub.sExeReturnInfo);
                }
                //保存子表
                objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType);
                objJsonResult = AddBillSub_ProjectReportBill(msg3, HInterID, HBillNo, OperationType,HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);

                if (objJsonResult.code == "0")
                {
@@ -1582,36 +1630,73 @@
        }
        #endregion
        #region æ·»åŠ é¡¹ç›®é˜¶æ®µæ¸…单 å­è¡¨
        public json AddBillSub_ProjectReportBill(string msg3, long HInterID, string HBillNo, int OperationType)
        public json AddBillSub_ProjectReportBill(string msg3, long HInterID, string HBillNo, int OperationType, int HSourceInterID, int HSourceEntryID, string HSourceBillType, string HSourceBillNo)
        {
            List<PM_ProjectReportBill_Sub> DetailColl = Newtonsoft.Json.JsonConvert.DeserializeObject<List<PM_ProjectReportBill_Sub>>(msg3);
            int i = 0;                                          //作为子表内码
            foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
            if(OperationType == 4)
            {
                i++;                                            //同一个主表下的子表的内码自增
                foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
                {
                    i++;                                            //同一个主表下的子表的内码自增

                int HEntryID = i;
                int HEmpID = oSub.HEmpID;
                int HIsPM = oSub.HIsPM?1:0;
                double HRate = oSub.HRate;
                double HAvgMoney = oSub.HAvgMoney;
                double HCountMoney = oSub.HCountMoney;
                string HRemarkSub = oSub.HRemarkSub;
                string sql = "insert into PM_ProjectReportBillSub" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
                    "'," + HEntryID +
                    ",'" + HRemarkSub +
                    "'," + HEmpID +
                    "," + HIsPM +
                    "," + HRate +
                    "," + HAvgMoney +
                    "," + HCountMoney +
                    ")";
                oCN.RunProc(sql);
                    int HEntryID = i;
                    int HEmpID = oSub.HEmpID;
                    int HIsPM = oSub.HIsPM ? 1 : 0;
                    double HRate = oSub.HRate;
                    double HAvgMoney = oSub.HAvgMoney;
                    double HCountMoney = oSub.HCountMoney;
                    string HRemarkSub = oSub.HRemarkSub;
                    string sql = "insert into PM_ProjectReportBillSub" +
                        "(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
                        "values(" +
                        "" + HInterID +
                        ",'" + HBillNo +
                        "'," + HEntryID +
                        ",'" + HRemarkSub +
                        "'," + HEmpID +
                        "," + HIsPM +
                        "," + HRate +
                        "," + HAvgMoney +
                        "," + HCountMoney +
                        "," + HSourceInterID + 
                        "," + HSourceEntryID +
                        ",'" + HSourceBillType + 
                        "','" + HSourceBillNo +
                        "')";
                    oCN.RunProc(sql);
                }
            }
            else
            {
                foreach (PM_ProjectReportBill_Sub oSub in DetailColl)
                {
                    i++;                                            //同一个主表下的子表的内码自增

                    int HEntryID = i;
                    int HEmpID = oSub.HEmpID;
                    int HIsPM = oSub.HIsPM ? 1 : 0;
                    double HRate = oSub.HRate;
                    double HAvgMoney = oSub.HAvgMoney;
                    double HCountMoney = oSub.HCountMoney;
                    string HRemarkSub = oSub.HRemarkSub;
                    string sql = "insert into PM_ProjectReportBillSub" +
                        "(HInterID,HBillNo_bak,HEntryID,HRemark,HEmpID,HIsPM,HRate,HAvgMoney,HCountMoney) " +
                        "values(" +
                        "" + HInterID +
                        ",'" + HBillNo +
                        "'," + HEntryID +
                        ",'" + HRemarkSub +
                        "'," + HEmpID +
                        "," + HIsPM +
                        "," + HRate +
                        "," + HAvgMoney +
                        "," + HCountMoney +
                        ")";
                    oCN.RunProc(sql);
                }
            }
            

            objJsonResult.code = "1";
            objJsonResult.count = 1;