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

yangle

2024-03-28 b9de96ab398fca5f3351df75a7320f2d1871e7e4

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

@@ -29,6 +29,7 @@
        {
            public int HInterID;
            public string HBillNo;
            public int HProjectID;
            public string HProNumber;
            public string HProName;
            public int HProjectStageID;
@@ -63,6 +64,7 @@
            public int HMainSourceEntryID;
            public string HMainSourceBillNo;
            public string HMainSourceBillType;
            public int HOrderLevID;
        }
        #endregion

@@ -146,6 +148,7 @@
                string HBillSubType = "";
                int HInterID = mainList[0].HInterID;
                string HBillNo = mainList[0].HBillNo;
                int HProjectID = mainList[0].HProjectID;
                string HProNumber = mainList[0].HProNumber;
                string HProName = mainList[0].HProName;
                int HProjectStageID = mainList[0].HProjectStageID;
@@ -179,6 +182,8 @@
                int HMainSourceEntryID = mainList[0].HMainSourceEntryID;
                string HMainSourceBillNo = mainList[0].HMainSourceBillNo;
                string HMainSourceBillType = mainList[0].HMainSourceBillType;
                int HOrderLevID = mainList[0].HOrderLevID;



                if (OperationType == 2)
@@ -199,8 +204,8 @@
                if ((OperationType == 1 || OperationType == 2) && ds.Tables[0].Rows.Count == 0)//新增
                {
                    string sql = "insert into PM_WorkTaskBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate)" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID)" +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
@@ -208,75 +213,8 @@
                        "','" + HBillSubType +
                        "'," + HInterID +
                        ",'" + HBillNo +
                        "','" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HDate +
                        "','" + HTaskNote +
                        "'," + HPlanTimes +
                        "," + HSelfTimes +
                        ",'" + HLastDate +
                        "','" + HSendEmp +
                        "','" + HReceiveEmp +
                        "','" + HType +
                        "','" + HCopyEmp +
                        "','" + HRemark + 
                        "'," + HOrgID +
                        ",'" + HMaker +
                        "','" + HMakerDate +
                        "')";

                    //主表
                    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);
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)                    //编辑
                {
                    string sql = "update PM_WorkTaskBillMain set " +
                        "HYear = " + HYear +
                        ",HPeriod = " + HPeriod +
                        ",HBillType = '" + HBillType +
                        "',HBillSubType = '" + HBillSubType +
                        "',HBillNo = '" + HBillNo +
                        "',HProNumber = '" + HProNumber +
                        "',HProjectStageID = " + HProjectStageID +
                        ",HName = '" + HName +
                        "',HDate = '" + HDate +
                        "',HTaskNote = '" + HTaskNote +
                        "',HPlanTimes = " + HPlanTimes +
                        ",HSelfTimes = " + HSelfTimes +
                        ",HLastDate = '" + HLastDate +
                        "',HSendEmp = '" + HSendEmp +
                        "',HReceiveEmp = '" + HReceiveEmp +
                        "',HType = '" + HType +
                        "',HCopyEmp = '" + HCopyEmp +
                        "',HRemark = '" + HRemark +
                        "',HOrgID = " + HOrgID +
                        ",HUpdater = '" + HUpdater +
                        "',HUpdateDate = '" + HUpdaterDate +
                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);

                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskBillSub where HInterID='" + HInterID + "'");
                    //记录日志
                    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_WorkTaskBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType)" +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
                        ",'" + HBillType +
                        "','" + HBillSubType +
                        "'," + HInterID +
                        ",'" + HBillNo +
                        "','" + HProNumber +
                        "'," + HProjectID +
                        ",'" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HDate +
@@ -296,6 +234,87 @@
                        "," + HMainSourceEntryID +
                        ",'" + HMainSourceBillNo +
                        "','" + HMainSourceBillType +
                        "','" + HOrderLevID  +
                        "')";

                    //主表
                    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);
                }
                else if (OperationType == 3 || ds.Tables[0].Rows.Count != 0)                    //编辑
                {
                    string sql = "update PM_WorkTaskBillMain set " +
                        "HYear = " + HYear +
                        ",HPeriod = " + HPeriod +
                        ",HBillType = '" + HBillType +
                        "',HBillSubType = '" + HBillSubType +
                        "',HBillNo = '" + HBillNo +
                        "',HProjectID = " + HProjectID +
                        ",HProNumber = '" + HProNumber +
                        "',HProjectStageID = " + HProjectStageID +
                        ",HName = '" + HName +
                        "',HDate = '" + HDate +
                        "',HTaskNote = '" + HTaskNote +
                        "',HPlanTimes = " + HPlanTimes +
                        ",HSelfTimes = " + HSelfTimes +
                        ",HLastDate = '" + HLastDate +
                        "',HSendEmp = '" + HSendEmp +
                        "',HReceiveEmp = '" + HReceiveEmp +
                        "',HType = '" + HType +
                        "',HCopyEmp = '" + HCopyEmp +
                        "',HRemark = '" + HRemark +
                        "',HOrgID = " + HOrgID +
                        ",HUpdater = '" + HUpdater +
                        "',HUpdateDate = '" + HUpdaterDate +
                        "',HMainSourceInterID = " + HMainSourceInterID +
                        ",HMainSourceEntryID = " + HMainSourceEntryID +
                        ",HMainSourceBillNo = '" + HMainSourceBillNo +
                        "',HMainSourceBillType = '" + HMainSourceBillType +
                        "',HOrderLevID  = '" + HOrderLevID  +
                        "' where HInterID = " + HInterID;

                    oCN.RunProc(sql);

                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskBillSub where HInterID='" + HInterID + "'");
                    //记录日志
                    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_WorkTaskBillMain" +
                        "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HBillNo,HProjectID,HProNumber,HProjectStageID,HName,HDate,HTaskNote,HPlanTimes" +
                        ",HSelfTimes,HLastDate,HSendEmp,HReceiveEmp,HType,HCopyEmp,HRemark,HOrgID,HMaker,HMakeDate,HMainSourceInterID,HMainSourceEntryID,HMainSourceBillNo,HMainSourceBillType,HOrderLevID )" +
                        "values(" +
                        "" + HYear +
                        "," + HPeriod +
                        ",'" + HBillType +
                        "','" + HBillSubType +
                        "'," + HInterID +
                        ",'" + HBillNo +
                        "'," + HProjectID +
                        ",'" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HDate +
                        "','" + HTaskNote +
                        "'," + HPlanTimes +
                        "," + HSelfTimes +
                        ",'" + HLastDate +
                        "','" + HSendEmp +
                        "','" + HReceiveEmp +
                        "','" + HType +
                        "','" + HCopyEmp +
                        "','" + HRemark +
                        "'," + HOrgID +
                        ",'" + HMaker +
                        "','" + HMakerDate +
                        "'," + HMainSourceInterID +
                        "," + HMainSourceEntryID +
                        ",'" + HMainSourceBillNo +
                        "','" + HMainSourceBillType +
                        "','" + HOrderLevID +
                        "')";
                    //主表
                    oCN.RunProc(sql);
@@ -388,6 +407,101 @@
                    string sql = sql1 + sWhere + " order by å•æ®å· desc";
                    ds = oCN.RunProcReturn(sql, "h_v_PM_WorkTaskBillList");
                }

                //添加列名
                foreach (DataColumn col in ds.Tables[0].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 = ds.Tables[0];
                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 å·¥ä½œä»»åŠ¡åˆ—表  ä¸‹æŽ¨æ•°æ®æŸ¥è¯¢
        /// <summary>
        /// è¿”回项目阶段列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("PM_WorkTaskBill/XTList")]
        [HttpGet]
        public object XTList(string HInterID,string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskBillMyList  where HInterID ='"+ HInterID + "'   and æŽ¥å•äºº='"+user+"'", "h_v_PM_WorkTaskBillMyList");


                //添加列名
                foreach (DataColumn col in ds.Tables[0].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 = ds.Tables[0];
                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 è®¢å•ç­‰çº§åˆ—表 æŸ¥è¯¢
        /// <summary>
        /// è¿”回项目阶段列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("PM_WorkTaskBill/getOrder")]
        [HttpGet]
        public object getOrder()
        {
            try
            {
                List<object> columnNameList = new List<object>();

                //if (HItemID == null || HItemID.Equals(""))
                //{
                //ds = oCN.RunProcReturn("select * from Gy_OrderLev ", "Gy_OrderLev");
                //}
                //else
                //{
                //    string sql = "select * from Gy_OrderLev where HItemID='"+ HItemID + "'";
                //    ds = oCN.RunProcReturn(sql, "Gy_OrderLev");
                //}
                ds = oCN.RunProcReturn("select * from Gy_OrderLev ", "Gy_OrderLev");


                //添加列名
                foreach (DataColumn col in ds.Tables[0].Columns)
@@ -948,6 +1062,163 @@
        }
        #endregion

        #region å·¥ä½œä»»åŠ¡  å¼€å§‹ä»»åŠ¡/撤销开始功能
        [Route("PM_WorkTaskBill/BeginPM_WorkTaskBill")]
        [HttpGet]
        public object BeginPM_WorkTaskBill(string HInterID, int Type, string user)
        {
            try
            {
                
                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "PM_WorkTaskBillMain";
                oCN.BeginTran();//开始事务

                //Type 0 å¼€å§‹ä»»åŠ¡  1  æ’¤é”€ä»»åŠ¡  2结束任务
                if (Type == 0)
                {
                    //判断单据是否存在
                    DataSet ds;
                    string sql = "select * from PM_WorkTaskBillMain  where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        if (DBUtility.ClsPub.isStrNull(ds.Tables[0].Rows[0]["HMainSourceBillType"])== "4759")
                        {
                            var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
                            string sql1 = "update  PM_WorkTaskBillMain   set  HTaskStatus='已开始' where HinterID = " + HInterID;
                            oCN.RunProc(sql1);
                            string sql2 = "update PM_CustomerTaskBillMain  set  HTaskStatus='已开始' where HinterID = " + lInterID;
                            oCN.RunProc(sql2);
                        }
                        else
                        {
                            string sql2 = "update PM_WorkTaskBillMain  set  HTaskStatus='已开始' where HinterID = " + HInterID;
                            oCN.RunProc(sql2);
                        }
                      

                    }
                }
                else if(Type==1)
                {
                    //判断单据是否存在
                    DataSet ds;
                    string sql = "select * from PM_WorkTaskBillMain  where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
                        string sql1 = "update PM_WorkTaskBillMain  set   HTaskStatus='未开始' where HinterID = " + HInterID;
                        oCN.RunProc(sql1);
                        string sql2 = "update PM_CustomerTaskBillMain   set  HTaskStatus='未开始' where HinterID = " + lInterID;
                        oCN.RunProc(sql2);
                    }
                }
                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region å·¥ä½œä»»åŠ¡  å‚¬ä¿ƒæ¬¡æ•°åŠŸèƒ½
        [Route("PM_WorkTaskBill/UpdateHHasten")]
        [HttpGet]
        public object UpdateHHasten(string HInterID, int HHasten, string user)
        {
            try
            {

                if (string.IsNullOrWhiteSpace(HInterID))
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "HInterID为空！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

                ClsPub.CurUserName = user;
                BillOld.MvarItemKey = "PM_WorkTaskBillMain";
                oCN.BeginTran();//开始事务

                DataSet ds;
                string sql = "select * from PM_WorkTaskBillMain  where HinterID = " + HInterID;
                ds = oCN.RunProcReturn(sql, "PM_WorkTaskBillMain");
                if (ds == null || ds.Tables[0].Rows.Count == 0)
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "单据不存在！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                {
                    string sql1 = "update PM_WorkTaskBillMain  set   HHasten='"+ HHasten+ "' where HinterID = " + HInterID;
                    ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
                }

                oCN.Commit();//提交事务

                objJsonResult.code = "0";
                objJsonResult.count = 1;
                objJsonResult.Message = "执行成功！";
                objJsonResult.data = null;
                return objJsonResult; ;

            }
            catch (Exception e)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
                objJsonResult.data = null;
                return objJsonResult;
            }
        }
        #endregion

        #region ä»»åŠ¡æ±‡æŠ¥ æ–°å¢ž/编辑-保存
        #region ä»»åŠ¡æ±‡æŠ¥ è¡¨å¤´æ•°æ®
        public class PM_WorkTaskReportBill_Main
@@ -982,6 +1253,7 @@
        public class PM_WorkTaskReportBill_Sub
        {
            public int RowID;
            public int HProjectID;
            public string HProNumber;
            public int HProjectStageID;
            public string HProjectStageName;
@@ -992,9 +1264,14 @@
            public string HReportNote;
            public string HAdv;
            public string HRemarkSub;
            public int HSourceInterID;
            public int HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public bool HFinishFlag;
        }
        #endregion
        #region é¡¹ç›®é˜¶æ®µæ¸…单 æ–°å¢ž/编辑-保存
        #region ä»»åŠ¡æ±‡æŠ¥ æ–°å¢ž/编辑-保存
        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
@@ -1028,7 +1305,7 @@
            return objJsonResult;
        }
        #endregion
        #region æ·»åŠ  é¡¹ç›®é˜¶æ®µæ¸…单 ä¸»è¡¨
        #region æ·»åŠ  ä»»åŠ¡æ±‡æŠ¥ ä¸»è¡¨
        public json AddBillMain_WorkTaskReportBill(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1090,16 +1367,23 @@
                string HUpdater = mainList[0].HUpdater;
                string HUpdaterDate = mainList[0].HUpdaterDate;



                if (OperationType == 2)
                //保存前控制
                DataSet BeforeDs = oCN.RunProcReturn("Exec h_p_PM_WorkTaskReportBill_BeforeSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_PM_WorkTaskReportBill_BeforeSaveCtrl");
                if (BeforeDs == null || BeforeDs.Tables[0].Rows.Count == 0)
                {
                    ds = oCN.RunProcReturn("select * from PM_WorkTaskReportBillMain where HBillNo ='" + HBillNo + "'", "PM_WorkTaskReportBillMain");
                    if (ds.Tables[0].Rows.Count > 0)
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存前判断失败！";
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    if (DBUtility.ClsPub.isLong(BeforeDs.Tables[0].Rows[0]["HBack"]) == 1)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据号重复,请重新输入!";
                        objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.isStrNull(BeforeDs.Tables[0].Rows[0]["HRemark"]);
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
@@ -1151,6 +1435,8 @@

                    oCN.RunProc(sql);

                    //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                    oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
                    //记录日志
@@ -1186,7 +1472,7 @@
                    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, HProID, HProjectStageID, HMainSourceBillType, HMainSourceBillNo);
                objJsonResult = AddBillSub_WorkTaskReportBill(msg3, HInterID, HBillNo, OperationType);

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

                int HEntryID = i;
                int HProjectID = oSub.HProjectID;
                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 HSourceInterID = oSub.HSourceInterID;
                int HSourceEntryID = oSub.HSourceEntryID;
                string HSourceBillNo = oSub.HSourceBillNo;
                string HSourceBillType = oSub.HSourceBillType;
                bool HFinishFlag = oSub.HFinishFlag;

                if (HFinishFlag==true)
                {
                    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,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
                        "values(" +
                        "" + HInterID +
                        ",'" + HBillNo +
                        "'," + HEntryID +
                        ",'" + HRemark +
                        "','" + HProNumber +
                        "'," + HProjectStageID +
                        ",'" + HName +
                        "','" + HTaskNote +
                        "','" + HType +
                        "'," + HRelTimes +
                        ",'" + HReportNote +
                        "','" + HAdv +
                        "'," + HSourceInterID +
                        "," + HSourceEntryID +
                        ",'" + HSourceBillType +
                        "','" + HSourceBillNo +
                        "')";

                    oCN.RunProc(sql);
                    //判断单据是否存在
                    DataSet ds;
                    string sqls = "select * from PM_WorkTaskBillMain  where HinterID = " + HSourceInterID;
                    ds = oCN.RunProcReturn(sqls, "PM_WorkTaskBillMain");
                    if (ds == null || ds.Tables[0].Rows.Count == 0)
                    {
                        objJsonResult.code = "0";
                        objJsonResult.count = 0;
                        objJsonResult.Message = "单据不存在！";
                        objJsonResult.data = null;
                        return objJsonResult;
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        var lInterID = ds.Tables[0].Rows[0]["HMainSourceInterID"];
                        string sql1 = "update PM_WorkTaskBillMain  set   HTaskStatus='已完成' where HinterID = " + HSourceInterID;
                        oCN.RunProc(sql1);
                        string sql2 = "update PM_CustomerTaskBillMain   set   HTaskStatus='已完成' where HinterID = " + lInterID;
                        oCN.RunProc(sql2);
                    }
                }

                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) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
                    "'," + HEntryID +
                    ",'" + HRemark +
                    "'," + HProjectID +
                    ",'" + HProNumber +
                    "'," + HProjectStageID +
                    ",'" + HName +
                    "','" + HTaskNote +
                    "','" + HType +
                    "'," + HRelTimes +
                    ",'" + HReportNote +
                    "','" + HAdv +
                    "'," + HSourceInterID +
                    "," + HSourceEntryID +
                    ",'" + HSourceBillType +
                    "','" + HSourceBillNo +
                    "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
                    ")";

                oCN.RunProc(sql);
            }

            //保存后控制
            DataSet AfterDs = oCN.RunProcReturn("Exec h_p_PM_WorkTaskReportBill_AfterSaveCtrl " + HInterID.ToString() + ",'" + HBillNo + "'," + OperationType.ToString(), "h_p_PM_WorkTaskReportBill_AfterSaveCtrl");
            if (AfterDs == null || AfterDs.Tables[0].Rows.Count == 0)
            {
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "保存后判断失败！";
                objJsonResult.data = null;
                return objJsonResult;
            }
            else
            {
                foreach (PM_WorkTaskReportBill_Sub oSub in DetailColl)
                if (DBUtility.ClsPub.isLong(AfterDs.Tables[0].Rows[0]["HBack"]) == 1)
                {
                    i++;                                            //同一个主表下的子表的内码自增
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.isStrNull(AfterDs.Tables[0].Rows[0]["HRemark"]);
                    objJsonResult.data = null;
                    return objJsonResult;
                }
                else
                {
                    //回填工作任务单关联数量、单据状态
                    oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());

                    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;
                    objJsonResult.Message = null;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
            

            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;
        }
        #endregion
        #endregion
@@ -1451,6 +1756,8 @@

                oCN.BeginTran();

                //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                oCN.RunProc("delete from PM_WorkTaskReportBillMain where HInterID = " + HInterID);
                oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");

@@ -1458,7 +1765,7 @@

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }
@@ -1963,5 +2270,60 @@
            }
        }
        #endregion

        #region  æˆ‘的任务列表（未完成，已完成，正在进行）
        /// <summary>
        /// è¿”回我的任务列表
        ///参数：string sql。
        ///返回值：object。
        /// </summary>
        [Route("PM_WorkTaskBill/PM_WorkTaskBillMainList")]
        [HttpGet]
        public object PM_WorkTaskBillMainList( string user)
        {
            try
            {
                List<object> columnNameList = new List<object>();

                ds = oCN.RunProcReturn("exec h_p_PM_WorkTaskBillMyList " + user, "h_p_PM_WorkTaskBillMyList");

                if (ds.Tables[0].Rows.Count != 0 || ds != null)
                {
                    //添加列名
                    foreach (DataColumn col in ds.Tables[0].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 = ds;
                    objJsonResult.list = columnNameList;
                    return objJsonResult;
                }
                else
                {
                    objJsonResult.code = "0";
                    objJsonResult.count = 0;
                    objJsonResult.Message = "无数据";
                    objJsonResult.data = null;
                    return objJsonResult;
                }

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

      
    }
}