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

yangle

2024-02-26 14d1953a72b762f1f5e93f07964fc9747a783ea5

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

@@ -1083,7 +1083,7 @@
                BillOld.MvarItemKey = "PM_WorkTaskBillMain";
                oCN.BeginTran();//开始事务

                //Type 0 å¼€å§‹ä»»åŠ¡  1  æ’¤é”€ä»»åŠ¡
                //Type 0 å¼€å§‹ä»»åŠ¡  1  æ’¤é”€ä»»åŠ¡  2结束任务
                if (Type == 0)
                {
                    //判断单据是否存在
@@ -1100,8 +1100,20 @@
                    }
                    if (ds.Tables[0] != null && ds.Tables[0].Rows.Count > 0)
                    {
                        string  sql1= "update PM_WorkTaskBillMain  set  HTaskStatus='进行中' where HinterID = " + HInterID;
                        ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
                        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);
                        }
                      

                    }
                }
@@ -1121,31 +1133,13 @@
                    }
                    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;
                        ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
                        oCN.RunProc(sql1);
                        string sql2 = "update PM_CustomerTaskBillMain   set  HTaskStatus='未开始' where HinterID = " + lInterID;
                        oCN.RunProc(sql2);
                    }
                }
                else if (Type == 2)
                {
                    //判断单据是否存在
                    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   HTaskStatus='已结束' where HinterID = " + HInterID;
                        ds = oCN.RunProcReturn(sql1, "PM_WorkTaskBillMain");
                    }
                }

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

                objJsonResult.code = "0";
@@ -1157,6 +1151,7 @@
            }
            catch (Exception e)
            {
                oCN.RollBack();
                objJsonResult.code = "0";
                objJsonResult.count = 0;
                objJsonResult.Message = "执行失败！" + e.ToString();
@@ -1530,6 +1525,30 @@
                string HSourceBillType = oSub.HSourceBillType;
                bool HFinishFlag = oSub.HFinishFlag;

                if (HFinishFlag==true)
                {
                    //判断单据是否存在
                    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(" +