WebAPI/Controllers/SCGL/日计划管理/JIT_CompleteController..cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_CompleteController..cs
@@ -25,11 +25,16 @@ /// <returns></returns> [Route("JIT_Complete/JIT_CompleteDetailList")] [HttpGet] public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID) public object JIT_CompleteDetailList(string sWhere, string HMainICMOEntryID,string HMainICMOInterID,string HICMOInterID) { try { ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 主ç产订ååå ç = '" + HMainICMOEntryID + "' " + sWhere + " order by æ¥è®¡åæ¥æ,ç©æID desc ", "h_v_JIT_MOMaterReadysBill"); string sql = ""; if (HMainICMOEntryID != "-1" && HMainICMOInterID != "-1" && HICMOInterID != "-1") { sql = "and 主ç产订ååå ç = '" + HMainICMOEntryID + "' and 主ç产订å主å ç ='" + HMainICMOInterID + "' and æ¥è®¡å订å主å ç ='" + HICMOInterID + "'"; } ds = oCN.RunProcReturn("select * from h_v_JIT_MOMaterReadysBill where 1=1 " +sql + sWhere + " order by æ¥è®¡åæ¥æ,ç©æID desc ", "h_v_JIT_MOMaterReadysBill"); objJsonResult.code = "1"; objJsonResult.count = 1; WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs
@@ -643,7 +643,6 @@ { try { oCN.BeginTran(); Stopwatch sw = new Stopwatch(); omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere); string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' "; @@ -653,7 +652,14 @@ DataTable resulTable = ds.Tables[0]; if (resulTable.Rows[0][0].ToString().Contains("失败")) { return resulTable.Rows[0][0].ToString(); //éæ¾é½å¥æä½ é¿å å¤äººåæ¶è¿è¡é½å¥åæ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 "); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = resulTable.Rows[0][0].ToString(); objJsonResult.data = null; return objJsonResult; } else { @@ -664,7 +670,14 @@ string fDayPlanFEntryids = string.Empty; if (BomList.Count == 0) { return "没æéè¦è¿è¡é½å¥åæçæ°æ®"; //éæ¾é½å¥æä½ é¿å å¤äººåæ¶è¿è¡é½å¥åæ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 "); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "没æéè¦è¿è¡é½å¥åæçæ°æ®"; objJsonResult.data = null; return objJsonResult; } else { @@ -1045,8 +1058,6 @@ sw.Stop();//ç»æè®¡æ¶ LogService.Write("é½å¥åæè¿è¡æ»æ¶é¿ï¼" + sw.Elapsed); oCN.Commit(); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "æä½æå"; @@ -1055,7 +1066,6 @@ } catch (Exception e) { oCN.RollBack(); LogService.Write("æä½å¤±è´¥ï¼" + e.Message.ToString()); objJsonResult.code = "0"; objJsonResult.count = 0; WebAPI/Controllers/XSGL/Xs_SeOrderBillController.cs
@@ -1,4 +1,5 @@ using Newtonsoft.Json.Linq; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Pub_Class; using System; using System.Collections; @@ -90,22 +91,60 @@ ds = oCN.RunProcReturn(sql, "h_v_IF_SeOrderBillList"); } //if (ds.Tables[0].Rows.Count != 0 || ds != null) //{ objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; return objJsonResult; //} //else //{ //objJsonResult.code = "0"; //objJsonResult.count = 0; //objJsonResult.Message = "æ æ°æ®"; //objJsonResult.data = null; //return objJsonResult; //} } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } /// <summary> /// è¿åéå®è®¢å卿å表 /// </summary> /// <param name="sWhere"></param> /// <param name="user"></param> /// <returns></returns> [Route("Xs_SeOrderBill/DyColList")] [HttpGet] public object DyColList(string sWhere, string user) { try { //夿æ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Xs_SeOrderBillQuery", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } ds = oCN.RunProcReturn("select * from h_v_IF_SeOrderBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_IF_SeOrderBillList"); List<object> listCol = new List<object>(); foreach (DataColumn col in ds.Tables[0].Columns) { Type dataType = col.DataType; string str = "{\"ColmCols\":\"" + col.ColumnName + "\",\"ColmType\":\"" + dataType.Name + "\"}"; listCol.Add(JsonConvert.DeserializeObject(str)); } objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = listCol; return objJsonResult; } catch (Exception e) {