DBUtility/»ù´¡×ÊÁÏ/ClsGy_Base_Model.cs
@@ -15,7 +15,7 @@ public bool HStopflag; public string HRemark; public long HLevel; public long HParentID; public long HParentID=0; public string HModel; public long HUnitID; public string HUnitNumber; LMES/ClsShowMod.cs
@@ -5217,6 +5217,13 @@ oSc_ProdWIPTotalReport.Show(); oMainForm.AddTabPage(oSc_ProdWIPTotalReport); break; case "mes_wipprocreport_wip": MES_WIPProcReport_WIP oMES_WIPProcReport_WIP = new MES_WIPProcReport_WIP(); oMES_WIPProcReport_WIP.MdiParent = oMain; oMES_WIPProcReport_WIP.ModCaption = gnmc; oMES_WIPProcReport_WIP.Show(); oMainForm.AddTabPage(oMES_WIPProcReport_WIP); break; case "mes_wipprocreport": MES_WIPProcReport oMES_WIPProcReport = new MES_WIPProcReport(); oMES_WIPProcReport.MdiParent = oMain; Model/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/ClsGy_ConkReason_Model.cs
@@ -8,5 +8,15 @@ { // public string HExplanation; //æè¿°varchar(500) public DateTime HMakeTime; public string HMakeEmp; public int HConkTypeID; public string HCheckEmp; public DateTime HCheckTime; public string HModifyEmp; public DateTime HModifyTime; public string HStopEmp; public DateTime HStopTime; } } WebAPI/Controllers/SBGL/Sb_EquipDotCheckRuleBillController.cs
New file @@ -0,0 +1,185 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers.SBGL { public class Sb_EquipDotCheckRuleBillController : ApiController { private json objJsonResult = new json(); public DataSet ds = new DataSet(); public DBUtility.ClsPub.Enum_BillStatus BillStatus;//åæ®ç¶æï¼æ°å¢ï¼ä¿®æ¹ï¼æµè§ï¼æ´æ°åä»·ï¼åæ´ï¼ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); public DLL.ClsSb_EquipDotCheckRuleBill BillNew = new DLL.ClsSb_EquipDotCheckRuleBill(); //对åºåæ®ç±» public DLL.ClsSb_EquipDotCheckRuleBill BillOld = new DLL.ClsSb_EquipDotCheckRuleBill(); //对åºåæ®ç±» #region 设å¤ç¹æ£è§ç¨åå表 [Route("Sb_EquipDotCheckRuleBill/GetEquipDotCheckRuleList")] [HttpGet] public object GetEquipDotCheckRuleList(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sb_EquipDotCheckRuleList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipDotCheckRuleList"); } else { string sql1 = "select * from h_v_Sb_EquipDotCheckRuleList where 1 = 1"; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList"); } 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) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 设å¤ç¹æ£è§ç¨è®°å½å é¤åè½ [Route("Sb_EquipDotCheckRuleBill/DeleteEquipDotCheckRuleBillList")] [HttpGet] public object DeleteEquipDotCheckRuleBillList(string HInterID) { Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为空ï¼"; objJsonResult.data = null; return objJsonResult; } DLL.ClsSb_EquipDotCheckRuleBill oBill = new DLL.ClsSb_EquipDotCheckRuleBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (oBill.omodel.HBillStatus > 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å½åå¤äºä¸è½å é¤ç¶æ,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } if (oBill.omodel.HChecker != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ç»å®¡æ ¸,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªæ¾å°"; objJsonResult.data = null; return objJsonResult; } } #endregion #region[设å¤ç¹æ£è§ç¨åç¼è¾æ¶è·åè¡¨å¤´æ°æ®] [Route("Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListCheckDetai")] [HttpGet] public ApiResult<DataSet> Sb_EquipDotCheckRuleBillListCheckDetai(string HID) { if (string.IsNullOrEmpty(HID)) return new ApiResult<DataSet> { code = -1, msg = "IDä¸è½ä¸ºç©º" }; SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); var dataSet = oCN.RunProcReturn("select top 1 * from h_v_Sb_EquipDotCheckRuleList where hmainid= " + HID + " ", "h_v_Sb_EquipDotCheckRuleList"); 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 }; } #endregion #region[设å¤ç¹æ£è§ç¨åç¼è¾æ¶è·åè¡¨ä½æ°æ®] [Route("Sb_EquipDotCheckRuleBill/Sb_EquipDotCheckRuleBillListProjectDetai")] [HttpGet] public object Sb_EquipDotCheckRuleBillListProjectDetai(string sqlWhere) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sqlWhere == null || sqlWhere.Equals("")) { ds = oCN.RunProcReturn("select ç¹æ£é¡¹ç®ID,ç¹æ£é¡¹ç®,ç¹æ£é¨ä½,å ·ä½è¦æ±,è´è´£äººID,è´è´£äººä»£ç ,è´è´£äºº,å夿³¨ from h_v_Sb_EquipDotCheckRuleList", "h_v_Sb_EquipDotCheckRuleList"); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; } else { string sql1 = "select ç¹æ£é¡¹ç®ID,ç¹æ£é¡¹ç®,ç¹æ£é¨ä½,å ·ä½è¦æ±,è´è´£äººID,è´è´£äººä»£ç ,è´è´£äºº,å夿³¨ from h_v_Sb_EquipDotCheckRuleList where 1 = 1 "; string sql = sql1 + sqlWhere; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipDotCheckRuleList"); objJsonResult.code = "0"; 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 } } WebAPI/Controllers/SBGL/Sb_EquipMaintainRuleBillController.cs
New file @@ -0,0 +1,175 @@ using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers.SBGL { public class Sb_EquipMaintainRuleBillController : ApiController { private json objJsonResult = new json(); public DataSet ds = new DataSet(); public DBUtility.ClsPub.Enum_BillStatus BillStatus;//åæ®ç¶æï¼æ°å¢ï¼ä¿®æ¹ï¼æµè§ï¼æ´æ°åä»·ï¼åæ´ï¼ SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); public DLL.ClsSb_EquipMaintainRuleBill BillNew = new DLL.ClsSb_EquipMaintainRuleBill(); //对åºåæ®ç±» public DLL.ClsSb_EquipMaintainRuleBill BillOld = new DLL.ClsSb_EquipMaintainRuleBill(); //对åºåæ®ç±» #region 设å¤ä¿å »è§ç¨åå表 [Route("Sb_EquipMaintainRuleBill/GetEquipMaintainRuleList")] [HttpGet] public object GetEquipMaintainRuleList(string sWhere) { try { if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Sb_EquipMaintainRuleList " + sWhere + " order by hmainid desc", "h_v_Sb_EquipMaintainRuleList"); } else { string sql1 = "select * from h_v_Sb_EquipMaintainRuleList where 1 = 1"; string sql = sql1 + sWhere + " order by hmainid desc"; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleList"); } 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) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region 设å¤ä¿å »è§ç¨è®°å½å é¤åè½ [Route("Sb_EquipMaintainRuleBill/DeleteEquipMaintainRuleBillList")] [HttpGet] public object DeleteEquipMaintainRuleBillList(string HInterID) { Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HInterID); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为空ï¼"; objJsonResult.data = null; return objJsonResult; } DLL.ClsSb_EquipMaintainRuleBill oBill = new DLL.ClsSb_EquipMaintainRuleBill(); if (oBill.ShowBill(lngBillKey, ref DBUtility.ClsPub.sExeReturnInfo)) { if (oBill.omodel.HBillStatus > 1) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å½åå¤äºä¸è½å é¤ç¶æ,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } if (oBill.omodel.HChecker != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ç»å®¡æ ¸,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } bool IsDete = oBill.DeleteBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); if (IsDete) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = null; return objJsonResult; } } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®æªæ¾å°"; objJsonResult.data = null; return objJsonResult; } } #endregion # region 设å¤ä¿å »è§ç¨è®°å½ç¹å»ä¸»è¡¨æ¶è·åè¡¨ä½æ°æ®æ°(ä¿å »é¡¹å表ãé 件项å表) [Route("Sb_EquipMaintainRuleBill/Sb_EquipMaintainRuleBillListProjectDetaiNew")] [HttpGet] public object Sb_EquipMaintainRuleBillListProjectDetaiNew(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,ä¿å »é¡¹ç®,ä¿å »é¨ä½,å ·ä½è¦æ±,è´è´£äººID,è´è´£äººä»£ç ,è´è´£äººåç§°,å夿³¨2 from h_v_Sb_EquipMaintainRuleList where 1 = 1 " + Swhere + ""; ds = oCN.RunProcReturn(sql, "h_v_Sb_EquipMaintainRuleList"); //è·åé 件项ç®ç¼è¾æ°æ® string sql1 = "select é ä»¶ID,é 件代ç ,é ä»¶åç§°,åä½ID,计éåä½ä»£ç ,计éåä½åç§°,ç¨é,æ åç¨é,å夿³¨1 from h_v_Sb_EquipMaintainRuleList where 1 = 1 " + Swhere + ""; ds1 = oCN.RunProcReturn(sql1, "h_v_Sb_EquipMaintainRuleList"); 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/WebAPIController.cs
@@ -2144,21 +2144,13 @@ /// <returns></returns> [Route("Sc_MouldDotCheckRuleInter/GetMouldDotCheckRuleInterList")] [HttpGet] public object GetMouldDotCheckRuleInterList(int MouldProjectID) public object GetMouldDotCheckRuleInterList(string sWhere) { if (MouldProjectID <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "产åå¨å ·æªéæ©"; objjson.data = null; return objjson; } try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList"); ds = oCN.RunProcReturn(sql, "h_v_Sc_MouldDotCheckRuleBillList"); string sql = string.Format(@"select * from h_v_Sc_MouldDotCheckRuleBillList "); ds = oCN.RunProcReturn(sql+sWhere, "h_v_Sc_MouldDotCheckRuleBillList"); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; WebAPI/Controllers/»ù´¡×ÊÁÏ/»ù´¡×ÊÁÏ/Gy_ConkReasonBillController.cs
New file @@ -0,0 +1,256 @@ using Newtonsoft.Json.Linq; using System; using System.Collections.Generic; using System.Data; using System.Linq; using System.Net; using System.Net.Http; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers.åºç¡èµæ.åºç¡èµæ { public class Gy_ConkReasonBillController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus;//åæ®ç¶æï¼æ°å¢ï¼ä¿®æ¹ï¼æµè§ï¼æ´æ°åä»·ï¼åæ´ï¼ private json objJsonResult = new json(); public DataSet ds = new DataSet(); public SQLHelper.ClsCN oCn = new SQLHelper.ClsCN(); public Model.ClsGy_ConkReason_Model BillNew0 = new Model.ClsGy_ConkReason_Model(); #region æ éåå å表 [Route("Gy_ConkReasonBill/Get_ConkReasonBillList")] [HttpGet] public object Get_ConkReasonBillList(string sWhere) { try { ds = Sc_GetConkReasonBill(sWhere); if (ds == null) { 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) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢æ°æ®å¼å¸¸ï¼è¯·ä¸ç®¡çåèç³»ï¼" + ex.ToString(); objJsonResult.data = null; return objJsonResult; } } public static DataSet Sc_GetConkReasonBill(string sWhere) { string sql1 = string.Format(@"select * from h_v_Gy_ConkReasonList"); if (sWhere == null || sWhere.Equals("")) { return new SQLHelper.ClsCN().RunProcReturn(sql1 + sWhere + " order by hitemid desc", "h_v_Gy_ConkReasonList"); } else { string sql = sql1 + sWhere + "order by hitemid desc"; return new SQLHelper.ClsCN().RunProcReturn(sql, "h_v_Gy_ConkReasonList"); } } #endregion #region [æ éåå å é¤åè½] [Route("Gy_ConkReasonBill/set_DeleteBill")] [HttpGet] public object set_DeleteBill(string HItemID) { Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HItemID); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为空ï¼"; objJsonResult.data = null; return objJsonResult; } ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason"); if (ds != null) { oCn.RunProc("Delete from Gy_ConkReason where HItemID=" + lngBillKey); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "å 餿åï¼"; objJsonResult.data = null; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®ä¸åå¨ï¼è¯·æ¥çæ¯å¦éå¤å é¤"; objJsonResult.data = null; return objJsonResult; } } #endregion #region [ç¼è¾æ¾ç¤ºè¡¨å¤´] [Route("Gy_ConkReasonBill/GetConkReasonByID")] [HttpGet] public object GetConkReasonByID(string HID) { Int64 lngBillKey = 0; lngBillKey = DBUtility.ClsPub.isLong(HID); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®ID为空ï¼"; objJsonResult.data = null; return objJsonResult; } ds = oCn.RunProcReturn("select * from Gy_ConkReason where HItemID=" + lngBillKey, "Gy_ConkReason"); if (ds != null) { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = ""; objJsonResult.data = ds.Tables[0]; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¤åæ®ä¸åå¨"; objJsonResult.data = null; return objJsonResult; } } #endregion #region ä¿åæ éåå [Route("Gy_ConkReasonBill/SaveGy_ConkReason")] [HttpPost] public object SaveGy_ConkReason([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg2 = _value.ToString(); string[] sArray = msg2.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg1 = sArray[0].ToString(); string msg3 = sArray[1].ToString();//å½å人 SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ListModels oListModels = new ListModels(); try { Model.ClsGy_ConkReason_Model oBill = new Model.ClsGy_ConkReason_Model(); List<Model.ClsGy_ConkReason_Model> lsmain = new List<Model.ClsGy_ConkReason_Model>(); msg1 = msg1.Replace("\\", ""); msg1 = msg1.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_ConkReason(msg1); foreach (Model.ClsGy_ConkReason_Model oItem in lsmain) { if (oItem.HNumber.Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼ä»£ç ä¸è½ä¸ºç©ºï¼"; objJsonResult.data = 1; return objJsonResult; } if (oItem.HName.Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼åç§°ä¸è½ä¸ºç©ºï¼"; objJsonResult.data = 1; return objJsonResult; } //å¾å°ç代ç string sShortNumber; sShortNumber = DBUtility.ClsPub.GetShortNumber(oItem.HNumber.Trim()); if (sShortNumber.Trim() == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼ç代ç 为空ï¼"; objJsonResult.data = 1; return objJsonResult; } oItem.HShortNumber = sShortNumber;//ç代ç oItem.HEndFlag = true;//æ«çº§æ å¿ oItem.HLevel = DBUtility.ClsPub.GetLevel(oItem.HNumber.Trim()); //ç级 oBill = oItem; } //ä¿å //ä¿å宿¯åå¤ç if (oBill.HItemID == 0) { oCn.RunProc("Insert into Gy_ConkReason " + " (HNumber,HName,HHelpCode,HShortNumber,HParentID" + ",HLevel,HEndFlag,HStopflag,HRemark,HUseFlag,HMakeTime,HMakeEmp,HExplanation,HConkTypeID) " + " Values('" + oBill.HNumber + "','" + oBill.HName + "','" + oBill.HHelpCode + "','" + oBill.HShortNumber + "'," + oBill.HParentID.ToString() + "," + oBill.HLevel.ToString() + "," + Convert.ToString(oBill.HEndFlag ? 1 : 0) + "," + Convert.ToString(oBill.HStopflag ? 1 : 0) + ",'" + oBill.HRemark + "','" + oBill.HUseFlag + "',getdate(),'" + msg3 + "','" + oBill.HExplanation + "',0" + ")", ref DBUtility.ClsPub.sExeReturnInfo); //ä¿®æ¹ä¸çº§ä¸ºéæ«çº§ä»£ç oCn.RunProc("Update Gy_ConkReason set HEndflag=0 where HItemID=" + oBill.HParentID, ref DBUtility.ClsPub.sExeReturnInfo); objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "ä¿åæåï¼"; //WebAPIController.Add_Log("éè´§å䏿¨", UserName, "çæéè´§å"); objJsonResult.data = 1; return objJsonResult; } else { oCN.RunProc("UpDate Gy_ConkReason set " + " HNumber='" + oBill.HNumber + "'" + //åºå®èµå¼=============== ",HName='" + oBill.HName + "'" + ",HShortNumber='" + oBill.HShortNumber + "'" + ",HHelpCode='" + oBill.HHelpCode + "'" + ",HUseFlag='" + oBill.HUseFlag + "'" + ",HRemark='" + oBill.HRemark + "'" + ",HExplanation='" + oBill.HExplanation + "'" + ",HModifyTime=getdate()" + ",HModifyEmp='" + msg3 + "'" + ",HStopflag=" + Convert.ToString(oBill.HStopflag ? 1 : 0) + " where HInterID=" + oBill.HItemID.ToString()); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "ä¿®æ¹æåï¼"; objJsonResult.data = 1; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "ä¿å失败ï¼" + e.ToString(); objJsonResult.data = 1; return objJsonResult; } } #endregion } } WebAPI/DLL/ClsSb_EquipDotCheckRuleBill.cs
New file @@ -0,0 +1,25 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.DLL { public class ClsSb_EquipDotCheckRuleBill : DBUtility.ClsXt_BaseBill { public Models.ClsSb_EquipDotCheckRuleBillMain omodel = new Models.ClsSb_EquipDotCheckRuleBillMain(); public List<Models.ClsSb_EquipDotCheckRuleBillSub> DetailColl_Mater = new List<Models.ClsSb_EquipDotCheckRuleBillSub>(); public ClsSb_EquipDotCheckRuleBill() { base.MvarItemKeySub = "ClsSb_EquipDotCheckRuleBillSub"; base.MvarItemKeySub2 = ""; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey = "Sb_EquipDotCheckRuleBillMain"; base.MvarReportTitle = "设å¤ç¹æ£è§ç¨"; base.BillType = "3913"; } } } WebAPI/DLL/ClsSb_EquipMaintainRuleBill.cs
New file @@ -0,0 +1,37 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.DLL { public class ClsSb_EquipMaintainRuleBill : DBUtility.ClsXt_BaseBill { public Models.ClsSb_EquipMaintainRuleBillMain omodel = new Models.ClsSb_EquipMaintainRuleBillMain(); public List<Models.ClsSb_EquipMaintainRuleBillSub> DetailColl_Mater = new List<Models.ClsSb_EquipMaintainRuleBillSub>(); public List<Models.ClsSb_EquipMaintainRuleBillSub_Item> DetailColl_Pay = new List<Models.ClsSb_EquipMaintainRuleBillSub_Item>(); public ClsSb_EquipMaintainRuleBill() { base.MvarItemKeySub = "Sb_EquipMaintainRuleBillSub"; base.MvarItemKeySub2 = "Sb_EquipMaintainRuleBillSub_Item"; base.MvarItemKeySub3 = ""; base.MvarItemKeySub4 = ""; base.MvarItemKey = "Sb_EquipMaintainRuleBillMain"; base.MvarReportTitle = "设å¤ä¿å »è§ç¨"; base.BillType = "3912"; } #region åºå®ä»£ç ~ClsSb_EquipMaintainRuleBill() { DetailColl_Mater = null; DetailColl_Pay = null; //DetailColl_Entrust = null; //DetailColl_Money = null; } #endregion èªå®ä¹æ¹æ³ } } WebAPI/ListModels.cs
@@ -547,6 +547,18 @@ } /// <summary> /// å¤çæ°å¢æ éåå 表çjson /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsGy_ConkReason_Model> getObjectByJson_Gy_ConkReason(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsGy_ConkReason_Model> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsGy_ConkReason_Model>>(jsonString); return list; } /// <summary> /// å¤çæ°å¢æ¨¡å ·ä¿å »è®°å½è¡¨ä¸»è¡¨çjson /// </summary> /// <param name="jsonString"></param> WebAPI/Models/ClsSb_EquipDotCheckRuleBillMain.cs
New file @@ -0,0 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class ClsSb_EquipDotCheckRuleBillMain : DBUtility.ClsXt_BaseBillMain { public DateTime HBeginDate;// datetime --计åå¼å§æ¥æ public DateTime HEndDate;// datetime --计åç»ææ¥æ public string HCycleUnit;// varchar(10) --卿åä½(å¤©ï¼æï¼å¨) public int HCheckCycle;// int --ç¹æ£å¨æ public string HExplanation;// varchar(500) --æè¦ public string HInnerBillNo;// varchar(50) --å é¨åæ®å· } } WebAPI/Models/ClsSb_EquipDotCheckRuleBillSub.cs
New file @@ -0,0 +1,16 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class ClsSb_EquipDotCheckRuleBillSub : DBUtility.ClsXt_BaseBillSub { public int HDotCheckItemID;// int --ç¹æ£é¡¹ç®ID public string HDotCheckItem;// varchar(100) --ç¹æ£é¡¹ç® public string HDotCheckPart;// varchar(100) --ç¹æ£é¨ä½ public string HClaim;// varchar(100) --å ·ä½è¦æ± public int HManagerID;// int --è´è´£äººid(èå表) } } WebAPI/Models/ClsSb_EquipMaintainRuleBillMain.cs
New file @@ -0,0 +1,15 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class ClsSb_EquipMaintainRuleBillMain : DBUtility.ClsXt_BaseBillMain { public string HCycleUnit; //--卿åä½(å¤©ï¼æï¼å¨) public int HCheckCycle; //--ä¿å »å¨æ public string HExplanation; // varchar(500) --æè¦ public string HInnerBillNo; //varchar(50) --å é¨åæ®å· } } WebAPI/Models/ClsSb_EquipMaintainRuleBillSub.cs
New file @@ -0,0 +1,17 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class ClsSb_EquipMaintainRuleBillSub : DBUtility.ClsXt_BaseBillSub { public string HBillNo_bak; public int HItemSubID; // --èªå¢å(GUID) public int HMaterID; //int --é ä»¶ID public int HUnitID;// int --计éåä½ public string HQty;// dec(18,8) --ç¨é public string HQtyMust;// dec(18,8) --æ åç¨é(ææ¶éè) } } WebAPI/Models/ClsSb_EquipMaintainRuleBillSub_Item.cs
New file @@ -0,0 +1,18 @@ using System; using System.Collections.Generic; using System.Linq; using System.Web; namespace WebAPI.Models { public class ClsSb_EquipMaintainRuleBillSub_Item : DBUtility.ClsXt_BaseBillSub { public string HBillNo_bak; public int HItemSubID; // --èªå¢å(GUID) public int HMaintainItemID;// int --ä¿å »é¡¹ç®ID public string HMaintainItem;// varchar(100) --ä¿å »é¡¹ç® public string HMaintainPart; //varchar(100) --ä¿å »é¨ä½ public string HClaim;// varchar(100) --å ·ä½è¦æ± public int HManagerID;// int --è´è´£äººid(èå表) } } WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user
@@ -18,25 +18,25 @@ <publishTime>02/22/2013 08:43:40</publishTime> </File> <File Include="bin/BLL.dll"> <publishTime>11/16/2021 18:46:35</publishTime> <publishTime>11/17/2021 17:22:47</publishTime> </File> <File Include="bin/BLL.pdb"> <publishTime>11/16/2021 18:46:35</publishTime> <publishTime>11/17/2021 17:22:47</publishTime> </File> <File Include="bin/DAL.dll"> <publishTime>11/16/2021 18:46:33</publishTime> <publishTime>11/17/2021 17:22:44</publishTime> </File> <File Include="bin/DAL.pdb"> <publishTime>11/16/2021 18:46:33</publishTime> <publishTime>11/17/2021 17:22:44</publishTime> </File> <File Include="bin/Dapper.dll"> <publishTime>07/22/2016 14:52:40</publishTime> </File> <File Include="bin/DBUtility.dll"> <publishTime>11/16/2021 18:46:29</publishTime> <publishTime>11/17/2021 17:22:38</publishTime> </File> <File Include="bin/DBUtility.pdb"> <publishTime>11/16/2021 18:46:29</publishTime> <publishTime>11/17/2021 17:22:38</publishTime> </File> <File Include="bin/Interop.gregn6Lib.dll"> <publishTime>08/25/2021 10:28:25</publishTime> @@ -60,10 +60,10 @@ <publishTime>07/25/2012 11:48:56</publishTime> </File> <File Include="bin/Model.dll"> <publishTime>11/16/2021 18:46:30</publishTime> <publishTime>11/17/2021 17:22:39</publishTime> </File> <File Include="bin/Model.pdb"> <publishTime>11/16/2021 18:46:30</publishTime> <publishTime>11/17/2021 17:22:39</publishTime> </File> <File Include="bin/Models/ClsSc_MouldScrapOutBillMain.cs"> <publishTime>08/16/2021 17:23:15</publishTime> @@ -72,22 +72,22 @@ <publishTime>08/03/2014 20:33:56</publishTime> </File> <File Include="bin/Pub_Class.dll"> <publishTime>11/16/2021 18:46:28</publishTime> <publishTime>11/17/2021 17:22:36</publishTime> </File> <File Include="bin/Pub_Class.pdb"> <publishTime>11/16/2021 18:46:28</publishTime> <publishTime>11/17/2021 17:22:36</publishTime> </File> <File Include="bin/Pub_Control.dll"> <publishTime>11/16/2021 18:46:28</publishTime> <publishTime>11/17/2021 17:22:37</publishTime> </File> <File Include="bin/Pub_Control.pdb"> <publishTime>11/16/2021 18:46:28</publishTime> <publishTime>11/17/2021 17:22:37</publishTime> </File> <File Include="bin/SQLHelper.dll"> <publishTime>11/16/2021 18:46:29</publishTime> <publishTime>11/17/2021 17:22:37</publishTime> </File> <File Include="bin/SQLHelper.pdb"> <publishTime>11/16/2021 18:46:29</publishTime> <publishTime>11/17/2021 17:22:37</publishTime> </File> <File Include="bin/stdole.dll"> <publishTime>05/09/2021 13:35:37</publishTime> @@ -189,10 +189,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>11/16/2021 18:46:38</publishTime> <publishTime>11/17/2021 17:22:52</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>11/16/2021 18:46:38</publishTime> <publishTime>11/17/2021 17:22:52</publishTime> </File> <File Include="bin/WebGrease.dll"> <publishTime>07/17/2013 17:03:52</publishTime> @@ -363,7 +363,7 @@ <publishTime>08/06/2021 22:57:28</publishTime> </File> <File Include="Web.config"> <publishTime>11/16/2021 18:46:49</publishTime> <publishTime>11/17/2021 17:23:18</publishTime> </File> </ItemGroup> </Project> WebAPI/WebAPI.csproj
@@ -357,6 +357,8 @@ <Compile Include="Controllers\ReportPlatFormController.cs" /> <Compile Include="Controllers\SBGL\Gy_EquipFileMainController.cs" /> <Compile Include="Controllers\SBGL\Gy_EquipTypeController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipDotCheckRuleBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipMaintainRuleBillController.cs" /> <Compile Include="Controllers\SCGL\Sc_MESProductReportBillController.cs" /> <Compile Include="Controllers\Sc_MouldRepairOutBillController.cs" /> <Compile Include="Controllers\Sc_MouldRepairInBillListController - .cs" /> @@ -389,6 +391,7 @@ <Compile Include="Controllers\ä»å管ç\Kf_MateOutBillController.cs" /> <Compile Include="Controllers\å质管ç\å·¥åºæ£éªå\QC_ProcessCheckBillController.cs" /> <Compile Include="Controllers\å质管ç\é¦ä»¶æ£éªå\QC_FirstPieceCheckBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_ConkReasonBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_DotCheckBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_MaintainBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_RepairBillController.cs" /> @@ -415,6 +418,7 @@ <Compile Include="DLL\ClsSb_EquipConkBookBill.cs" /> <Compile Include="DLL\ClsSb_EquipDotCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipMaintainBill.cs" /> <Compile Include="DLL\ClsSb_EquipMaintainRuleBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairCheckBill.cs" /> <Compile Include="DLL\ClsSb_EquipRepairWorkBill.cs" /> <Compile Include="DLL\ClsSc_ICMOBillWorkQtyStatus_Tmp.cs" /> @@ -446,6 +450,7 @@ <Compile Include="DLL\ClsWW_EntrustProcessReportBill.cs" /> <Compile Include="DLL\ClsWW_EntrustProcessSendOutBill.cs" /> <Compile Include="DLL\ClsWW_EntrustWorkOrderBill.cs" /> <Compile Include="DLL\ClsSb_EquipDotCheckRuleBill.cs" /> <Compile Include="LogService.cs" /> <Compile Include="Models\ApiConfig.cs" /> <Compile Include="Models\ApiResult.cs" /> @@ -462,6 +467,11 @@ <Compile Include="Models\ClsKf_MateOutBillSub.cs" /> <Compile Include="Models\ClsOA_InformBillMain.cs" /> <Compile Include="Models\ClsOA_InformBillSub.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckRuleBillMain.cs" /> <Compile Include="Models\ClsSb_EquipDotCheckRuleBillSub.cs" /> <Compile Include="Models\ClsSb_EquipMaintainRuleBillMain.cs" /> <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub.cs" /> <Compile Include="Models\ClsSb_EquipMaintainRuleBillSub_Item.cs" /> <Compile Include="Models\Pay_PeriodInfoSet.cs" /> <Compile Include="Models\Gy_OrderBackInfo.cs" /> <Compile Include="Models\Gy_OrderLevList.cs" />