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

zrg

2024-01-02 55ea36856df391168ea5e4032a47584f95eed593

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

@@ -995,6 +995,7 @@
        public class PM_WorkTaskReportBill_Sub
        {
            public int RowID;
            public int HProjectID;
            public string HProNumber;
            public int HProjectStageID;
            public string HProjectStageName;
@@ -1009,9 +1010,10 @@
            public int HSourceEntryID;
            public string HSourceBillNo;
            public string HSourceBillType;
            public bool HFinishFlag;
        }
        #endregion
        #region é¡¹ç›®é˜¶æ®µæ¸…单 æ–°å¢ž/编辑-保存
        #region ä»»åŠ¡æ±‡æŠ¥ æ–°å¢ž/编辑-保存
        /// <summary>
        /// æ–°å¢žå•æ®-保存按钮
        ///参数：string sql。
@@ -1045,7 +1047,7 @@
            return objJsonResult;
        }
        #endregion
        #region æ·»åŠ  é¡¹ç›®é˜¶æ®µæ¸…单 ä¸»è¡¨
        #region æ·»åŠ  ä»»åŠ¡æ±‡æŠ¥ ä¸»è¡¨
        public json AddBillMain_WorkTaskReportBill(string msg1)
        {
            string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries);
@@ -1107,16 +1109,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;
                    }
@@ -1168,6 +1177,8 @@

                    oCN.RunProc(sql);

                    //删除子表时  å›žå¡«å·¥ä½œä»»åŠ¡å•å…³è”数量、单据状态
                    oCN.RunProc("exec h_p_PM_UpDateRelation_WorkTaskToWorkTaskReport_Delete " + HInterID.ToString());
                    //删除子表
                    oCN.RunProc("delete from PM_WorkTaskReportBillSub where HInterID='" + HInterID + "'");
                    //记录日志
@@ -1230,7 +1241,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);
@@ -1240,6 +1251,7 @@
                i++;                                            //同一个主表下的子表的内码自增

                int HEntryID = i;
                int HProjectID = oSub.HProjectID;
                string HProNumber = oSub.HProNumber;
                int HProjectStageID = oSub.HProjectStageID;
                string HName = oSub.HName;
@@ -1253,16 +1265,17 @@
                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,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 +
                    "'," + HEntryID +
                    ",'" + HRemark +
                    "','" + HProNumber +
                    "'," + HProjectID +
                    ",'" + HProNumber +
                    "'," + HProjectStageID +
                    ",'" + HName +
                    "','" + HTaskNote +
@@ -1274,16 +1287,44 @@
                    "," + HSourceEntryID +
                    ",'" + HSourceBillType +
                    "','" + HSourceBillNo +
                    "')";
                    "'," + DBUtility.ClsPub.BoolToString(HFinishFlag) +
                    ")";

                oCN.RunProc(sql);
            }

            objJsonResult.code = "1";
            objJsonResult.count = 1;
            objJsonResult.Message = null;
            objJsonResult.data = null;
            return objJsonResult;
            //保存后控制
            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
            {
                if (DBUtility.ClsPub.isLong(AfterDs.Tables[0].Rows[0]["HBack"]) == 1)
                {
                    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());

                    objJsonResult.code = "1";
                    objJsonResult.count = 1;
                    objJsonResult.Message = null;
                    objJsonResult.data = null;
                    return objJsonResult;
                }
            }
        }
        #endregion
        #endregion
@@ -1433,6 +1474,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 + "'");

@@ -1440,7 +1483,7 @@

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