Model/Model.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/基础资料/基础资料/ClsEqiupMaterWorkTimes_Model.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/WebAPIController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/DLL/ClsEqiupMaterWorkTimes_Ctl.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Service/LuBaoSevice.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/Model.csproj
@@ -99,6 +99,7 @@ <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_MaintainClass_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_PiPeMaterial_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_PiPe_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsEqiupMaterWorkTimes_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_ProjectMoneyClass_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_RepairClass_Model.cs" /> <Compile Include="åºç¡èµæ\åºç¡èµæ\ClsGy_RepairCheckClass_Model.cs" /> Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsEqiupMaterWorkTimes_Model.cs
New file @@ -0,0 +1,14 @@ using System; using System.Collections.Generic; using System.Text; namespace Model { public class ClsEqiupMaterWorkTimes_Model : DBUtility.ClsGy_Base_Model { public string HEquipNumber { get; set; } public string HMaterNumber { get; set; } public string HWorkTimes { get; set; } } } WebAPI/Controllers/BaseSet/Gy_BadReasonController.cs
@@ -12399,7 +12399,55 @@ } } #endregion #region 设å¤èæç»´æ¤ æ¥è¯¢,å®¡æ ¸ï¼åå®¡æ ¸ï¼ç¦ç¨ï¼åç¦ç¨ /// <summary> /// 设å¤èæç»´æ¤ æ¥è¯¢ /// </summary> /// <param name="sWhere"></param> /// <param name="user"></param> /// <returns></returns> [Route("Gy_BadReason/Sb_EqiupMaterWorkTimeList")] [HttpGet] public object Sb_EqiupMaterWorkTimeList(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); string sql1 = "select * from h_v_Sb_EqiupMaterWorkTimes where 1 = 1"; string sql = sql1 + sWhere + " order by 设å¤ä»£ç "; ds = oCN.RunProcReturn(sql, "h_v_Sb_EqiupMaterWorkTimes"); //æ·»å åå 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å对象çåå } 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 } } WebAPI/Controllers/WebAPIController.cs
@@ -17888,6 +17888,173 @@ } #endregion #region 设å¤èæç»´æ¤ 设置å表/ä¿å/ç¼è¾/å 餿¹æ³ /// <summary> /// 项ç®è´¹ç¨åç±» ä¿å /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("SaveSb_EqiupMaterWorkTime")] [HttpPost] public object SaveSb_EqiupMaterWorkTime([FromBody] JObject msg) { DataSet ds; var _value = msg["msg"].ToString(); string msg3 = _value.ToString(); string[] sArray = msg3.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg1 = sArray[0].ToString(); string msg2 = sArray[1].ToString(); Int64 HItemID = 0; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); //è·åæå¤§IDå¼èµå¼ DataSet Maxds = oCN.RunProcReturn("select isNull(MAX(HItemID),0) HItemID from EqiupMaterWorkTimes ", "EqiupMaterWorkTimes"); if (Maxds != null || Maxds.Tables[0].Rows.Count > 0) { //HItemID= Maxds.Tables[0].Rows[0]["HItemID"] var maxid = Convert.ToInt32(Maxds.Tables[0].Rows[0]["HItemID"]); maxid += 1; HItemID = maxid; } ListModels oListModels = new ListModels(); try { WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl oBill = new WebAPI.DLL.ClsEqiupMaterWorkTimes_Ctl(); List<Model.ClsEqiupMaterWorkTimes_Model> lsmain = new List<Model.ClsEqiupMaterWorkTimes_Model>(); msg1 = msg1.Replace("\\", ""); msg1 = msg1.Replace("\n", ""); lsmain = oListModels.getObjectByJson_EqiupMaterWorkTimes(msg1); foreach (ClsEqiupMaterWorkTimes_Model item in lsmain) { oBill.oModel = item; } //ä¿å //ä¿å宿¯åå¤ç bool bResult; if (oBill.oModel.HItemID == 0) { bResult = oBill.AddNew(); } else { bResult = oBill.ModifyByID(oBill.oModel.HItemID); } 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; } } /// <summary> /// 设å¤èæç»´æ¤ è·åä¿¡æ¯ /// </summary> /// <returns></returns> [Route("GetEqiupMaterWorkTimeDetail")] [HttpGet] public ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID) { var model = LuBaoSevice.GetEqiupMaterWorkTimeDetail(HID); return model; } /// <summary> /// 设å¤èæç»´æ¤ å é¤åè½ /// </summary> /// <returns></returns> [Route("DeltetEqiupMaterWorkTime")] [HttpGet] public object DeltetEqiupMaterWorkTime(string HItemID, string user) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (string.IsNullOrWhiteSpace(HItemID)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "HItemID为空ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran();//å¼å§äºå¡ ds = oCN.RunProcReturn("select * from EqiupMaterWorkTimes where HItemID=" + HItemID, "EqiupMaterWorkTimes"); if (ds.Tables[0].Rows.Count > 0) { if (ds.Tables[0].Rows[0]["HCheckEmp"].ToString() != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·²å®¡æ ¸!ä¸è½è¿è¡å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } if (ds.Tables[0].Rows[0]["HStopEmp"].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.RunProc("delete from EqiupMaterWorkTimes where HItemID=" + HItemID); oCN.Commit();//æäº¤äºå¡ objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "æ°æ®å 餿åï¼"; objJsonResult.data = null; return objJsonResult; ; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion /// <summary> /// ç¨å ³èå·¥åºè·åä¿¡æ¯ WebAPI/DLL/ClsEqiupMaterWorkTimes_Ctl.cs
New file @@ -0,0 +1,75 @@ using System; using System.Collections.Generic; using System.Text; using System.Data; namespace WebAPI.DLL { public class ClsEqiupMaterWorkTimes_Ctl : DBUtility.ClsGy_Base_Ctl { SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); //å代ç ç¨äº æ¿æ¢åé¡¹ç® public string HOldNumber; public Model.ClsEqiupMaterWorkTimes_Model oModel = new Model.ClsEqiupMaterWorkTimes_Model(); //æ°å¢ public override bool AddNew() { try { oCn.BeginTran(); oCn.RunProc("Insert into " + MvarItemKey + " " + " (HEquipFileNo,HMaterNumber,HWorkTimes" + ",HMakeTime,HMakeEmp" + ") " + " Values('" + oModel.HEquipNumber + "','" + oModel.HMaterNumber + "'," + oModel.HWorkTimes + ",'" + oModel.HMakeTime + "','" + oModel.HMakeEmp + "'" + ")", ref DBUtility.ClsPub.sExeReturnInfo); oCn.Commit(); return true; } catch (Exception e) { oCn.RollBack(); throw (e); } } //ä¿®æ¹ public override bool ModifyByID(Int64 sItemID) { try { oCn.BeginTran(); oCn.RunProc("Update " + MvarItemKey + " set " + " HEquipFileNo='" + oModel.HEquipNumber + "'" + ",HMaterNumber='" + oModel.HMaterNumber + "'" + ",HWorkTimes='" + oModel.HWorkTimes + "'" + ",HModifyEmp ='" + oModel.HMakeEmp + "'" + ",HModifyTime=getdate() Where HItemID=" + sItemID, ref DBUtility.ClsPub.sExeReturnInfo); oCn.Commit(); return true; } catch (Exception e) { oCn.RollBack(); throw (e); } } //æé 彿° public ClsEqiupMaterWorkTimes_Ctl() { MvarItemKey = "EqiupMaterWorkTimes"; MvarReportTitle = "设å¤èæè®¾ç½®"; oModel = new Model.ClsEqiupMaterWorkTimes_Model(); } } } WebAPI/ListModels.cs
@@ -1174,6 +1174,18 @@ } /// <summary> /// å¤çæ°å¢è®¾å¤èæè¡¨çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsEqiupMaterWorkTimes_Model> getObjectByJson_EqiupMaterWorkTimes(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsEqiupMaterWorkTimes_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsEqiupMaterWorkTimes_Model>>(jsonString); return list; } /// <summary> /// å¤çæ°å¢ç®¡å¾è¡¨çjson /// </summary> /// <param name="jsonString"></param> WebAPI/Service/LuBaoSevice.cs
@@ -663,6 +663,25 @@ /// <summary> /// 设å¤èææ ¹æ®idè·åä¿¡æ¯ /// </summary> public static ApiResult<DataSet> GetEqiupMaterWorkTimeDetail(string HID) { if (string.IsNullOrEmpty(HID)) return new ApiResult<DataSet> { code = -1, msg = "IDä¸è½ä¸ºç©º" }; var dataSet = GetEqiupMaterWorkTimeDb(HID); if (dataSet == null || dataSet.Tables[0].Rows.Count == 0) return new ApiResult<DataSet> { code = -1, msg = "ä¸åå¨è®¾å¤èææ°æ®" }; return new ApiResult<DataSet> { code = 1, msg = "æ¥è¯¢æå", data = dataSet }; } public static DataSet GetEqiupMaterWorkTimeDb(string HID) { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EqiupMaterWorkTimes where HItemID= " + HID + " ", "h_v_Sb_EqiupMaterWorkTimes"); return dataSet; } /// <summary> /// ç®¡å¾æ ¹æ®idè·åä¿¡æ¯ /// </summary> public static ApiResult<DataSet> GetGy_PiPeDetail(string HID) WebAPI/WebAPI.csproj
@@ -752,6 +752,7 @@ <Compile Include="DLL\ClsGy_EnvironmentTestItem_Ctl.cs" /> <Compile Include="DLL\ClsGy_PiPe_Ctl.cs" /> <Compile Include="DLL\ClsGy_PiPeMaterial_Ctl.cs" /> <Compile Include="DLL\ClsEqiupMaterWorkTimes_Ctl.cs" /> <Compile Include="DLL\ClsGy_ProjectMoneyClass_Ctl.cs" /> <Compile Include="DLL\ClsGy_RoutingGroup_Ctl.cs" /> <Compile Include="DLL\ClsGy_ProcMul_Ctl.cs" />