Pub_Class/CustomerCls/ClsXt_SystemParameter.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/BaseSet/Gy_MaterialController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/LMESController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/基础资料/工资基础资料/Gy_ProcPriceController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Pub_Class/CustomerCls/ClsXt_SystemParameter.cs
@@ -1648,6 +1648,11 @@ omodel.Sc_MESProceReportWorkBill_AutoCheck = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } //æ¡ç 主档å é¤äººå¿ é¡»æ¯å¶å人ï¼'Y'为æ§å¶ï¼ if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "BarCode_DeleterAndMakerMustSame") { omodel.BarCode_DeleterAndMakerMustSame = ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HValue"]); } ////=========å·¥åºè¿ç«å ////èªå¨å¹é æµæ°´å· //if (ClsPub.isStrNull(DsSub.Tables[0].Rows[i]["HKey"]) == "MES_StationBill_ProcNo") WebAPI/Controllers/BaseSet/Gy_MaterialController.cs
@@ -608,17 +608,7 @@ string HInterID = HInter.Replace("\"", ""); string user = sArray[1].ToString(); string HBarCode = sArray[2].ToString().Replace("\"",""); string HComputerName = SystemInformation.ComputerName; //设å¤åç§° //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBillList_Edit", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ å 餿éï¼"; objJsonResult.data = null; return objJsonResult; } string HComputerName = SystemInformation.ComputerName; //设å¤åç§° try { @@ -626,6 +616,16 @@ string[] NewBarCode; NewBarCode = HBarCode.Split(Convert.ToChar(",")); //ç¼è¾æé if (!DBUtility.ClsPub.Security_Log("Gy_BarCodeBill_Del", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ å 餿éï¼"; objJsonResult.data = null; return objJsonResult; } //å 餿¡ç åè¿è¡å¤æ Ds = oCN.RunProcReturn("exec h_p_Gy_BarCodeBill_MulDelete_Before '" + HInterID + "','" + HBarCode + "'", "h_p_Gy_BarCodeBill_MulDelete_Before", ref DBUtility.ClsPub.sExeReturnInfo); @@ -664,18 +664,20 @@ { oCN.BeginTran(); ////è·åç³»ç»åæ° //string Ret = ""; //if (oSystemParameter.ShowBill(ref Ret)) //{ // //夿æ¯å¦åªè½å é¤èªå·±çæçæ¡ç // if (oSystemParameter.omodel.BarCode_DeleterAndMakerllustSame != "é¾å±±æ±½é ") //ç³»ç»åæ° // { // } //} oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")"); //è·åç³»ç»åæ° string Ret = ""; if (oSystemParameter.ShowBill(ref Ret)) { //夿æ¯å¦åªè½å é¤èªå·±çæçæ¡ç if (oSystemParameter.omodel.BarCode_DeleterAndMakerMustSame == "Y") //ç³»ç»åæ° { oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")" + " and HMaker = '" + user + "'"); } else { oCN.RunProc("Delete from Gy_BarCodeBill Where HItemID in (" + HInterID + ")"); } } //åå ¥ç³»ç»æ¥å¿ for (int i = 0; i <= NewBarCode.Length - 1; i++) WebAPI/Controllers/LMESController.cs
@@ -363,14 +363,14 @@ try { //夿æ¯å¦ææ¥è¯¢æé //if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) //{ // objJsonResult.code = "0"; // objJsonResult.count = 0; // objJsonResult.Message = "æ æéæ¥è¯¢!"; // objJsonResult.data = null; // return objJsonResult; //} if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) @@ -521,6 +521,54 @@ #endregion #region å·¥èºè·¯çº¿(ç»´æ¤å·¥ä»·) /// <summary> /// è¿åå·¥èºè·¯çº¿å表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("LEMS/MES_Gy_RoutingBillMainRates_Json")] [HttpGet] public object MES_Gy_RoutingBillMainRates_Json(string sWhere, string user) { DataSet ds; try { //夿æ¯å¦ææ¥è¯¢æé if (!DBUtility.ClsPub.Security_Log("Gy_RoutingBill_Query", 1, false, user)) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ æéæ¥è¯¢!"; objJsonResult.data = null; return objJsonResult; } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_Gy_RoutingBillList_MainRate order by hmainid desc", "h_v_Gy_RoutingBillList_MainRate"); } else { string sql1 = "select * from h_v_Gy_RoutingBillList_MainRate where 1 = 1 "; string sql = sql1 + sWhere + " order by hmainid desc,cast(å·¥åºå· as int)"; ds = oCN.RunProcReturn(sql, "h_v_Gy_RoutingBillList_MainRate"); } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } return GetObjectJson(ds); } #endregion #endregion /// <summary> WebAPI/Controllers/»ù´¡×ÊÁÏ/¹¤×Ê»ù´¡×ÊÁÏ/Gy_ProcPriceController.cs
@@ -120,7 +120,7 @@ oSub.HMaterID = DBUtility.ClsPub.isLong(subList[i].HMaterIDCol); oSub.HProcID = DBUtility.ClsPub.isLong(subList[i].HProcIDCol); oSub.HSourceID = DBUtility.ClsPub.isLong(subList[i].HSourceIDCol); oSub.HPrice = DBUtility.ClsPub.isLong(subList[i].HPriceCol); oSub.HPrice = DBUtility.ClsPub.isDoule(subList[i].HPriceCol); oSub.HBeginDate = DBUtility.ClsPub.isDate(subList[i].HBeginDateCol); oSub.HEndDate = DBUtility.ClsPub.isDate(subList[i].HEndDateCol); oSub.HCostFlag = DBUtility.ClsPub.GridToBool(subList[i].HCostFlagCol);