DAL/生产管理/设备管理/ClsSb_EquipMaintainBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DAL/生产管理/设备管理/ClsSb_EquipMaintainPlanBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
DBUtility/业务单据/ClsXt_BaseBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/Model.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/生产管理/设备管理/ClsSc_EquipMaintainBillSub_Item.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainBill.cs
@@ -9,18 +9,17 @@ { public Model.ClsSb_EquipMaintainBillMain omodel = new Model.ClsSb_EquipMaintainBillMain(); public List<Model.ClsSb_EquipMaintainBillSub> DetailColl = new List<Model.ClsSb_EquipMaintainBillSub>(); public List<Model.ClsSc_EquipMaintainBillSub_Item> DetailCol = new List<Model.ClsSc_EquipMaintainBillSub_Item>(); public ClsSb_EquipMaintainBill() { base.MvarItemKeySub = "Sb_EquipMaintainBillSub"; base.MvarItemKeySub2 = ""; base.MvarItemKeySub2 = "Sb_EquipMaintainBillSub_Item"; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey="Sb_EquipMaintainBillMain"; base.MvarReportTitle="设å¤ä¿å »è®°å½"; base.BillType = "3901"; base.HBillSubType = "3901"; } #region åºå®ä»£ç @@ -59,7 +58,8 @@ DeleteRelation(ref sReturn, lngBillKey); //å é¤å表 DeleteBillSub(lngBillKey); //æå ¥å表 DeleteBillSub2(lngBillKey); //æå ¥é 件项å表 omodel.HInterID = lngBillKey; foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl) { @@ -77,18 +77,23 @@ "," + oSub.HManagerID.ToString()+",'" +oSub.HManagerNumber+"'"+ ") "); } // //foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl) //{ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipMaintainBill_Qty " + oSub.HICMOInterID, ""); // if (Ds.Tables[0].Rows.Count == 0) // return; // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") // { // sReturn = "æ±æ¥æ°éè¶ è¿è®¡åæ°éï¼ä¸å 许ä¿å"; // return false; // } //} //æå ¥ä¿å »é¡¹å表 foreach (Model.ClsSc_EquipMaintainBillSub_Item Item in DetailCol) { oCn.RunProc("Insert into Sb_EquipMaintainBillSub_Item" + " (HInterID,HEntryID,HMaintainItemID" + ",HMaintainPart,HClaim" + ",HManagerID" + ",HCloseMan,HCloseType,HRemark" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + ") values(" + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" + "," + Item.HManagerID.ToString() + ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" + "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + ") "); } sReturn = "ä¿®æ¹åæ®æåï¼"; oCn.Commit(); return true; @@ -119,7 +124,7 @@ "," + omodel.HYear.ToString() + "," + omodel.HPeriod.ToString() + ",'" + omodel.HRemark + "'," + omodel.HEquipID.ToString() + ",'" + omodel.HBeginDate + "','" + omodel.HEndDate + "','" + omodel.HPlanNo + "','" + omodel.HExplanation + "','" + omodel.HInnerBillNo + "'" + ") "); //æå ¥å表 //æå ¥é ä»¶å表 foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl) { oCn.RunProc("Insert into Sb_EquipMaintainBillSub " + @@ -136,19 +141,23 @@ "," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" + ") "); } // //foreach (Model.ClsSb_EquipMaintainBillSub oSub in DetailColl) //{ // Ds = oCn.RunProcReturn("exec h_p_Sb_EquipMaintainBill_Qty " + oSub.HICMOInterID, ""); // if (Ds.Tables[0].Rows.Count == 0) // return; // if (DBUtility.ClsPub.isStrNull(Ds.Tables[0].Rows[0]["HBool"]) == "Y") // { // sReturn = "æ±æ¥æ°éè¶ è¿è®¡åæ°éï¼ä¸å 许ä¿å"; // return false; // } //} // //æå ¥ä¿å »é¡¹å表 foreach (Model.ClsSc_EquipMaintainBillSub_Item Item in DetailCol) { oCn.RunProc("Insert into Sb_EquipMaintainBillSub_Item" + " (HInterID,HEntryID,HMaintainItemID" + ",HMaintainPart,HClaim" + ",HManagerID" + ",HCloseMan,HCloseType,HRemark" + ",HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + ") values(" + omodel.HInterID.ToString() + "," + Item.HEntryID.ToString() + "," + Item.HMaintainItemID.ToString() + ",'" + Item.HMaintainPart.ToString() + "','" + Item.HClaim.ToString() + "'" + "," + Item.HManagerID.ToString() + ",'" + Item.HCloseMan + "'," + Convert.ToString(Item.HCloseType ? 1 : 0) + ",'" + Item.HRemark + "'" + "," + Item.HSourceInterID.ToString() + "," + Item.HSourceEntryID.ToString() + ",'" + Item.HSourceBillNo + "','" + Item.HSourceBillType + "'," + Item.HRelationQty.ToString() + "," + Item.HRelationMoney.ToString() + ") "); } sReturn = "æ°å¢åæ®æåï¼"; oCn.Commit(); return true; DAL/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSb_EquipMaintainPlanBill.cs
@@ -70,14 +70,14 @@ " (HInterID,HEntryID," + "HCloseMan,HEntryCloseDate,HCloseType,HRemark," + "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," + "HQty,HMaterID,HMaterNumber,HUnitID,HUnitNumber,HQtyMust" + //"HManagerID,HManagerNumber" + "HQty,HMaterID,HMaterNumber,HUnitID,HUnitNumber,HQtyMust," + "HManagerID" + ") values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','"+oSub.HEntryCloseDate+"'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() + //"," + oSub.HManagerID.ToString()+",'" +oSub.HManagerNumber+"'"+ "," + oSub.HManagerID.ToString() + ") "); } //æå ¥ä¿å »é¡¹å表 @@ -135,13 +135,13 @@ "HCloseMan,HEntryCloseDate,HCloseType,HRemark," + "HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney," + "HQty,HMaterID,HMaterNumber,HUnitID,HUnitNumber,HQtyMust" + //"HManagerID,HManagerNumber" + "HManagerID,HManagerNumber" + ") values(" + omodel.HInterID.ToString() + "," + oSub.HEntryID.ToString() + ",'" + oSub.HCloseMan + "','" + oSub.HEntryCloseDate + "'," + Convert.ToString(oSub.HCloseType ? 1 : 0) + ",'" + oSub.HRemark + "'" + "," + oSub.HSourceInterID.ToString() + "," + oSub.HSourceEntryID.ToString() + ",'" + oSub.HSourceBillNo + "','" + oSub.HSourceBillType + "'," + oSub.HRelationQty.ToString() + "," + oSub.HRelationMoney.ToString() + "," + oSub.HQty.ToString() + "," + oSub.HMaterID.ToString() + ",'" + oSub.HMaterNumber + "'," + oSub.HUnitID.ToString() + ",'" + oSub.HUnitNumber + "'," + oSub.HQtyMust.ToString() + //"," + oSub.HManagerID.ToString()+",'" +oSub.HManagerNumber+"'"+ "," + oSub.HManagerID.ToString() + ",'" + oSub.HManagerNumber + "'" + ") "); } //æå ¥ä¿å »é¡¹å表 DBUtility/ÒµÎñµ¥¾Ý/ClsXt_BaseBill.cs
@@ -201,12 +201,12 @@ throw (e); } } //å é¤å表 //ä¿å »è®¡åå é¤å表1 public void DeleteBillSub(Int64 lngBillKey) { oCn.RunProc("Delete From " + MvarItemKeySub + " where HInterID=" + lngBillKey.ToString()); } //å é¤å表 //ä¿å »è®¡åå é¤å表2 public void DeleteBillSub2(Int64 lngBillKey) { if (MvarItemKeySub2 != "") Model/Model.csproj
@@ -537,6 +537,7 @@ <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipRepairRequestBillSub.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipRepairSendWorkBillMain.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSb_EquipRepairSendWorkBillSub.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSc_EquipMaintainBillSub_Item.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSc_EquipMaintainPlanBillSub_Item.cs" /> <Compile Include="ç产管ç\设å¤ç®¡ç\ClsSc_ICMOBillMain.cs" /> <Compile Include="ç³»ç»å ¬ç¨\ClsOA_EmpMessageBillModMain.cs" /> Model/Éú²ú¹ÜÀí/É豸¹ÜÀí/ClsSc_EquipMaintainBillSub_Item.cs
New file @@ -0,0 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; using System.Text; namespace Model { public class ClsSc_EquipMaintainBillSub_Item : DBUtility.ClsXt_BaseBillSub { public Int64 HMaintainItemID;// int --ä¿å »é¡¹ç®ID public string HMaintainItem;// varchar(100) --ä¿å »é¡¹ç® public string HMaintainPart;// varchar(100) --ä¿å »é¨ä½ public string HClaim;// varchar(100) --å ·ä½è¦æ± public Int64 HManagerID;// int --è´è´£äººid(èå表) } } WebAPI/Controllers/SBGL/Sb_EquipMaintainBillController.cs
@@ -29,12 +29,32 @@ { try { ds = Sb_EquipMaintainBillList_s(sWhere); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "è¿åè®°å½æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintainPlan " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintainPlan"); } else { string sql1 = "select * from h_v_Sc_EquipMaintainPlan where 1 = 1"; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan"); } if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æä½ è¦æ¾çè®°å½ï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "è¿åè®°å½æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } } catch (Exception ex) { @@ -70,7 +90,7 @@ string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string msg4 = sArray[2].ToString(); string UserName = ""; ListModels oListModels = new ListModels(); @@ -114,19 +134,45 @@ } oBill.omodel = oItem; } //è¡¨ä½æ°æ® //ä¿å »é¡¹è¡¨ä½æ°æ® //æ },{æ¥æåæ°ç» //廿ãåã msg3 = msg3.Substring(1, msg3.Length - 2); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "â"); List<Model.ClsSb_EquipMaintainBillSub> ls = new List<Model.ClsSb_EquipMaintainBillSub>(); ls = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg3); List<Model.ClsSc_EquipMaintainBillSub_Item> ls = new List<Model.ClsSc_EquipMaintainBillSub_Item>(); ls = oListModels.getObjectByJson_Sc_EquipMaintainBillSub_Item(msg3); int i = 0; foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls) foreach (Model.ClsSc_EquipMaintainBillSub_Item item in ls) { i++; item.HEntryID = i; //oItemSub.HCloseMan = ""; //è¡å ³é item.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); item.HCloseType = false; //å ³éç±»å //oItemSub.HRemark = ""; //夿³¨ item.HSourceInterID = 0; // æºå主å ç item.HSourceEntryID = 0; //æºååå ç //oItemSub.HSourceBillNo = ""; //æºååå· //oItemSub.HSourceBillType = ""; //æºåç±»å item.HRelationQty = 0; //å ³èæ°é oBill.DetailCol.Add(item); } //é ä»¶è¡¨ä½æ°æ® //æ },{æ¥æåæ°ç» //廿ãåã msg4 = msg4.Substring(1, msg4.Length - 2); msg4 = msg4.Replace("\\", ""); msg4 = msg4.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "â"); List<Model.ClsSb_EquipMaintainBillSub> ls1 = new List<Model.ClsSb_EquipMaintainBillSub>(); ls1 = oListModels.getObjectByJson_Sb_EquipMaintainBillSub(msg4); int j = 0; foreach (Model.ClsSb_EquipMaintainBillSub oItemSub in ls1) { j++; oItemSub.HEntryID = i; //oItemSub.HCloseMan = ""; //è¡å ³é oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); @@ -280,46 +326,93 @@ return new ApiResult<DataSet> { code = 1, msg = "æ¥è¯¢æå", data = dataSet }; } #endregion #region[设å¤ä¿å »è®¡å表ç¼è¾æ¶è·åè¡¨é¢æ°æ®] #region[设å¤ä¿å »è®¡å表ç¼è¾æ¶è·åè¡¨ä½æ°æ®ï¼ä¿å »å表ãé ä»¶å表ï¼] [Route("Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetai")] [HttpGet] public object Sb_EquipMaintainBillListProjectDetai(string sqlWhere) public object Sb_EquipMaintainBillListProjectDetai(string HInterID) { DataSet ds; DataSet ds, ds1; List<object> list = new List<object>(); string Swhere = ""; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sqlWhere == null || sqlWhere.Equals("")) if (HInterID != "" || HInterID != null) { ds = oCN.RunProcReturn("select å®é ç¨é HQty,HMaterID, HUnitID ,表ä½å¤æ³¨ HRemark,HManagerID from h_v_Sb_EquipMaintainBillList", "h_v_Sb_EquipMaintainBillList_Edit"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; Swhere = " and hmainid='" + HInterID + "'"; } else { string sql1 = "select å®é ç¨é HQty,HMaterID, HUnitID ,表ä½å¤æ³¨ HRemark,HManagerID from h_v_Sb_EquipMaintainBillList where 1 = 1 "; string sql = sql1 + sqlWhere; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillList"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; Swhere = HInterID; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åä¿å »é¡¹ç®ç¼è¾æ°æ® string sql = "select HMaintainItemID, ä¿å »é¡¹ç®ä»£ç HMaintainItemNumber,ä¿å »é¡¹ç®åç§° HMaintainItem,ä¿å »é¨ä½ HMaintainPart,å ·ä½è¦æ± HClaim,HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,表ä½å¤æ³¨ HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item"); //è·åé 件项ç®ç¼è¾æ°æ® string sql1 = "select HMaterID, é 件代ç HMaterNumber,é ä»¶åç§° HMaterName,åä½ID HUnitID,åä½ä»£ç HUnitNumber,åä½åç§° HUnitName,å®é ç¨é HQty,æ åç¨é HQtyMust,表ä½å¤æ³¨ HRemark,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName from h_v_Sb_EquipMaintainBillList where 1 = 1 " + Swhere + ""; ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainBillList"); list.Add(ds.Tables[0]); list.Add(ds1.Tables[0]); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.list = list; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®¡åï¼" + e.ToString(); objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } #endregion #region[设å¤ä¿å »è®°å½è¡¨ç¼è¾æ¶è·åè¡¨ä½æ°æ®æ°(ä¿å »é¡¹å表ãé 件项å表)] [Route("Sb_EquipMaintainBill/Sb_EquipMaintainBillListProjectDetaiNew")] [HttpGet] public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID) { DataSet ds, ds1; List<object> list = new List<object>(); string Swhere = ""; try { if (HInterID != "" || HInterID != null) { Swhere = " and hmainid='" + HInterID + "'"; } else { Swhere = HInterID; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åä¿å »é¡¹ç®ç¼è¾æ°æ® string sql = "select ä¿å »é¡¹ç®ID HMaintainItemID, ä¿å »é¡¹ç®ä»£ç HMaintainItemNumber,ä¿å »é¡¹ç®åç§° HMaintainItem,ä¿å »é¨ä½ HMaintainPart,å ·ä½è¦æ± HClaim,HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,表ä½å¤æ³¨ HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item"); //è·åé 件项ç®ç¼è¾æ°æ® string sql1 = "select HMaterID, é 件代ç HMaterNumber,é ä»¶åç§° HMaterName,åä½ID HUnitID,åä½ä»£ç HUnitNumber,åä½åç§° HUnitName,å®é ç¨é HQty,æ åç¨é HQtyMust,表ä½å¤æ³¨ HRemark,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName from h_v_Sb_EquipMaintainBillList where 1 = 1 " + Swhere + ""; ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainBillList"); list.Add(ds.Tables[0]); list.Add(ds1.Tables[0]); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.list = list; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; } return objJsonResult; } #endregion WebAPI/Controllers/SBGL/Sb_EquipMaintainPlanBillController.cs
@@ -26,13 +26,13 @@ { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintain " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintain"); ds = oCN.RunProcReturn("select * from h_v_Sc_EquipMaintainPlan " + sWhere + " order by hmainid desc", "h_v_Sc_EquipMaintainPlan"); } else { string sql1 = "select * from h_v_Sc_EquipMaintain where 1 = 1"; string sql1 = "select * from h_v_Sc_EquipMaintainPlan where 1 = 1"; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintain"); ds = oCN.RunProcReturn(sql, "h_v_Sc_EquipMaintainPlan"); } if (ds == null || ds.Tables[0].Rows.Count == 0) { @@ -50,12 +50,6 @@ objJsonResult.data = ds.Tables[0]; return objJsonResult; } //ds = Sb_EquipMaintainPlanBillList_s(sWhere); //objJsonResult.code = "1"; //objJsonResult.count = 1; //objJsonResult.Message = "è¿åè®°å½æåï¼"; //objJsonResult.data = ds.Tables[0]; //return objJsonResult; } catch (Exception ex) { @@ -356,9 +350,9 @@ #endregion #region[设å¤ä¿å »è®¡å表ç¼è¾æ¶è·åè¡¨ä½æ°æ®æ°(ä¿å »é¡¹å表ãé 件项å表)] [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainBillListProjectDetaiNew")] [Route("Sb_EquipMaintainPlanBill/Sb_EquipMaintainPlanBillListProjectDetaiNew")] [HttpGet] public object Sb_EquipMaintainBillListProjectDetaiNew(string HInterID) public object Sb_EquipMaintainPlanBillListProjectDetaiNew(string HInterID) { DataSet ds, ds1; @@ -376,11 +370,12 @@ } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åä¿å »é¡¹ç®ç¼è¾æ°æ® string sql = "select HMaintainItemID, ä¿å »é¡¹ç®ä»£ç HMaintainItemNumber,ä¿å »é¡¹ç®åç§° HMaintainItem,ä¿å »é¨ä½ HMaintainPart,å ·ä½è¦æ± HClaim,HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,表ä½å¤æ³¨ HRemark from h_v_Sb_EquipMaintainBillSub_Item where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainBillSub_Item"); string sql = "select HMaintainItemID, ä¿å »é¡¹ç®ä»£ç HMaintainItemNumber,ä¿å »é¡¹ç®åç§° HMaintainItem,ä¿å »é¨ä½ HMaintainPart,å ·ä½è¦æ± HClaim,HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName,表ä½å¤æ³¨ HRemark from h_v_Sb_EquipMaintainPlanBillSub_Item where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainPlanBillSub_Item"); //è·åé 件项ç®ç¼è¾æ°æ® string sql1 = "select HMaterID, é 件代ç HMaterNumber,é ä»¶åç§° HMaterName,åä½ID HUnitID,åä½ä»£ç HUnitNumber,åä½åç§° HUnitName,ç¨é HQty,æ åç¨é HQtyMust,表ä½å¤æ³¨ HRemark from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + ""; string sql1 = "select HMaterID, é 件代ç HMaterNumber,é ä»¶åç§° HMaterName,åä½ID HUnitID,åä½ä»£ç HUnitNumber,åä½åç§° HUnitName,ç¨é HQty,æ åç¨é HQtyMust,表ä½å¤æ³¨ HRemark,è´è´£äººID HManagerID,è´è´£äººä»£ç HManagerNumber,è´è´£äºº HManagerName from h_v_Sb_EquipMaintainPlanBillList where 1 = 1 " + Swhere + ""; ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainPlanBillList"); list.Add(ds.Tables[0]); list.Add(ds1.Tables[0]); objJsonResult.code = "0"; WebAPI/ListModels.cs
@@ -888,7 +888,7 @@ } /// <summary> /// 设å¤ä¿å »è®°å½ å表 /// 设å¤ä¿å »è®°å½ é ä»¶å表 /// ClsSb_EquipMaintainBillSub /// </summary> /// <param name="jsonString"></param> @@ -899,7 +899,18 @@ List<Model.ClsSb_EquipMaintainBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSb_EquipMaintainBillSub>>(jsonString); return list; } /// <summary> /// 设å¤ä¿å »è®°å½ ä¿å »å表 /// ClsSc_EquipMaintainBillSub_Item /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsSc_EquipMaintainBillSub_Item> getObjectByJson_Sc_EquipMaintainBillSub_Item(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsSc_EquipMaintainBillSub_Item> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsSc_EquipMaintainBillSub_Item>>(jsonString); return list; } /// <summary> /// æ¨¡æ²»å ·å ¶ä»åºåºå 主表 WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -9,40 +9,40 @@ </PropertyGroup> <ItemGroup> <File Include="apiapp.json"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="bin/Antlr3.Runtime.dll"> <publishTime>02/22/2013 16:43:40</publishTime> <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/Antlr3.Runtime.pdb"> <publishTime>02/22/2013 16:43:40</publishTime> <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>09/09/2021 15:56:54</publishTime> <publishTime>09/13/2021 17:20:33</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>09/09/2021 15:56:54</publishTime> <publishTime>09/13/2021 17:20:33</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>09/09/2021 15:56:53</publishTime> <publishTime>09/13/2021 17:20:30</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>09/09/2021 15:56:53</publishTime> <publishTime>09/13/2021 17:20:30</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 22:52:40</publishTime> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:26</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:26</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.Client.dll"> <publishTime>08/25/2021 20:46:09</publishTime> <publishTime>08/16/2021 17:23:13</publishTime> </File> <File Include="bin/Kingdee.BOS.WebApi.FormService.dll"> <publishTime>09/20/2018 19:23:20</publishTime> @@ -51,49 +51,49 @@ <publishTime>09/20/2018 19:28:34</publishTime> </File> <File Include="bin/Microsoft.Azure.AppService.ApiApps.Service.dll"> <publishTime>03/19/2015 01:02:50</publishTime> <publishTime>03/18/2015 17:02:50</publishTime> </File> <File Include="bin/Microsoft.CSharp.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/Microsoft.Web.Infrastructure.dll"> <publishTime>07/25/2012 19:48:56</publishTime> <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>09/09/2021 15:56:52</publishTime> <publishTime>09/13/2021 17:20:26</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>09/09/2021 15:56:52</publishTime> <publishTime>09/13/2021 17:20:26</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="bin/Newtonsoft.Json.dll"> <publishTime>08/04/2014 04:33:56</publishTime> <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>09/09/2021 15:56:50</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>09/09/2021 15:56:50</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>09/09/2021 15:56:51</publishTime> <publishTime>09/13/2021 17:20:25</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> </File> <File Include="bin/Swashbuckle.Core.dll"> <publishTime>02/16/2015 01:57:08</publishTime> <publishTime>02/15/2015 17:57:08</publishTime> </File> <File Include="bin/System.ComponentModel.DataAnnotations.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -117,13 +117,13 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.IdentityModel.Tokens.Jwt.dll"> <publishTime>08/19/2014 18:03:34</publishTime> <publishTime>08/19/2014 10:03:34</publishTime> </File> <File Include="bin/System.Net.Http.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Net.Http.Formatting.dll"> <publishTime>11/28/2018 21:00:36</publishTime> <publishTime>11/28/2018 13:00:36</publishTime> </File> <File Include="bin/System.Runtime.Serialization.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -132,7 +132,7 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Cors.dll"> <publishTime>11/28/2018 20:58:44</publishTime> <publishTime>11/28/2018 12:58:44</publishTime> </File> <File Include="bin/System.Web.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -147,37 +147,37 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.Helpers.dll"> <publishTime>01/28/2015 12:04:30</publishTime> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.Http.Cors.dll"> <publishTime>11/28/2018 21:01:26</publishTime> <publishTime>11/28/2018 13:01:26</publishTime> </File> <File Include="bin/System.Web.Http.dll"> <publishTime>11/28/2018 21:01:00</publishTime> <publishTime>11/28/2018 13:01:00</publishTime> </File> <File Include="bin/System.Web.Http.WebHost.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="bin/System.Web.Mvc.dll"> <publishTime>01/28/2015 12:02:18</publishTime> <publishTime>01/28/2015 04:02:18</publishTime> </File> <File Include="bin/System.Web.Optimization.dll"> <publishTime>02/11/2014 23:26:04</publishTime> <publishTime>02/11/2014 15:26:04</publishTime> </File> <File Include="bin/System.Web.Razor.dll"> <publishTime>01/28/2015 12:02:32</publishTime> <publishTime>01/28/2015 04:02:32</publishTime> </File> <File Include="bin/System.Web.Services.dll"> <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/System.Web.WebPages.Deployment.dll"> <publishTime>01/28/2015 12:04:30</publishTime> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.dll"> <publishTime>01/28/2015 12:04:30</publishTime> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Web.WebPages.Razor.dll"> <publishTime>01/28/2015 12:04:30</publishTime> <publishTime>01/28/2015 04:04:30</publishTime> </File> <File Include="bin/System.Xml.dll"> <publishTime>09/26/2012 03:16:08</publishTime> @@ -186,184 +186,184 @@ <publishTime>09/26/2012 03:16:08</publishTime> </File> <File Include="bin/WebActivatorEx.dll"> <publishTime>11/24/2014 19:18:48</publishTime> <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>09/09/2021 15:56:56</publishTime> <publishTime>09/13/2021 17:20:36</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>09/09/2021 15:56:56</publishTime> <publishTime>09/13/2021 17:20:36</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/18/2013 01:03:52</publishTime> <publishTime>07/17/2013 17:03:52</publishTime> </File> <File Include="bin/zh-Hans/System.Net.Http.Formatting.resources.dll"> <publishTime>11/29/2018 21:26:02</publishTime> <publishTime>11/29/2018 13:26:02</publishTime> </File> <File Include="bin/zh-Hans/System.Web.Http.resources.dll"> <publishTime>11/29/2018 21:26:30</publishTime> <publishTime>11/29/2018 13:26:30</publishTime> </File> <File Include="Content/bootstrap.css"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Content/bootstrap.min.css"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Content/Site.css"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/BLL.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/DAL.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/DBUtility.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/Kingdee.BOS.WebApi.Client.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/Model.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/Newtonsoft.Json.Net35.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/Pub_Class.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/Pub_Control.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="DLL/SQLHelper.dll"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.eot"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.svg"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.ttf"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="fonts/glyphicons-halflings-regular.woff"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="Global.asax"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Index.html"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Metadata/deploymentTemplates/apiappconfig.azureresource.json"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="packages.config"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:16</publishTime> </File> <File Include="Views/Scripts/bootstrap.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/bootstrap.min.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery-1.10.2.min.map"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery.validate.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery.validate.min.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/jquery.validate.unobtrusive.min.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Scripts/modernizr-2.6.2.js"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Shared/Error.cshtml"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/Shared/_Layout.cshtml"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/web.config"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Views/_ViewStart.cshtml"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Customer_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Department_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Employee_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_StockPlace_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Supplier_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsCLD_Warehouse_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_BadReason_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_BarCodeBill_WMS_Model_View.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Customer_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Department_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Employee_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Group_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Item30JiTai_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Source_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_StockPlace_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Supplier_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsGy_Warehouse_Model.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/ClsKf_ICStockBill_WMS.datasource"> <publishTime>08/25/2021 20:46:11</publishTime> <publishTime>08/16/2021 17:23:15</publishTime> </File> <File Include="Web References/WebS/Reference.map"> <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> <publishTime>09/09/2021 15:57:01</publishTime> <publishTime>09/13/2021 17:20:43</publishTime> </File> </ItemGroup> </Project>