任务汇报单新增时子表增加写入完成标记HFinishFlag，新增、修改、删除时增加回填源单关联数据；

yxj

2023-09-15 39911f02a23e831ceb1c57985535ec829c3e08fb

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

@@ -1010,9 +1010,10 @@
            public int HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public bool HFinishFlag;
        }
        #endregion
        #region é¡¹ç›®é˜¶æ®µæ¸…单 æ–°å¢ž/编辑-保存
        #region ä»»åŠ¡æ±‡æŠ¥ æ–°å¢ž/编辑-保存
        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
@@ -1046,7 +1047,7 @@
            return objJsonResult;
        }
        #endregion
        #region æ·»åŠ  é¡¹ç›®é˜¶æ®µæ¸…单 ä¸»è¡¨
        #region æ·»åŠ  ä»»åŠ¡æ±‡æŠ¥ ä¸»è¡¨
        public json AddBillMain_WorkTaskReportBill(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1169,6 +1170,8 @@

                    oCN.RunProc(sql);

                    //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                    oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
                    //记录日志
@@ -1231,7 +1234,7 @@
            }
        }
        #endregion
        #region æ·»åŠ é¡¹ç›®é˜¶æ®µæ¸…单 å­è¡¨
        #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);
@@ -1255,10 +1258,10 @@
                int HSourceEntryID = oSub.HSourceEntryID;
                string HSourceBillNo = oSub.HSourceBillNo;
                string HSourceBillType = oSub.HSourceBillType;

                bool HFinishFlag = oSub.HFinishFlag;

                string sql = "insert into PM_WorkTaskReportBillSub" +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo) " +
                    "(HInterID,HBillNo_bak,HEntryID,HRemark,HProjectID,HProNumber,HProjectStageID,HName,HTaskNote,HType,HRelTimes,HReportNote,HAdv,HSourceInterID,HSourceEntryID,HSourceBillType,HSourceBillNo,HFinishFlag) " +
                    "values(" +
                    "" + HInterID +
                    ",'" + HBillNo +
@@ -1277,10 +1280,14 @@
                    "," + HSourceEntryID +
                    ",'" + HSourceBillType +
                    "','" + HSourceBillNo +
                    "')";
                    "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
                    ")";

                oCN.RunProc(sql);
            }

            //回填工作任务单关联数量、单据状态
            oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Add " + HInterID.ToString());

            objJsonResult.code = "1";
            objJsonResult.count = 1;
@@ -1436,6 +1443,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 + "'");

@@ -1443,7 +1452,7 @@

                objJsonResult.code = "1";
                objJsonResult.count = 1;
                objJsonResult.Message = "Sucess！";
                objJsonResult.Message = "删除成功！";
                objJsonResult.data = null;
                return objJsonResult;
            }