DAL/DAL.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DAL/项目管理/ClsPM_WorkReportWeekBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/Model.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/项目管理/ClsPM_WorkReportWeekBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/项目管理/ClsPM_WorkReportWeekBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/项目管理/工作周计划/PM_WorkTaskWeekBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/DAL.csproj
@@ -774,6 +774,7 @@ <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_CustomsSplitPackBill.cs" /> <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_LadingBill.cs" /> <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_ShippingAdviceBill.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkReportWeekBillMain.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkTaskWeekBill.cs" /> <Compile Include="项ç®ç®¡ç\ClsPro_DesignBlueRequestBill.cs" /> <Compile Include="项ç®ç®¡ç\ClsPro_ProjectCheckBill.cs" /> DAL/ÏîÄ¿¹ÜÀí/ClsPM_WorkReportWeekBillMain.cs
New file @@ -0,0 +1,298 @@ using System; using System.Collections.Generic; using System.Text; using System.Data; namespace DAL { public class ClsPM_WorkReportWeekBillMain : DBUtility.ClsXt_BaseBill { public Model.ClsPM_WorkReportWeekBillMain omodel = new Model.ClsPM_WorkReportWeekBillMain(); public List<Model.ClsPM_WorkReportWeekBillSub> DetailColl = new List<Model.ClsPM_WorkReportWeekBillSub>(); public ClsPM_WorkReportWeekBillMain() { base.MvarItemKeySub = "PM_WorkReportWeekBillSub"; base.MvarItemKeySub2 = ""; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey= "PM_WorkReportWeekBillMain"; base.MvarReportTitle="å·¥ä½å¨æ»ç»"; base.BillType="4757"; base.HBillSubType = "4757"; } #region åºå®ä»£ç #region æ åæé 彿° ~ClsPM_WorkReportWeekBillMain() { DetailColl = null; } #endregion #endregion #region ä¿®æ¹åæ® public override bool ModifyBill(Int64 lngBillKey, ref string sReturn) { try { oCn.BeginTran(); //æ´æ°ä¸»è¡¨ string mainSql = "update PM_WorkReportWeekBillMain 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.HReportEmpID + " 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_WorkReportWeekBillMain where HInterID = " + omodel.HInterID, "PM_WorkReportWeekBillMain"); 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_WorkReportWeekBillMain" + "(HYear,HPeriod,HBillType,HBillSubType,HInterID,HDate,HBillNo,HRemark,HMaker,HMakeDate" + ",HOrgID,HWeek,HBeginDate,HEndDate,HReportEmpID,HPlanTimes,HUseTimes,HRelUseTimes,HDelayTasks,HFineTasks,HFinishRate,HWorkReport,HNextPlan,HWorkGain ) " + "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.HReportEmpID + "," + omodel.HPlanTimes + "," + omodel.HUseTimes + "," + omodel.HRelUseTimes + "," + omodel.HDelayTasks + "," + omodel.HFineTasks + ",'" + omodel.HFinishRate+ "','" + omodel.HWorkReport+ "','" + omodel.HNextPlan+ "','" + omodel.HWorkGain+ "')"; 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_WorkReportWeekBillMain Where HInterID = " + lngBillKey.ToString(), "PM_WorkReportWeekBillMain"); // 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 } } Model/Model.csproj
@@ -968,6 +968,8 @@ <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_LadingBillSub.cs" /> <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_ShippingAdviceBillMain.cs" /> <Compile Include="éå®ç®¡ç\åè¯ç®¡ç\ClsXs_ShippingAdviceBillSub.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkReportWeekBillSub.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkReportWeekBillMain.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkTaskWeekBillSub.cs" /> <Compile Include="项ç®ç®¡ç\ClsPM_WorkTaskWeekBillMain.cs" /> <Compile Include="项ç®ç®¡ç\ClsPro_DesignBlueRequestBillMain.cs" /> Model/ÏîÄ¿¹ÜÀí/ClsPM_WorkReportWeekBillMain.cs
New file @@ -0,0 +1,25 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsPM_WorkReportWeekBillMain : 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 HReportEmpID; //int æ»ç»äºº public decimal HPlanTimes; // money --计åå·¥æ¶ public decimal HUseTimes; // money --æ¶èå·¥æ¶ public decimal HRelUseTimes; // money --ææå·¥æ¶ public decimal HDelayTasks; // money --å»¶æä»»å¡ public decimal HFineTasks; // money --è¶ åä»»å¡ public decimal HFinishRate; // money --è¾¾æç public string HWorkReport; //varchar(1000) --工使»ç» public string HNextPlan; //varchar(1000) --主导项ç®çä¸ä¸æ¥è®¡å public string HWorkGain; //varchar(1000) --å·¥ä½å¿å¾ } } Model/ÏîÄ¿¹ÜÀí/ClsPM_WorkReportWeekBillSub.cs
New file @@ -0,0 +1,11 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsPM_WorkReportWeekBillSub : DBUtility.ClsXt_BaseBillMain { } } WebAPI/Controllers/ÏîÄ¿¹ÜÀí/¹¤×÷Öܼƻ®/PM_WorkTaskWeekBillController.cs
@@ -20,6 +20,8 @@ public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); public DAL.ClsPM_WorkTaskWeekBill BillNew0 = new DAL.ClsPM_WorkTaskWeekBill(); //å·¥ä½å¨è®¡å对åºåæ®ç±» public DAL.ClsPM_WorkTaskWeekBill BillOld0 = new DAL.ClsPM_WorkTaskWeekBill(); //å·¥ä½å¨è®¡å对åºåæ®ç±» public DAL.ClsPM_WorkReportWeekBillMain BillNew = new DAL.ClsPM_WorkReportWeekBillMain(); //å·¥ä½å¨æ»ç»å¯¹åºåæ®ç±» public DAL.ClsPM_WorkReportWeekBillMain BillOld = new DAL.ClsPM_WorkReportWeekBillMain(); //å·¥ä½å¨æ»ç»å¯¹åºåæ®ç±» #region å·¥ä½å¨è®¡å å表2-å¾ æè®¡å æ°æ®è·å @@ -880,5 +882,393 @@ } } #endregion #region å·¥ä½å¨æ»ç» éæ©æ»ç»äººå¸¦åºå·¥æ¶ [Route("PM_WorkTaskWeekBill/PM_WorkReportWeekBillMainList")] [HttpGet] public object PM_WorkReportWeekBillMainList(string HOrgID,string user,string HYear,string HWeek,string HBeginDate,string HEndDate) { try { List<object> columnNameList = new List<object>(); //æ¥çæé if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥çæéï¼"; objJsonResult.data = null; return objJsonResult; } string sql = "exec h_p_PM_WorkReportWeekBillMain "+ HOrgID+","+ user+","+ HYear+","+ HWeek+",'"+ HBeginDate + "','"+ HEndDate + "'"; ds = oCn.RunProcReturn(sql, "h_p_PM_WorkReportWeekBillMain"); //æ·»å åå 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));//è·åå°DataColumnå对象çåå } if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æªè·åå°ç¸å ³æ°æ®ï¼"; objJsonResult.data = null; } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ¥è¯¢æåï¼"; objJsonResult.data = ds.Tables[0]; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } #endregion #region å·¥ä½å¨æ»ç»ä¿å/ç¼è¾ /// <summary> /// ä¿åçäº§é¢æå /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("PM_WorkTaskWeekBill/SavePM_WorkReportWeekBillMain")] [HttpPost] public object SavePM_WorkReportWeekBillMain([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string refSav = sArray[1].ToString(); //æä½æ¹å¼æ°æ®ç±»å 1æ·»å 3ä¿®æ¹ 2 å¤å¶ string user = sArray[2].ToString();//ç¨æ·å string UserName = ""; string s = ""; ListModels oListModels = new ListModels(); try { //ä¿åæé if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Add", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } DAL.ClsPM_WorkReportWeekBillMain oBill = new DAL.ClsPM_WorkReportWeekBillMain(); List<Model.ClsPM_WorkReportWeekBillMain> lsmain = new List<Model.ClsPM_WorkReportWeekBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_PM_WorkReportWeekBillMain(msg2); foreach (Model.ClsPM_WorkReportWeekBillMain oItem in lsmain) { if (refSav == "Add") { //忮巿¯å¦éå¤ if (BillNew.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 (BillOld.ShowBill(oItem.HInterID, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®æè¯¯ï¼"; objJsonResult.data = 1; return objJsonResult; } //夿æ¯å¦å¯ç¼è¾ if (BillOld.omodel.HChecker != "" && BillOld.omodel.HChecker != null) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®å·²ç»è¢«å®¡æ ¸ï¼ä¸å 许修æ¹ï¼"; objJsonResult.data = 1; return objJsonResult; } if (BillOld.omodel.HBillStatus > 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®å¤äºä¸å¯ç¼è¾ç¶æï¼ä¸å 许修æ¹ï¼"; objJsonResult.data = 1; return objJsonResult; } if (!DBUtility.Xt_BaseBillFun.Fun_AllowEditBill(BillOld, ref s)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s + "ï¼ä¸å 许修æ¹"; objJsonResult.data = 1; return objJsonResult; } } UserName = oItem.HMaker; //å¶å人 oItem.HBillType = "4757"; oItem.HBillSubType = "4757"; //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; } //ä¿å //ä¿å宿¯åå¤ç 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 = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); 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 å·¥ä½å¨æ»ç» å®¡æ ¸/åå®¡æ ¸åè½ [Route("PM_WorkTaskWeekBill/CheckPM_WorkReportWeekBillMain")] [HttpGet] public object CheckSc_ICMOReportBill(string HInterID, int IsAudit, string user) { try { //å®¡æ ¸æé if (!DBUtility.ClsPub.Security_Log_second("PM_WorkReportWeekBillMain_Check", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å®¡æ ¸å¤±è´¥ï¼æ æéï¼"; objJsonResult.data = null; return objJsonResult; } var ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID=" + HInterID, "PM_WorkReportWeekBillMain"); if (ds.Tables[0].Rows.Count > 0) { if (IsAudit == 0) //å®¡æ ¸å¤æ { if (ds.Tables[0].Rows[0]["HChecker"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½åæ¬¡å®¡æ ¸ï¼"; objJsonResult.data = null; return objJsonResult; } } if (IsAudit == 1) //åå®¡æ ¸å¤æ { if (ds.Tables[0].Rows[0]["HChecker"].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_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å®¡æ ¸æå"; objJsonResult.data = null; } if (IsAudit == 1) //åå®¡æ ¸å¤æ { oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null where HInterID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "åå®¡æ ¸æå"; objJsonResult.data = null; } oCn.Commit(); 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_WorkTaskWeekBill/ClosePM_WorkReportWeekBillMain")] [HttpGet] public object ClosePM_WorkReportWeekBillMain(string HInterID, int IsAudit, string user) { try { //夿æ¯å¦æå 餿é if (!DBUtility.ClsPub.Security_Log("PM_WorkReportWeekBillMain_Close", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéå ³é!"; objJsonResult.data = null; return objJsonResult; } var ds = oCn.RunProcReturn("select * from PM_WorkReportWeekBillMain where HInterID=" + HInterID, "PM_WorkReportWeekBillMain"); 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_WorkReportWeekBillMain set HChecker='" + user + "',HCheckDate=getdate() where HInterID=" + HInterID); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å®¡æ ¸æå"; objJsonResult.data = null; } if (IsAudit == 1) //åå®¡æ ¸å¤æ { oCn.RunProc("update PM_WorkReportWeekBillMain set HChecker='',HCheckDate=null 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 } } WebAPI/ListModels.cs
@@ -969,6 +969,17 @@ List<Models.ClsGy_StockCheckItemBill> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsGy_StockCheckItemBill>>(jsonString); return list; } /// <summary> /// å¤çæ°å¢å¨æ»ç»è¡¨çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsPM_WorkReportWeekBillMain> getObjectByJson_PM_WorkReportWeekBillMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsPM_WorkReportWeekBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsPM_WorkReportWeekBillMain>>(jsonString); return list; } /// <summary> /// å¤çæ°å¢æ¨¡å ·ä¿å »è®°å½è¡¨ä¸»è¡¨çjson