WebAPI/Controllers/MateOutController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBill_TKController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/条码管理/WEBSController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/WebAPI.csproj | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/MateOutController.cs
@@ -1116,6 +1116,55 @@ } } //å·æ°è¡¨ä½ 车é´å®ä½ è¿å车é´å³æ¶åºååºåä¿¡æ¯ç½é¡µPDAç [Route("KF_ICInventory_WorkShopByMaterID/GetWorkShopICInventory")] [HttpGet] public object GetWorkShopICInventory(string HBarCode, long sHWHID, long sHSPID, long HOWNERID, string sWhere) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); List<object> columnNameList = new List<object>(); DataSet ds = oCN.RunProcReturn("exec h_p_KF_ICInventory_WorkShopByMaterIDList '" + HBarCode + "'," + sHWHID + "," + sHSPID + "," + HOWNERID + ",'" + sWhere + "'", "h_p_KF_ICInventory_WorkShopByMaterIDList"); //æ·»å åå 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å对象çåå } if (ds == null || ds.Tables[0].Rows.Count <= 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; //DBUtility.ClsPub.MessageBeep((int)DBUtility.ClsPub.BeepType.Warning); } else { objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } [Route("MateOutBill/Delete_Json")] [HttpGet] public object Delete_Json(long HInterID, long HMaterID, long HAuxPropID, string HMTONo, long HSourceInterID, long HSourceEntryID, string sHBillType) WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBillController.cs
@@ -1981,13 +1981,13 @@ sqlName = "AIS20210811135644"; } if (WMS_CampanyName == "å®å·¥") if (WMS_CampanyName == "å®å·¥" || WMS_CampanyName == "æ·»åº·ç§æ") { objJsonResult = (json)JIT_MOMaterLack(fProWorkShopId, fPrdOrgId, user); } else if (HTLType == "缺æ") { if (WMS_CampanyName == "å¸ å¨" || WMS_CampanyName == "å¯è´å¥ç¹" || WMS_CampanyName == "æ·»åº·ç§æ") if (WMS_CampanyName == "å¸ å¨" || WMS_CampanyName == "å¯è´å¥ç¹" /*|| WMS_CampanyName == "æ·»åº·ç§æ"*/) { objJsonResult = (json)JIT_QL(fProWorkShopId, fPrdOrgId, user, sqlName); } WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/JIT_DayPlanPlatFormBill_TKController.cs
@@ -243,7 +243,20 @@ LogService.Write($"========================1.æäº§ä¸»è¡¨å¤çç¨æ¶ï¼" + sw.Elapsed); int SumDay = 180; //å¨æå æä¹å·® DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days; int SumDay = 0; //å¨æå æä¹å·® DateTime.Now.AddMonths(1).AddDays(-1).Subtract(DateTime.Now).Days; // ç»è®¡æ»å¤©æ° HashSet<DateTime> uniqueDates = new HashSet<DateTime>(); foreach (var key in list[i].Keys) { if (DateTime.TryParseExact(key, "yyyy-M-d", CultureInfo.InvariantCulture, DateTimeStyles.None, out DateTime date)) { uniqueDates.Add(date); } } SumDay = uniqueDates.Count; LogService.CustomWriteLog("2.3:" + i, DateTime.Now.ToString("yyyy-MM-dd")); for (int j = 0; j < SumDay; j++) WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -4409,7 +4409,7 @@ /// å°è½¦éå®åæ°å¢ä¸ä¼ /// </summary> /// <returns></returns> [Route("WEBSController/set_SaveTrolleyPositionBill_Json2")] [Route("WEBSController/set_SaveTrolleyPositionBill_Json")] [HttpPost] public object set_SaveTrolleyPositionBill_Json([FromBody] JObject msg) { @@ -8570,7 +8570,7 @@ #endregion #region 䏿¶ã䏿¶å模åè°ç¨æ¹æ³ 20250520 #region 䏿¶ã䏿¶åãå°è½¦é宿¨¡åè°ç¨æ¹æ³ 20250520 #region 䏿¶åæ«ç æ¨¡å æ«ææºåæ¡ç è°ç¨æ¹æ³ /// <summary> @@ -8767,6 +8767,147 @@ } #endregion #region 䏿¶å模åï¼æ«æºåæ¡ç æ¥è¯¢ç©æåºåä¿¡æ¯ /// <summary> /// è·ååæ®åè¡¨ä¿¡æ¯ /// </summary> /// <returns></returns> [Route("WEBSController/MaterialLowerBill_MaterInv")] [HttpGet] public object MaterialLowerBill_MaterInv(long HInterID, string HBillNo, string HBillType, Int64 HStockOrgID) { try { ds = oCn.RunProcReturn("exec h_p_Kf_MaterialInventory " + HInterID + "," + HBillType + "," + HStockOrgID, "h_p_Kf_MaterialInventory"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没æè¿åä»»ä½è®°å½ï¼"; objJsonResult.data = null; return objJsonResult; } else { 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 = "0"; objJsonResult.count = 1; objJsonResult.Message = "è·åä¿¡æ¯æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "è·åå表信æ¯å¤±è´¥ï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å°è½¦æ«ç ç»å®æ¶ï¼å¤æå ¶æ¯å¦å·²ç»å®åºä½ä¿¡æ¯ [Route("WEBSController/CarIsused")] [HttpGet] public object CarIsused(string HCarBarCode) { try { ds = oCn.RunProcReturn("select * from h_v_Gy_MouldIsUsed where å°è½¦æ¡ç ='" + HCarBarCode + "'" , "h_v_Gy_MouldIsUsed"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "å°è½¦æ¡ç ï¼" + HCarBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼"; objJsonResult.data = null; return objJsonResult; } else { 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 = "æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢å°è½¦å¨åºç¶æå¤±è´¥errï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #region å°è½¦ç»å®æºå°æ¶ï¼å¤æææ«æºå°ï¼è®¾å¤ï¼æ¡ç æ¯å¦åå¨äºè®¾å¤æ¡£æ¡ [Route("WEBSController/IsExistEquip")] [HttpGet] public object IsExistEquip(string HEquipBarCode) { try { ds = oCn.RunProcReturn("select * from h_v_Gy_EquipIsExist where æºå°æ¡ç ='" + HEquipBarCode + "'", "h_v_Gy_EquipIsExist"); if (ds == null || ds.Tables[0].Rows.Count == 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æºå°æ¡ç ï¼" + HEquipBarCode + "ï¼ä¸å¨ç³»ç»ä¸ï¼è¯·æ ¸å¯¹ï¼"; objJsonResult.data = null; return objJsonResult; } else { 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 = "æåï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = columnNameList; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "æ¥è¯¢æºå°ä¿¡æ¯å¤±è´¥errï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion #endregion WebAPI/WebAPI.csproj
@@ -449,6 +449,7 @@ <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckRuleBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckPlanBillController.cs" /> <Compile Include="Controllers\SBGL\Sb_EquipPatrolCheckBillController.cs" /> <Compile Include="Controllers\SCGL\æ¥è®¡å管ç\JIT_DayPlanPlatFormBill_TKController.cs" /> <Compile Include="Controllers\XSGL\Crm_ComplainVisitBillController.cs" /> <Compile Include="Controllers\XSGL\Xs_SellOutBillList_SecController.cs" /> <Compile Include="Controllers\XSGL\Xs_SeQuotationBillController.cs" />