Model/信息平台/ClsOA_ErrMsgBackBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
Model/质检管理/ClsQC_ProcessCheckBillMain.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/Sc_ProcessMangementController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/品质管理/客诉处理单/Crm_CustomerAppealBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/品质管理/工序检验单/MES_ProcessCheckBill_PDAController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/DLL/ClsOA_ErrMsgBackBill.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/ÐÅϢƽ̨/ClsOA_ErrMsgBackBillSub.cs
@@ -9,6 +9,7 @@ public Int64 HSendStatus;// int --åå¤ç±»åï¼1æ®éï¼2å®¡æ ¸ï¼4ä½åºï¼5å®¡æ ¸éåï¼9ç»æ¡ï¼10éªè¯ï¼ public string HSendMan;// varchar(10) --åå¤äºº public string HDescription;// varchar(1000) --åå¤å 容 public string HDescriptionSub;// varchar(1000) --åå¤å 容 public DateTime HDate;// datetime --å夿¶é´ } Model/Öʼì¹ÜÀí/ClsQC_ProcessCheckBillMain.cs
@@ -39,6 +39,6 @@ public Int64 HPackTypeID; public Int64 HICMOEntryID; public Int64 HQCSchemeID; public bool HLastResult; } } WebAPI/Controllers/SCGL/Sc_MESTransFerWorkBillController.cs
@@ -581,5 +581,170 @@ } #endregion #region æ¥å·¥å¹³å°å¼å¸¸åé¦ååå¤ /// <summary> /// å¼å¸¸åé¦å /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("Sc_MESTransFerWorkBill/ReplyMESTransFerWorkFrom")] [HttpPost] public object ReplyMESTransFerWorkFrom([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 UserName = sArray[1].ToString(); string refSav = sArray[2].ToString(); DBUtility.ClsPub.CurUserName = UserName; //ä¿åæé if (!DBUtility.ClsPub.Security_Log_second("OA_ErrMsgBackBill_Edit", 1, false, DBUtility.ClsPub.CurUserName)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ä¿åæéï¼"; objJsonResult.data = null; return objJsonResult; } //夿ä¼è®¡ææ¯å¦åç string s = ""; int sYear = 0; int sPeriod = 0; if (DBUtility.Xt_BaseBillFun.Fun_AllowYearPeriod(DateTime.Now, ref sYear, ref sPeriod, ref s) == false) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = s; objJsonResult.data = null; return objJsonResult; } ListModels oListModels = new ListModels(); try { DLL.ClsOA_ErrMsgBackBill oBill = new DLL.ClsOA_ErrMsgBackBill(); List<Models.ClsOA_ErrMsgBackBillSub> lsmain = new List<Models.ClsOA_ErrMsgBackBillSub>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_Gy_MESTransFerWorkBillSub(msg2); foreach (Models.ClsOA_ErrMsgBackBillSub DetailReply in lsmain) { oBill.DetailReply = DetailReply; } //ä¿å //ä¿å宿¯åå¤ç bool bResult; if (oBill.DetailReply.HInterID != 0) { bResult = oBill.ReplyBill(ref DBUtility.ClsPub.sExeReturnInfo); } else { bResult = false; } if (bResult) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "å夿åï¼"; objJsonResult.data = 1; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åå¤å¤±è´¥ï¼" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = 1; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = e.Message; objJsonResult.data = 1; return objJsonResult; } } #endregion #region å¼å¸¸åé¦å表åå¤è·åæ°æ® [Route("Sc_MESTransFerWorkBill/Get_TransFerReplyBill")] [HttpGet] public object Get_TransFerReplyBill(string sWhere, string user) { try { string sql1 = "select * from h_v_OA_ErrMsgBackBillSubList where 1 = 1 "; string sql = sql1 + sWhere + " order by HInterID desc"; ds = oCN.RunProcReturn(sql, "h_v_OA_ErrMsgBackBillSubList"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å¼å¸¸åé¦å表å夿´æ¹ç¶æ [Route("Sc_MESTransFerWorkBill/Update_TransFerReplyBill")] [HttpGet] public object Update_TransFerReplyBill(Int64 HInterID, string HEntryID,Int64 Type) { try { string sql = ""; switch (Type) { case 9: sql = "update OA_ErrMsgBackBillSub set HSendStatus = 9 where HInterID = " + HInterID + " and HEntryID in (" + HEntryID + ")"; break; case 10: sql = "update OA_ErrMsgBackBillSub set HSendStatus = 10 where HInterID = " + HInterID + " and HEntryID in (" + HEntryID + ")"; break; } oCN.RunProc(sql); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = 1; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } } WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -747,6 +747,19 @@ objJsonResult.data = null; return objJsonResult; } //夿å¯ä¸IDæ¯å¦ä¸ºç©º foreach (DataRow item in ds1.Tables[0].Rows) { if (item["HWYID"].ToString() == null || item["HWYID"].ToString() == "" || item["HWYID"].ToString() == "undefined") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å¯ä¸ID为空ï¼è¯·éæ°æå¨å ¥åºæè系管çåï¼"; objJsonResult.data = null; return objJsonResult; } } } } WebAPI/Controllers/Æ·ÖʹÜÀí/¿ÍËß´¦Àíµ¥/Crm_CustomerAppealBillController.cs
@@ -831,5 +831,58 @@ } } #endregion #region 客è¯å¤çå 客æ·ç»´åº¦æ¥è¡¨æ¥è¯¢ /// <summary> /// è¿å客è¯å¤çå客æ·ç»´åº¦æ¥è¡¨å表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("QC_CustomerAppealReport/Customer")] [HttpGet] public object Customer(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); if (sWhere == null || sWhere.Equals("")) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è¯·éæ©ææå¹´ä»½"; return objJsonResult; } else { ds = oCN.RunProcReturn("exec h_p_QC_CustomerAppealReport_Customer '" + sWhere + "'", "h_p_QC_CustomerAppealReport_Customer"); } //æ·»å åå 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/Æ·ÖʹÜÀí/¹¤Ðò¼ìÑéµ¥/MES_ProcessCheckBill_PDAController.cs
New file @@ -0,0 +1,256 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; using System.Collections.Generic; using System.Data; using System.Data.SqlClient; using System.Web.Http; using WebAPI.Models; namespace WebAPI.Controllers { public class MES_ProcessCheckBill_PDAController : ApiController { public DBUtility.ClsPub.Enum_BillStatus BillStatus; Pub_Class.ClsXt_SystemParameter oSystemParameter = new Pub_Class.ClsXt_SystemParameter(); private json objJsonResult = new json(); SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); DataSet ds; #region å·¥åºæ£éªPDAæ°å¢ä¿å [Route("MES_ProcessCheckBill_PDA/ProcessCheckAddBill")] [HttpPost] public object ProcessCheckAddBill([FromBody] JObject oMain) { var _value = oMain["oMain"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); try { //ååºåå string msg2 = "[" + sArray[0].ToString() + "]"; string user = sArray[1].ToString();//ç¨æ·å string OperationType = sArray[2].ToString();//ç±»å //夿æ¯å¦æç¼è¾æé if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Edit", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ ç¼è¾æé!"; objJsonResult.data = null; return objJsonResult; } List<Model.ClsQC_ProcessCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_ProcessCheckBillMain>>(msg2); string BillType = "7507"; string HBillSubType = "7507"; long HInterID = list[0].HInterID;//éå ¥typeå¾å°çåæ®ID string HBillNo = list[0].HBillNo;//éå ¥typeå¾å°çåæ®å· int HBillStatus = 1; string HMaker = user;//å¶å人 int HYear = DateTime.Now.Year; double HPeriod = DateTime.Now.Month; long HSourceID = list[0].HSourceID;//çäº§èµæº long HICMOInterID = list[0].HICMOInterID;//ä»»å¡åID string HICMOBillNo = list[0].HICMOBillNo;//ä»»å¡å string HProcExchBillNo = list[0].HProcExchBillNo;//æå¼å¡ long HMaterID = list[0].HMaterID;//产åID //long HUnitID = list[0].HUnitID;//计éåä½ long HProcID = list[0].HProcID;//å·¥åºID long HPRDORGID = list[0].HPRDORGID;//ç»ç»ID bool HLastResult = list[0].HLastResult;//è¯æ ·ç»è®º //忮宿´æ§å¤æ if (HProcExchBillNo == "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æµè½¬å¡æ²¡æéæ©ï¼è¯·æ«ææ¡å½¢ç æè¾å ¥æ¡å½¢ç åå车"; objJsonResult.data = null; return objJsonResult; } var num = 0; oCN.BeginTran(); if (OperationType == "1") { num = 1; ds = oCN.RunProcReturn("select * from QC_ProcessCheckBillMain where HBillNo='" + HBillNo + "'", "QC_ProcessCheckBillMain"); if (ds.Tables[0].Rows.Count == 1) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®å·éå¤ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc("Insert Into QC_ProcessCheckBillMain " + "(HBillType,HBillSubType,HInterID,HBillNo,HBillStatus,HDate,HMaker,HMakeDate" + ",HYear,HPeriod,HMaterID,HSourceID,HICMOInterID,HICMOBillNo,HProcExchBillNo" + ",HPRDORGID,HLastResult)" + " values('" + BillType + "','" + HBillSubType + "'," + HInterID + ",'" + HBillNo + "'," + HBillStatus + ",getdate(),'" + HMaker + "',getdate()" + "," + HYear + "," + HPeriod + ",'" + HMaterID + "','" + HSourceID + "'," + HICMOInterID + ",'" + HICMOBillNo + "','" + HProcExchBillNo + "'" + "," + HPRDORGID + ",'" + HLastResult + "') "); } else { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æä½ç±»åæ æï¼"; objJsonResult.data = null; return objJsonResult; } oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æ°å¢åæ®æåï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; } catch (Exception e) { oCN.RollBack(); objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥åºæ£éª_PDA æ¥è¯¢å表 [Route("ProcessCheck/ProcessCheckList")] [HttpGet] public object ProcessCheckList(string sWhere, string user) { try { //夿æ¯å¦æç¼è¾æé if (!DBUtility.ClsPub.Security_Log("QC_ProcessCheckBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æ¥è¯¢æé!"; objJsonResult.data = null; return objJsonResult; } string sql = "select * from h_v_QC_ProcessCheckBillMainList where 1=1 " + sWhere + " order by æ¥æ "; ds = oCN.RunProcReturn(sql, "h_v_QC_ProcessCheckBillMainList"); DataTable dt = ds.Tables[0]; //è·ååå List<object> columnNameList = new List<object>(); //æ·»å åå 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.list = columnNameList; objJsonResult.data = dt; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å·¥åºæ£éª_PDA å é¤åè½ [Route("ProcessCheck/DelProcessCheckBill")] [HttpGet] public object DelProcessCheckBill(Int64 lngBillKey, string user) { DataSet ds; string ModRightNameCheck = "QC_ProcessCheckBill_Delete"; try { //å 餿é if (!DBUtility.ClsPub.Security_Log(ModRightNameCheck, 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å é¤å¤±è´¥ï¼æ æéï¼"; objJsonResult.data = null; return objJsonResult; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (lngBillKey == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "åæ®id为空ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.BeginTran();//å¼å§äºå¡ ds = oCN.RunProcReturn("select * from QC_ProcessCheckBillMain where HInterID=" + lngBillKey, "QC_ProcessCheckBillMain"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ²¡ææ°æ®ï¼æ æ³å é¤ï¼"; objJsonResult.data = null; return objJsonResult; ; } string HChecker = Convert.ToString(ds.Tables[0].Rows[0]["HChecker"]); if (HChecker != "") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "忮已ç»å®¡æ ¸,ä¸è½å é¤ï¼"; objJsonResult.data = null; return objJsonResult; } oCN.RunProc("delete from QC_ProcessCheckBillMain where HInterID=" + lngBillKey); 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 } } WebAPI/DLL/ClsOA_ErrMsgBackBill.cs
@@ -10,6 +10,7 @@ public Models.ClsOA_ErrMsgBackBillMain omodel = new Models.ClsOA_ErrMsgBackBillMain(); public List<Models.ClsOA_ErrMsgBackBillSub> DetailColl = new List<Models.ClsOA_ErrMsgBackBillSub>(); public List<Models.ClsOA_ErrMsgBackBillSub2> DetailColl2 = new List<Models.ClsOA_ErrMsgBackBillSub2>(); public Models.ClsOA_ErrMsgBackBillSub DetailReply = new Models.ClsOA_ErrMsgBackBillSub(); public ClsOA_ErrMsgBackBill() { @@ -64,7 +65,9 @@ ",HDescription='" + omodel.HDescription + "'" + ",HHasten=" + omodel.HHasten.ToString() + ",HQty=" + omodel.HQty.ToString() + ",HRecDeptID=" + omodel.HRecDeptID.ToString() + ",HMaterNumber='" + omodel.HMaterNumber + "'" + " where HInterID=" + lngBillKey.ToString()); //å é¤å ³è DeleteRelation(ref sReturn, lngBillKey); @@ -193,6 +196,52 @@ } } public bool ReplyBill(ref string sReturn) { try { //è¥MAINDIéå¤åéæ°è·å oCn.BeginTran(); DataSet Ds = oCn.RunProcReturn("select count(HInterID) as num from OA_ErrMsgBackBillSub where HInterID = " + DetailReply.HInterID + " group by HInterID ", "OA_ErrMsgBackBillSub"); Int64 num = 0; if (Ds.Tables[0].Rows.Count == 0) { num = 1; } else { num = Convert.ToInt64(Ds.Tables[0].Rows[0]["num"]) + 1; } //主表 oCn.RunProc("Insert Into OA_ErrMsgBackBillSub " + "(HInterID,HEntryID,HRemark,HSendStatus,HSendMan" + ",HDescriptionSub,HDate" + ",HCloseMan,HEntryCloseDate,HCloseType,HSourceInterID,HSourceEntryID,HSourceBillNo,HSourceBillType,HRelationQty,HRelationMoney" + ") " + " values(" + DetailReply.HInterID + "," + num + ",'" + DetailReply.HRemark + "'," + 1 + ",'" + DetailReply.HSendMan + "'" + ",'" + DetailReply.HDescriptionSub + "','" + DetailReply.HDate + "','" + DetailReply.HCloseMan + "','" + "" + "'" + "," + 0 + "," + DetailReply.HSourceInterID + "," + DetailReply.HSourceEntryID + ",'" + DetailReply.HSourceBillNo + "'" + ",'" + DetailReply.HSourceBillType + "'," + DetailReply.HRelationQty + "," + DetailReply.HRelationMoney + ") "); sReturn = omodel.HInterID.ToString(); oCn.Commit(); return true; } catch (Exception e) { sReturn = e.Message; oCn.RollBack(); throw (e); } } //å é¤åæ® public virtual bool DeleteBill(Int64 lngBillKey,string HEntryID, ref string sReturn) { WebAPI/ListModels.cs
@@ -2627,6 +2627,18 @@ return list; } /// <summary> /// å¼å¸¸åé¦ååå¤å表å表json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Models.ClsOA_ErrMsgBackBillSub> getObjectByJson_Gy_MESTransFerWorkBillSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Models.ClsOA_ErrMsgBackBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Models.ClsOA_ErrMsgBackBillSub>>(jsonString); return list; } #region 客è¯å¤çå /// <summary> /// 客è¯å¤çå主表json WebAPI/Models/ClsOA_ErrMsgBackBillSub.cs
@@ -9,6 +9,7 @@ public Int64 HSendStatus;// int --åå¤ç±»åï¼1æ®éï¼2å®¡æ ¸ï¼4ä½åºï¼5å®¡æ ¸éåï¼9ç»æ¡ï¼10éªè¯ï¼ public string HSendMan;// varchar(10) --åå¤äºº public string HDescription;// varchar(1000) --åå¤å 容 public string HDescriptionSub;// varchar(1000) --åå¤å 容 public DateTime HDate;// datetime --å夿¶é´ } WebAPI/WebAPI.csproj
@@ -486,6 +486,7 @@ <Compile Include="Controllers\å质管ç\产线è¿ä¿®å¹³å°\Sc_SourceLineRepairBillController.cs" /> <Compile Include="Controllers\å质管ç\客è¯å¤çå\Crm_CustomerAppealBillController.cs" /> <Compile Include="Controllers\å质管ç\å·¡æ£å\QC_PatrolProcCheckBillController.cs" /> <Compile Include="Controllers\å质管ç\å·¥åºæ£éªå\MES_ProcessCheckBill_PDAController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_COMMONCONTACTBillController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_CustLocationController.cs" /> <Compile Include="Controllers\åºç¡èµæ\åºç¡èµæ\Gy_DutyBillController.cs" />