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;