From c0a660068335612e09d3d0ef1e5799c4f6248cbe Mon Sep 17 00:00:00 2001 From: duhe <226547893@qq.com> Date: 星期二, 10 十月 2023 11:04:56 +0800 Subject: [PATCH] 1 --- Model/项目管理/ClsPM_WorkTaskWeekBillMain.cs | 16 ++ Model/项目管理/ClsPM_WorkTaskWeekBillSub.cs | 16 ++ DAL/项目管理/ClsPM_WorkTaskWeekBill.cs | 289 ++++++++++++++++++++++++++++++++++++++++++++++++ WebAPI/WebAPI.csproj | 2 4 files changed, 322 insertions(+), 1 deletions(-) diff --git "a/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBill.cs" "b/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBill.cs" new file mode 100644 index 0000000..15048e7 --- /dev/null +++ "b/DAL/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBill.cs" @@ -0,0 +1,289 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace DAL +{ + public class ClsPM_WorkTaskWeekBill : DBUtility.ClsXt_BaseBill + { + public Model.ClsPM_WorkTaskWeekBillMain omodel = new Model.ClsPM_WorkTaskWeekBillMain(); + public List<Model.ClsPM_WorkTaskWeekBillSub> DetailColl = new List<Model.ClsPM_WorkTaskWeekBillSub>(); + + public ClsPM_WorkTaskWeekBill() + { + base.MvarItemKeySub = "PM_WorkTaskWeekBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey= "PM_WorkTaskWeekBillMain"; + base.MvarReportTitle="宸ヤ綔鍛ㄨ鍒�"; + base.BillType="4756"; + base.HBillSubType = "4756"; + + } + + #region 鍥哄畾浠g爜 + #region 鏃犲弬鏋勯�犲嚱鏁� + ~ClsPM_WorkTaskWeekBill() + { + DetailColl = null; + } + #endregion + #endregion + + #region 淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + oCn.BeginTran(); + //鏇存柊涓昏〃 + string mainSql = "update PM_WorkTaskWeekBillMain set " + + " HBillNo = '" + omodel.HBillNo + + "', HDate = '" + omodel.HDate + + "', HYear = " + omodel.HYear + + ", HPeriod = " + omodel.HPeriod + + ", HRemark = '" + omodel.HRemark + + "', HUpDater = '" + omodel.HUpDater + + "', HUpDateDate = getdate()" + + //=============================================================== + ", HOrgID = " + omodel.HOrgID + + ", HYear = " + omodel.HYear + + ", HWeek = " + omodel.HWeek + + ", HBeginDate = '" + omodel.HBeginDate + + "', HEndDate = '" + omodel.HEndDate + + "', HPlanEmpID = " + omodel.HPlanEmpID + + " where HInterID = " + omodel.HInterID; + + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsPM_WorkTaskWeekBillSub oSub in DetailColl) + { + string subSql = "insert into PM_WorkTaskWeekBillSub" + + "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HWeekDay,HSno,HProjectID,HProjectStageID,HTaskNote,HPlanTimes) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + ",'" + oSub.HCloseMan + + "','" + oSub.HEntryCloseDate + + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + + ",'" + oSub.HRemark + + "'," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "'," + oSub.HRelationQty + + "," + oSub.HRelationMoney + + "," + oSub.HWeekDay + + "," + oSub.HSno + + "," + oSub.HProjectID + + "," + oSub.HProjectStageID + + ",'" + oSub.HTaskNote + + "'," + oSub.HPlanTimes + + ")"; + oCn.RunProc(subSql); + } + + sReturn = "淇敼鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + #endregion + + #region 鏂板鍗曟嵁 + public override bool AddBill(ref string sReturn) + { + try + { + DataSet ds; + + + oCn.BeginTran(); + + //妫�鏌ヤ富琛ㄥ唴鐮佹槸鍚﹂噸澶嶏紝鑻ラ噸澶嶅垯閲嶆柊鐢熸垚骞剁户缁鏌ワ紝鐩村埌涓嶅啀閲嶅 + while (true) + { + ds = oCn.RunProcReturn("select * from PM_WorkTaskWeekBillMain where HInterID = " + omodel.HInterID, "PM_WorkTaskWeekBillMain"); + if(ds!=null && ds.Tables[0].Rows.Count > 0) + { + omodel.HInterID = DBUtility.ClsPub.CreateBillID(BillType, ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + break; + } + } + + //鎻掑叆涓昏〃 + string mainSql = "insert into PM_WorkTaskWeekBillMain" + + "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" + + ",HOrgID,HWeek,HBeginDate,HEndDate,HPlanEmpID) " + + "values(" + + "" + omodel.HYear.ToString() + + "," + omodel.HPeriod.ToString() + + ",'" + this.BillType + + "','" + this.HBillSubType + + "'," + omodel.HInterID + + ",'" + omodel.HDate + + "','" + omodel.HBillNo + + "','" + omodel.HRemark + + "','" + omodel.HMaker + + "','" + omodel.HMakeDate + + "'," + omodel.HOrgID + + "," + omodel.HWeek + + ",'" + omodel.HBeginDate + + "','" + omodel.HEndDate + + "'," + omodel.HPlanEmpID + + ")"; + + oCn.RunProc(mainSql); + + //鎻掑叆瀛愯〃 + foreach (Model.ClsPM_WorkTaskWeekBillSub oSub in DetailColl) + { + string subSql = "insert into PM_WorkTaskWeekBillSub" + + "(HInterID,HEntryID,HCloseMan,HEntryCloseDate,HCloseType,HRemark,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + + ",HWeekDay,HSno,HProjectID,HProjectStageID,HTaskNote,HPlanTimes) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + ",'" + oSub.HCloseMan + + "','" + oSub.HEntryCloseDate + + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + + ",'" + oSub.HRemark + + "'," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "'," + oSub.HRelationQty + + "," + oSub.HRelationMoney + + "," + oSub.HWeekDay + + "," + oSub.HSno + + "," + oSub.HProjectID + + "," + oSub.HProjectStageID + + ",'" + oSub.HTaskNote + + "'," + oSub.HPlanTimes + + ")"; + oCn.RunProc(subSql); + } + sReturn = "鏂板鍗曟嵁鎴愬姛锛�"; + oCn.Commit(); + return true; + } + catch (Exception e) + { + sReturn = e.Message; + oCn.RollBack(); + throw (e); + } + } + #endregion + + #region 鏄剧ず鍗曟嵁 + public override bool ShowBill(Int64 lngBillKey, ref string sReturn) + { + try + { + //鏌ヨ涓昏〃 + DataSet Ds ; + Ds = oCn.RunProcReturn("select * from PM_WorkTaskWeekBillMain Where HInterID = " + lngBillKey.ToString(), "PM_WorkTaskWeekBillMain"); + if(Ds.Tables[0].Rows.Count==0) + { + sReturn = "鍗曟嵁鏈壘鍒帮紒"; + return false; + } + + //鍥哄畾璧嬪��=========================================== + omodel.HYear = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HYear"]); + omodel.HPeriod = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPeriod"]); + omodel.HBillType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillType"]); + omodel.HBillSubType = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBillSubType"]); + omodel.HInterID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HInterID"]); + omodel.HDate = DBUtility.ClsPub.isDate(Ds.Tables[0].Rows[0]["HDate"]); + omodel.HBillNo = Ds.Tables[0].Rows[0]["HBillNo"].ToString().Trim(); + omodel.HBillStatus = DBUtility.ClsPub.isInt(Ds.Tables[0].Rows[0]["HBillStatus"]); + omodel.HCheckItemNowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNowID"]); + omodel.HCheckItemNextID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckItemNextID"]); + omodel.HCheckFlowID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HCheckFlowID"]); + omodel.HRemark = Ds.Tables[0].Rows[0]["HRemark"].ToString().Trim(); + omodel.HBackDate = Ds.Tables[0].Rows[0]["HBackDate"].ToString().Trim(); + omodel.HBacker = Ds.Tables[0].Rows[0]["HBacker"].ToString().Trim(); + omodel.HCheckDate = Ds.Tables[0].Rows[0]["HCheckDate"].ToString().Trim(); + omodel.HChecker = Ds.Tables[0].Rows[0]["HChecker"].ToString().Trim(); + omodel.HMaker = Ds.Tables[0].Rows[0]["HMaker"].ToString().Trim(); + omodel.HMakeDate = Ds.Tables[0].Rows[0]["HMakeDate"].ToString().Trim(); + omodel.HUpDateDate = Ds.Tables[0].Rows[0]["HUpDateDate"].ToString().Trim(); + omodel.HUpDater = Ds.Tables[0].Rows[0]["HUpDater"].ToString().Trim(); + omodel.HCloseDate = Ds.Tables[0].Rows[0]["HCloseDate"].ToString().Trim(); + omodel.HCloseMan = Ds.Tables[0].Rows[0]["HCloseMan"].ToString().Trim(); + omodel.HCloseType = DBUtility.ClsPub.isBool(Ds.Tables[0].Rows[0]["HCloseType"]); + omodel.HDeleteDate = Ds.Tables[0].Rows[0]["HDeleteDate"].ToString().Trim(); + omodel.HDeleteMan = Ds.Tables[0].Rows[0]["HDeleteMan"].ToString().Trim(); + //======================================================== + + omodel.HOrgID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HOrgID"]); + omodel.HWeek = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HWeek"]); + omodel.HBeginDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBeginDate"]); + omodel.HEndDate = DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HEndDate"]); + omodel.HPlanEmpID = DBUtility.ClsPub.isLong(Ds.Tables[0].Rows[0]["HPlanEmpID"]); + + // + + //寰幆 + DataSet DsSub ; + DsSub = oCn.RunProcReturn("select * from PM_WorkTaskWeekBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "PM_WorkTaskWeekBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsPM_WorkTaskWeekBillSub oSub = new Model.ClsPM_WorkTaskWeekBillSub(); + // 鍥哄畾璧嬪��=============================================== + oSub.HInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HInterID"]); + oSub.HEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HEntryID"]); + oSub.HSourceInterID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceInterID"]); + oSub.HSourceEntryID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSourceEntryID"]); + oSub.HSourceBillType = DsSub.Tables[0].Rows[i]["HSourceBillType"].ToString().Trim(); + oSub.HSourceBillNo = DsSub.Tables[0].Rows[i]["HSourceBillNo"].ToString().Trim(); + oSub.HRelationQty = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationQty"]); + oSub.HRelationMoney = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HRelationMoney"]); + oSub.HCloseMan = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HCloseMan"]); + oSub.HCloseType = DBUtility.ClsPub.isBool(DsSub.Tables[0].Rows[i]["HCloseType"]); + oSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DsSub.Tables[0].Rows[i]["HEntryCloseDate"]); + oSub.HRemark = DsSub.Tables[0].Rows[i]["HRemark"].ToString().Trim(); + //=================================================== + oSub.HWeekDay = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HWeekDay"]); + oSub.HSno = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HSno"]); + oSub.HProjectID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProjectID"]); + oSub.HProjectStageID = DBUtility.ClsPub.isLong(DsSub.Tables[0].Rows[i]["HProjectStageID"]); + oSub.HTaskNote = DBUtility.ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HTaskNote"]); + oSub.HPlanTimes = DBUtility.ClsPub.isDoule(DsSub.Tables[0].Rows[i]["HPlanTimes"]); + + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + #endregion + + } + +} diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillMain.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillMain.cs" new file mode 100644 index 0000000..b02e1b0 --- /dev/null +++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillMain.cs" @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsPM_WorkTaskWeekBillMain : DBUtility.ClsXt_BaseBillMain + { + public Int64 HOrgID; //int 组织 + public Int64 HYear; //int 年份 + public Int64 HWeek; //int 周 + public string HBeginDate; //datetime 开始日期 + public string HEndDate; //datetime 结束日期 + public Int64 HPlanEmpID; //int 计划人 + } +} diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillSub.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillSub.cs" new file mode 100644 index 0000000..e35525b --- /dev/null +++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskWeekBillSub.cs" @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsPM_WorkTaskWeekBillSub : DBUtility.ClsXt_BaseBillSub + { + public Int64 HWeekDay; //int 周几 + public Int64 HSno; //int 序号 + public Int64 HProjectID; //int 项目内码 + public Int64 HProjectStageID; //int 项目阶段内码 + public string HTaskNote; //varchar(300) 工作任务内容 + public double HPlanTimes; //money 评估工时 + } +} diff --git a/WebAPI/WebAPI.csproj b/WebAPI/WebAPI.csproj index d35b066..3bcf88e 100644 --- a/WebAPI/WebAPI.csproj +++ b/WebAPI/WebAPI.csproj @@ -593,7 +593,6 @@ <Compile Include="Controllers\鐢熶骇绠$悊\璐ㄩ噺姹囨姤鍗昞Sc_QualityReportBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\涓氱哗鎸囨爣\PM_YearEmployeeMoneyBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔浠诲姟\PM_WorkTaskBillController.cs" /> - <Compile Include="Controllers\椤圭洰绠$悊\宸ヤ綔鍛ㄨ鍒抃PM_WorkTaskWeekBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\宸ョ▼椤圭洰\PM_ProjectBillController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\鎶ヨ〃鍒嗘瀽\PM_ReportController.cs" /> <Compile Include="Controllers\椤圭洰绠$悊\椤圭洰闃舵\Gy_ProjectStageController.cs" /> @@ -950,6 +949,7 @@ <ItemGroup> <Folder Include="App_Data\" /> <Folder Include="bin\" /> + <Folder Include="Controllers\椤圭洰绠$悊\宸ヤ綔鍛ㄨ鍒抃" /> <Folder Include="obj\x86\Debug\" /> <Folder Include="Views\Cg_PODemandPlanBill\" /> <Folder Include="Views\Cg_PurchaseReturn\" /> -- Gitblit v1.9.1