From df4a8d113800b9d67485f80cf0559e35008c8424 Mon Sep 17 00:00:00 2001 From: zrg <z18737863051@163.com> Date: 星期五, 26 四月 2024 17:10:40 +0800 Subject: [PATCH] 任务收费单 单据 --- Model/项目管理/ClsPM_WorkTaskMoneyBillSub.cs | 14 DAL/ClsPM_ProjectMoneyBillMain.cs | 4 Model/项目管理/ClsPM_WorkTaskMoneyBillMain.cs | 19 + WebAPI/ListModels.cs | 24 + DAL/DAL.csproj | 1 Model/Model.csproj | 2 DAL/ClsPM_WorkTaskMoneyBillMain.cs | 275 +++++++++++++++ WebAPI/Controllers/项目管理/工作任务/PM_WorkTaskBillController.cs | 737 ++++++++++++++++++++++++++++++++++++++++ 8 files changed, 1,072 insertions(+), 4 deletions(-) diff --git a/DAL/ClsPM_ProjectMoneyBillMain.cs b/DAL/ClsPM_ProjectMoneyBillMain.cs index e0edb14..dcaa3e6 100644 --- a/DAL/ClsPM_ProjectMoneyBillMain.cs +++ b/DAL/ClsPM_ProjectMoneyBillMain.cs @@ -18,8 +18,8 @@ base.MvarItemKeySub4 = ""; base.MvarItemKey= "PM_ProjectMoneyBillMain"; base.MvarReportTitle="椤圭洰璐圭敤鍗�"; - base.BillType="4759"; - base.HBillSubType = "4759"; + base.BillType="4762"; + base.HBillSubType = "4762"; } diff --git "a/DAL/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" "b/DAL/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" new file mode 100644 index 0000000..9679527 --- /dev/null +++ "b/DAL/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" @@ -0,0 +1,275 @@ +锘縰sing System; +using System.Collections.Generic; +using System.Text; +using System.Data; + +namespace DAL +{ + public class ClsPM_WorkTaskMoneyBillMain : DBUtility.ClsXt_BaseBill + { + public Model.ClsPM_WorkTaskMoneyBillMain omodel = new Model.ClsPM_WorkTaskMoneyBillMain(); + public List<Model.ClsPM_WorkTaskMoneyBillSub> DetailColl = new List<Model.ClsPM_WorkTaskMoneyBillSub>(); + + public ClsPM_WorkTaskMoneyBillMain() + { + base.MvarItemKeySub = "PM_WorkTaskMoneyBillSub"; + base.MvarItemKeySub2 = ""; + base.MvarItemKeySub3 = ""; + base.MvarItemKeySub4 = ""; + base.MvarItemKey= "PM_WorkTaskMoneyBillMain"; + base.MvarReportTitle="浠诲姟璐圭敤鍗�"; + base.BillType="4763"; + base.HBillSubType = "4763"; + + } + + #region 鍥哄畾浠g爜 + #region 鏃犲弬鏋勯�犲嚱鏁� + ~ClsPM_WorkTaskMoneyBillMain() + { + DetailColl = null; + } + #endregion + #endregion + + //#region 淇敼鍗曟嵁 + public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) + { + try + { + oCn.BeginTran(); + //鏇存柊涓昏〃 + string mainSql = "update PM_WorkTaskMoneyBillMain set " + + " HBillNo = '" + omodel.HBillNo + + "', HRemark = '" + omodel.HRemark + + "', HProjectID = '" + omodel.HProjectID + + "', HProNumber = '" + omodel.HProNumber+ + "', HProName = '" + omodel.HProName + + "', HCusID = '" + omodel.HCusID + + "', HWorkTaskID = '" + omodel.HWorkTaskID + + "', HWorkTaskNumber = '" + omodel.HWorkTaskNumber + + "', HWorkTaskName = '" + omodel.HWorkTaskName + + "', HOrgID ='" + omodel.HOrgID + + "', HUpDater = '" + omodel.HUpDater + + "', HUpDateDate = getdate()" + + //=============================================================== + + " where HInterID = " + omodel.HInterID; + oCn.RunProc(mainSql); + //鍒犻櫎鍏宠仈 + DeleteRelation(ref sReturn, lngBillKey); + //鍒犻櫎瀛愯〃 + DeleteBillSub(lngBillKey); + + //鎻掑叆瀛愯〃 + omodel.HInterID = lngBillKey; + foreach (Model.ClsPM_WorkTaskMoneyBillSub oSub in DetailColl) + { + string subSql = "insert into PM_WorkTaskMoneyBillSub " + + "" + + "" + + "" + + "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + ",HProMoneyID,HQty,HPrice,HMoney) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + "," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "','" + oSub.HProMoneyID + + "'," + oSub.HQty + + "," + oSub.HPrice + + ",'" + oSub.HMoney + + "')"; + 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_WorkTaskMoneyBillMain where HInterID = " + omodel.HInterID, "PM_WorkTaskMoneyBillMain"); + 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_WorkTaskMoneyBillMain" + + "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" + + ",HProjectID,HProNumber,HProName,HCusID,HWorkTaskID,HWorkTaskNumber,HWorkTaskName,HOrgID) " + + "values(" + + "" + (omodel.HYear.ToString() != "0" ? omodel.HYear.ToString() : DateTime.Now.Year.ToString()) + + "," + omodel.HPeriod.ToString() + + ",'" + this.BillType + + "','" + this.HBillSubType + + "'," + omodel.HInterID + + ",'" + omodel.HDate + + "','" + omodel.HBillNo + + "','" + omodel.HRemark + + "','" + omodel.HMaker + + "','" + omodel.HMakeDate + + "','" + omodel.HProjectID + + "','" + omodel.HProNumber + + "','" + omodel.HProName+ + "','" + omodel.HCusID+ + "','" + omodel.HWorkTaskID + + "','" + omodel.HWorkTaskNumber + + "','" + omodel.HWorkTaskName + + "','" + omodel.HOrgID+ + "')"; + + oCn.RunProc(mainSql); + + //鎻掑叆瀛愯〃 + foreach (Model.ClsPM_WorkTaskMoneyBillSub oSub in DetailColl) + { + string subSql = "insert into PM_WorkTaskMoneyBillSub " + + "" + + "" + + "" + + "(HInterID,HEntryID,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType" + + ",HProMoneyID,HQty,HPrice,HMoney) " + + " values(" + + "" + omodel.HInterID.ToString() + + "," + oSub.HEntryID.ToString() + + "," + oSub.HSourceInterID + + "," + oSub.HSourceEntryID + + ",'" + oSub.HSourceBillNo + + "','" + oSub.HSourceBillType + + "','" + oSub.HProMoneyID + + "'," + oSub.HQty + + "," + oSub.HPrice + + ",'" + oSub.HMoney + + "')"; + 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_WorkTaskMoneyBillMain Where HInterID = " + lngBillKey.ToString(), "PM_WorkTaskMoneyBillMain"); + 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"]); + + + // + + //寰幆 + DataSet DsSub; + DsSub = oCn.RunProcReturn("select * from PM_WorkTaskMoneyBillSub where HInterID = " + lngBillKey.ToString() + "order by HEntryID", "PM_WorkTaskMoneyBillSub"); + DetailColl.Clear();//娓呯┖ + for (int i = 0; i < DsSub.Tables[0].Rows.Count; i++) + { + Model.ClsPM_WorkTaskMoneyBillSub oSub = new Model.ClsPM_WorkTaskMoneyBillSub(); + // 鍥哄畾璧嬪��=============================================== + 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(); + //=================================================== + + DetailColl.Add(oSub); + } + sReturn = "鏄剧ず鍗曟嵁鎴愬姛锛�"; + return true; + } + catch (Exception e) + { + sReturn = e.Message; + throw (e); + } + } + #endregion + + } + +} diff --git a/DAL/DAL.csproj b/DAL/DAL.csproj index b641838..3f645de 100644 --- a/DAL/DAL.csproj +++ b/DAL/DAL.csproj @@ -82,6 +82,7 @@ <Compile Include="ClsPay_WorkErrTimesBill.cs" /> <Compile Include="ClsPM_ProjectEndBillMain.cs" /> <Compile Include="ClsPM_ProjectBeginBillMain.cs" /> + <Compile Include="Cls锘縋M_WorkTaskMoneyBillMain.cs" /> <Compile Include="ClsPM_ProjectMoneyBillMain.cs" /> <Compile Include="ClsPM_CustomerTaskBillMain.cs" /> <Compile Include="ClsGy_MaterialMouldBillMain.cs" /> diff --git a/Model/Model.csproj b/Model/Model.csproj index feb8ba4..f0533f1 100644 --- a/Model/Model.csproj +++ b/Model/Model.csproj @@ -1034,6 +1034,8 @@ <Compile Include="椤圭洰绠$悊\ClsPM_ProjectBeginBillMain.cs" /> <Compile Include="椤圭洰绠$悊\ClsPM_ProjectEndBillSub.cs" /> <Compile Include="椤圭洰绠$悊\ClsPM_ProjectBeginBillSub.cs" /> + <Compile Include="椤圭洰绠$悊\Cls锘縋M_WorkTaskMoneyBillMain.cs" /> + <Compile Include="椤圭洰绠$悊\ClsPM_WorkTaskMoneyBillSub.cs" /> <Compile Include="椤圭洰绠$悊\ClsPM_ProjectMoneyBillSub.cs" /> <Compile Include="椤圭洰绠$悊\ClsPM_ProjectMoneyBillMain.cs" /> <Compile Include="椤圭洰绠$悊\ClsPM_CustomerTaskBillMain.cs" /> diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskMoneyBillSub.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskMoneyBillSub.cs" new file mode 100644 index 0000000..2000c74 --- /dev/null +++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/ClsPM_WorkTaskMoneyBillSub.cs" @@ -0,0 +1,14 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsPM_WorkTaskMoneyBillSub : DBUtility.ClsXt_BaseBillSub + { + public Int64 HProMoneyID; //int --项目费用 + public decimal HQty; //money --数量 + public decimal HPrice; //money --单价 + public decimal HMoney; //money --金额 + } +} diff --git "a/Model/\351\241\271\347\233\256\347\256\241\347\220\206/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" new file mode 100644 index 0000000..3c9f01e --- /dev/null +++ "b/Model/\351\241\271\347\233\256\347\256\241\347\220\206/Cls\357\273\277PM_WorkTaskMoneyBillMain.cs" @@ -0,0 +1,19 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Model +{ + public class ClsPM_WorkTaskMoneyBillMain : DBUtility.ClsXt_BaseBillMain + { + public Int64 HWorkTaskID; //int 任务内码 + public string HWorkTaskNumber;// varchar(50) //任务代码 + public string HWorkTaskName;// varchar(50) 任务名称 + public Int64 HProjectID; //int 项目内码 + public string HProNumber;// varchar(50) //项目代码 + public string HProName;// varchar(50) 项目阶段 + public Int64 HCusID;// int //客户 + public Int64 HOrgID;// int //组织 + + } +} diff --git "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" index 75d10cd..844703b 100644 --- "a/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" +++ "b/WebAPI/Controllers/\351\241\271\347\233\256\347\256\241\347\220\206/\345\267\245\344\275\234\344\273\273\345\212\241/PM_WorkTaskBillController.cs" @@ -22,6 +22,7 @@ public DAL.ClsSc_ICMOBill BillOld = new DAL.ClsSc_ICMOBill(); string user_LongShan = ""; string HName_LongShan = ""; + public DAL.ClsPM_WorkTaskMoneyBillMain BillNew0 = new DAL.ClsPM_WorkTaskMoneyBillMain(); //浠诲姟璐圭敤鍗曞搴斿崟鎹被 #region 宸ヤ綔浠诲姟 鏂板/缂栬緫 #region 宸ヤ綔浠诲姟 琛ㄥご鏁版嵁 @@ -2324,6 +2325,740 @@ } #endregion - + #region 浠诲姟璐圭敤 淇濆瓨/缂栬緫 + /// <summary> + /// 浠诲姟璐圭敤 + /// </summary> + /// <param name="msg"></param> + /// <returns></returns> + [Route("PM_WorkTaskBill/Save锘縋M_WorkTaskMoneyBillMain")] + [HttpPost] + public object Save锘縋M_WorkTaskMoneyBillMain([FromBody] JObject sMainSub) + { + var _value = sMainSub["sMainSub"].ToString(); + string msg1 = _value.ToString(); + string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); + string msg2 = sArray[0].ToString(); + string msg3 = sArray[1].ToString(); //瀛愯〃 + string refSav = sArray[2].ToString();//鎿嶄綔鏂瑰紡鏁版嵁绫诲瀷 1娣诲姞 3淇敼 2 澶嶅埗 + string user = sArray[3].ToString();//鐢ㄦ埛鍚� + + string UserName = ""; + string s = ""; + ListModels oListModels = new ListModels(); + try + { + //淇濆瓨鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("PM_WorkTaskMoneyBillMain_Edit", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + DAL.Cls锘縋M_WorkTaskMoneyBillMain oBill = new DAL.Cls锘縋M_WorkTaskMoneyBillMain(); + List<Model.Cls锘縋M_WorkTaskMoneyBillMain> lsmain = new List<Model.Cls锘縋M_WorkTaskMoneyBillMain>(); + msg2 = msg2.Replace("\\", ""); + msg2 = msg2.Replace("\n", ""); //\n + lsmain = oListModels.getObjectByJson_锘縋M_WorkTaskMoneyBillMain(msg2); + foreach (Model.Cls锘縋M_WorkTaskMoneyBillMain oItem in lsmain) + { + if (refSav == "Add") + { + //鍗曟嵁鍙锋槸鍚﹂噸澶� + if (BillNew0.IsExistBillNo(ref ClsPub.sExeReturnInfo, oItem.HBillNo, BillStatus, BillOld.omodel.HInterID)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鍙烽噸澶嶏紒涓嶅厑璁镐繚瀛橈紒"; + objJsonResult.data = 1; + return objJsonResult; + } + } + if (refSav == "Update") + { + if (BillNew0.ShowBill(oItem.HInterID, ref s) == false) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹湁璇紒"; + objJsonResult.data = 1; + return objJsonResult; + } + //鍒ゆ柇鏄惁鍙紪杈� + if (BillNew0.omodel.HChecker != "" && BillNew0.omodel.HChecker != null) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹凡缁忚瀹℃牳锛屼笉鍏佽淇敼锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + if (BillNew0.omodel.HBillStatus > 1) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "姝ゅ崟鎹浜庝笉鍙紪杈戠姸鎬侊紝涓嶅厑璁镐慨鏀癸紒"; + objJsonResult.data = 1; + return objJsonResult; + } + + } + UserName = oItem.HMaker; //鍒跺崟浜� + oItem.HBillType = "4763"; + oItem.HBillSubType = "4763"; + + + + //oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); + oItem.HPeriod = DBUtility.ClsPub.isLong(DateTime.Now.Month); + oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); + + if (DBUtility.ClsPub.isStrNull(oItem.HDate) == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛佹病鏈夊崟鎹棩鏈燂紝鏃犳硶淇濆瓨锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + oBill.omodel = oItem; + } + // 琛ㄤ綋鏁版嵁 + //鎸� },{鏉ユ媶鍒嗘暟缁� //鍘绘帀銆愬拰銆� + msg3 = msg3.Substring(1, msg3.Length - 2); + msg3 = msg3.Replace("\\", ""); + msg3 = msg3.Replace("\n", ""); //\n + List<Model.Cls锘縋M_WorkTaskMoneyBillSub> ls = new List<Model.Cls锘縋M_WorkTaskMoneyBillSub>(); + ls = oListModels.getObjectByJson_锘縋M_WorkTaskMoneyBillSub(msg3); + int i = 0; + foreach (Model.Cls锘縋M_WorkTaskMoneyBillSub oItemSub in ls) + { + i++; + oItemSub.HEntryID = i; + + + oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); + oItemSub.HCloseType = false; //鍏抽棴绫诲瀷 + + oBill.DetailColl.Add(oItemSub); + + } + //淇濆瓨 + //淇濆瓨瀹屾瘯鍚庡鐞� + bool bResult; + if (refSav == "Add") + { + + bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); + } + else if (refSav == "Update") + { + bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); + } + else + { + bResult = false; + } + if (bResult) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "淇濆瓨鎴愬姛锛�"; + objJsonResult.data = 1; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = 1; + return objJsonResult; + } + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "淇濆瓨澶辫触锛�" + e.ToString(); + objJsonResult.data = 1; + return objJsonResult; + } + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 鏌ヨ + /// <summary> + /// 杩斿洖浠诲姟璐圭敤鍒楄〃 + ///鍙傛暟锛歴tring sql銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("PM_WorkTaskBill/get锘縋M_WorkTaskMoneyBillMainList")] + [HttpGet] + public object get锘縋M_WorkTaskMoneyBillMainList(string sWhere, string user) + { + try + { + List<object> columnNameList = new List<object>(); + + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("PM_WorkTaskMoneyBillMain_Check", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + + if (sWhere == null || sWhere.Equals("")) + { + ds = oCN.RunProcReturn("select * from h_v_PM_WorkTaskMoneyBillMainList order by 鍗曟嵁鍙� desc", "锘縣_v_PM_WorkTaskMoneyBillMainList"); + } + else + { + string sql1 = "select * from h_v_锘縣_v_PM_WorkTaskMoneyBillMainList where 1 = 1 "; + string sql = sql1 + sWhere + " order by 鍗曟嵁鍙� desc"; + ds = oCN.RunProcReturn(sql, "锘縣_v_PM_WorkTaskMoneyBillMainList"); + } + + //娣诲姞鍒楀悕 + foreach (DataColumn col in ds.Tables[0].Columns) + { + Type dataType = col.DataType; + string ColmString = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; + columnNameList.Add(JsonConvert.DeserializeObject(ColmString));//鑾峰彇鍒癉ataColumn鍒楀璞$殑鍒楀悕 + } + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "Sucess锛�"; + objJsonResult.data = ds.Tables[0]; + objJsonResult.list = columnNameList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 鑾峰彇缂栬緫鍒楄〃鏁版嵁 + [Route("PM_WorkTaskBill/锘縋M_WorkTaskMoneyBillMainEditList")] + [HttpGet] + public object PM_WorkTaskMoneyBillMainEditList(string HInterID, string User) + { + try + { + List<DataTable> tableList = new List<DataTable>(); + + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("PM_WorkTaskMoneyBillMain_Edit", 1, false, User)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏌ヨ澶辫触!"; + objJsonResult.data = null; + return objJsonResult; + } + + if (HInterID == null || HInterID.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + ds = oCN.RunProcReturn("exec h_p_锘縋M_WorkTaskMoneyBill_EditInit " + HInterID, "h_p_锘縋M_WorkTaskMoneyBill_EditInit"); + tableList.Add(ds.Tables[0]); + tableList.Add(ds.Tables[1]); + + + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鏌ヨ鎴愬姛锛�"; + objJsonResult.data = tableList; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 瀹℃牳/鍙嶅鏍稿姛鑳� + [Route("PM_WorkTaskBill/CheckPM_WorkTaskMoneyBillMain")] + [HttpGet] + public object CheckPM_ProjectBeginBillMain(int HInterID, int IsAudit, string CurUserName) + { + DBUtility.ClsPub.CurUserName = CurUserName; + try + { + //瀹℃牳鏉冮檺 + if (!DBUtility.ClsPub.Security_Log_second("PM_WorkTaskMoneyBillMain_Check", 1, false, CurUserName)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触锛佹棤鏉冮檺锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + //HInterID鏁版嵁鍒ゆ柇 + if (HInterID <= 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID灏忎簬0锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + + Int64 lngBillKey = 0; + lngBillKey = DBUtility.ClsPub.isLong(HInterID); //瀵笻InterID杩涜绫诲瀷鐨勮浆鎹� + DAL.ClsPM_WorkTaskMoneyBillMain oBill = new DAL.ClsPM_WorkTaskMoneyBillMain(); //瀹炰緥鍖栧崟鎹搷浣滅被锛岀敤浜庤繘琛岀浉鍏虫搷浣� + + //閽堝闇�瑕佽繘琛岀殑鎿嶄綔锛屾楠屽綋鍓嶅崟鎹殑鐘舵�佹槸鍚︽敮鎸侀渶瑕佽繘琛岀殑鎿嶄綔 + if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) //鏍规嵁HInterID鑾峰彇璇ュ崟鎹殑鏁版嵁 + { + if (oBill.omodel.HCloseMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (oBill.omodel.HDeleteMan.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + if (IsAudit == 0) //瀹℃牳鍒ゆ柇 + { + if (oBill.omodel.HChecker.Trim() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插鏍�!涓嶈兘鍐嶆瀹℃牳锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍稿垽鏂� + { + if (oBill.omodel.HChecker.Trim() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈鏍�!涓嶉渶瑕佸弽瀹℃牳!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + + + //杩涜闇�瑕佽繘琛岀殑瀹℃牳/鍙嶅鏍告搷浣� + if (IsAudit == 0) //瀹℃牳鎻愪氦 + { + oCN.BeginTran(); + + //璁板綍杩斿洖淇℃伅 + string msg = ""; + + //瀹℃牳鍓嶆帶鍒�========================================= + string sql1 = "exec h_p_PM_WorkTaskMoneyBill_BeforeCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_PM_WorkTaskMoneyBill_BeforeCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:瀹℃牳鍓嶅垽鏂け璐ワ紝璇蜂笌缃戠粶绠$悊浜哄憳鑱旂郴"; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + oCN.RollBack(); + return objJsonResult; + } + //================================================================================== + + //瀹℃牳鎻愪氦 + if (oBill.CheckBill(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_PM_WorkTaskMoneyBill_AfterCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "瀹℃牳鎴愬姛锛�" + msg; + objJsonResult.data = null; + return objJsonResult; + } + else + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅鏍告彁浜� + { + + //鍙嶅鏍稿墠鎺у埗========================================= + string sql1 = "exec h_p_PM_WorkTaskMoneyBill_BeforeUnCheckCtrl " + oBill.omodel.HInterID + ",'" + oBill.omodel.HBillNo + "','" + CurUserName + "'"; + ds = oCN.RunProcReturn(sql1, "h_p_PM_WorkTaskMoneyBill_BeforeUnCheckCtrl"); + if (ds == null || ds.Tables.Count == 0 || ds.Tables[0].Rows.Count == 0) + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:鍙嶅鏍稿墠鍒ゆ柇澶辫触锛岃涓庣綉缁滅鐞嗕汉鍛樿仈绯�"; + objJsonResult.data = null; + return objJsonResult; + + } + if (ds.Tables[0].Rows[0]["HBack"].ToString() != "0") + { + objJsonResult.code = "0"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + ds.Tables[0].Rows[0]["HRemark"].ToString(); ; + objJsonResult.data = null; + return objJsonResult; + } + //=========================================================== + + //鍙嶅鏍告彁浜bandonCheck + if (oBill.AbandonCheck(oBill.omodel.HInterID, oBill.omodel.HBillNo, "h_p_PM_WorkTaskMoneyBill_AfterUnCheckCtrl", CurUserName, ref DBUtility.ClsPub.sExeReturnInfo) == true) + { + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅鏍告垚鍔�"; + objJsonResult.data = null; + return objJsonResult; + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍙嶅鏍稿け璐�!鍘熷洜:" + DBUtility.ClsPub.sExeReturnInfo; + objJsonResult.data = null; + return objJsonResult; + } + } + return objJsonResult; + } + catch (Exception e) + { + oCN.RollBack(); + + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "瀹℃牳澶辫触鎴栬�呭弽瀹℃牳澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 鍏抽棴/鍙嶅叧闂姛鑳� + [Route("PM_WorkTaskBill/ClosePM_WorkTaskMoneyBillMain")] + [HttpGet] + public object ClosePM_WorkTaskMoneyBillMain(string HInterID, int IsAudit, string user) + { + try + { + //鍒ゆ柇鏄惁鏈夊叧闂潈闄� + if (!DBUtility.ClsPub.Security_Log("PM_WorkTaskMoneyBillMain_Close", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愬叧闂�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + var ds = oCN.RunProcReturn("select * from PM_WorkTaskMoneyBillMain where HInterID=" + HInterID, "PM_WorkTaskMoneyBillMain"); + if (ds.Tables[0].Rows.Count > 0) + { + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸插叧闂�!涓嶈兘鍐嶆鍏抽棴锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂垽鏂� + { + if (ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈叧闂�!涓嶉渶瑕佸弽鍏抽棴!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HCloseMan='" + user + "',HCloseDate=getdate(),HBillStatus='3' where HInterID=" + HInterID); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍏抽棴鎴愬姛"; + objJsonResult.data = null; + } + if (IsAudit == 1) //鍙嶅叧闂垽鏂� + { + if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "") + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HCloseMan='',HCloseDate=null,HBillStatus='1' where HInterID=" + HInterID); + } + else + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HCloseMan='',HCloseDate=null,HBillStatus='2' where HInterID=" + HInterID); + } + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅叧闂垚鍔�"; + objJsonResult.data = null; + } + oCN.Commit(); + + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 浣滃簾/鍙嶄綔搴熷姛鑳� + [Route("PM_WorkTaskBill/DropPM_WorkTaskMoneyBillMain")] + [HttpGet] + public object DropPM_WorkTaskMoneyBillMain(string HInterID, int IsAudit, string user) + { + try + { + //鍒ゆ柇鏄惁鏈夊叧闂潈闄� + if (!DBUtility.ClsPub.Security_Log("PM_WorkTaskMoneyBillMain_Drop", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犳潈闄愬叧闂�!"; + objJsonResult.data = null; + return objJsonResult; + } + + + var ds = oCN.RunProcReturn("select * from PM_WorkTaskMoneyBillMain where HInterID=" + HInterID, "PM_WorkTaskMoneyBillMain"); + if (ds.Tables[0].Rows.Count > 0) + { + if (IsAudit == 0) //鍏抽棴鍒ゆ柇 + { + if (ds.Tables[0].Rows[0]["HDeleteMan"].ToString() != "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁宸蹭綔搴�!涓嶈兘鍐嶆浣滃簾锛�"; + objJsonResult.data = null; + return objJsonResult; + } + } + if (IsAudit == 1) //鍙嶅叧闂垽鏂� + { + if (ds.Tables[0].Rows[0]["HDeleteMan"].ToString() == "") + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁鏈綔搴�!涓嶉渶瑕佸弽浣滃簾!"; + objJsonResult.data = null; + return objJsonResult; + } + } + } + else + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鍗曟嵁涓嶅瓨鍦�!"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + + if (IsAudit == 0) //浣滃簾鍒ゆ柇 + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HDeleteMan='" + user + "',HDeleteDate=getdate(),HBillStatus='4' where HInterID=" + HInterID); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍏抽棴鎴愬姛"; + objJsonResult.data = null; + } + if (IsAudit == 1) //鍙嶄綔搴熷垽鏂� + { + if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "" && ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "") + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HDeleteMan='',HDeleteDate=null,HBillStatus='1' where HInterID=" + HInterID); + } + else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "" && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "") + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HDeleteMan='',HDeleteDate=null,HBillStatus='3' where HInterID=" + HInterID); + } + else if (ds.Tables[0].Rows[0]["HChecker"].ToString() == "" && ds.Tables[0].Rows[0]["HCloseMan"].ToString() != "") + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HDeleteMan='',HDeleteDate=null,HBillStatus='3' where HInterID=" + HInterID); + } + else if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "" && ds.Tables[0].Rows[0]["HCloseMan"].ToString() == "") + { + oCN.RunProc("update PM_WorkTaskMoneyBillMain set HDeleteMan='',HDeleteDate=null,HBillStatus='2' where HInterID=" + HInterID); + } + + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍙嶅叧闂垚鍔�"; + objJsonResult.data = null; + } + oCN.Commit(); + + return objJsonResult; + + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鎵ц澶辫触锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + #region 浠诲姟璐圭敤鍒楄〃 鍒犻櫎 + /// <summary> + ///鍙傛暟锛歴tring HInterID銆� + ///杩斿洖鍊硷細object銆� + /// </summary> + [Route("PM_WorkTaskBill/DeletePM_WorkTaskMoneyBillMain")] + [HttpGet] + public object DeletePM_WorkTaskMoneyBillMain(string HInterID, string user) + { + try + { + //鏌ョ湅鏉冮檺 + if (!DBUtility.ClsPub.Security_Log("PM_WorkTaskMoneyBillMain_Delete", 1, false, user)) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "鏃犲垹闄ゆ潈闄愶紒"; + objJsonResult.data = null; + return objJsonResult; + } + + if (HInterID == null || HInterID.Equals("")) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "HInterID涓嶈兘涓虹┖锛�"; + objJsonResult.data = null; + return objJsonResult; + } + + oCN.BeginTran(); + + oCN.RunProc("delete from PM_WorkTaskMoneyBillMain where HInterID = " + HInterID); + + oCN.RunProc("delete from PM_WorkTaskMoneyBillSub where HInterID = " + HInterID); + + oCN.Commit(); + + objJsonResult.code = "1"; + objJsonResult.count = 1; + objJsonResult.Message = "鍒犻櫎鎴愬姛锛�"; + objJsonResult.data = null; + return objJsonResult; + } + catch (Exception e) + { + objJsonResult.code = "0"; + objJsonResult.count = 0; + objJsonResult.Message = "Exception锛�" + e.ToString(); + objJsonResult.data = null; + return objJsonResult; + } + } + #endregion + + } } \ No newline at end of file diff --git a/WebAPI/ListModels.cs b/WebAPI/ListModels.cs index f7c9643..1d17cd2 100644 --- a/WebAPI/ListModels.cs +++ b/WebAPI/ListModels.cs @@ -1382,8 +1382,30 @@ return list; } + /// <summary> + /// 澶勭悊鏂板浠诲姟璐圭敤涓昏〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsPM_WorkTaskMoneyBillMain> getObjectByJson_锘縋M_WorkTaskMoneyBillMain(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsPM_WorkTaskMoneyBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskMoneyBillMain>>(jsonString); + return list; + } + /// <summary> + /// 澶勭悊鏂板浠诲姟璐圭敤瀛愯〃鐨刯son + /// </summary> + /// <param name="jsonString"></param> + /// <returns></returns> + public List<Model.ClsPM_WorkTaskMoneyBillSub> getObjectByJson_锘縋M_WorkTaskMoneyBillSub(string jsonString) + { + jsonString = "[" + jsonString.ToString() + "]"; + List<Model.ClsPM_WorkTaskMoneyBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkTaskMoneyBillSub>>(jsonString); + return list; + } - + /// <summary> /// 澶勭悊鏂板椤圭洰鍚姩琛ㄧ殑json /// </summary> -- Gitblit v1.9.1