| WebAPI/Controllers/MateOutController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/SCGL/日计划管理/Xs_SendGoodsPlanBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/品质管理/质量报表/QC_QualityReportsController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/条码管理/WEBSController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/MateOutController.cs
@@ -1212,6 +1212,53 @@ } } //车é´å®ä½ 车é´ä¸ä¸æ¶æ¶é´æ¥è¯¢ [Route("Kf_WorkShopICStockBill/List")] [HttpGet] public object Kf_WorkShopICStockBillList(string HBillType, string HCarBarCode, string HProcExBillNo, string HMaterNumber, long HWHID, long HSPID, string sWhere) { try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); List<object> columnNameList = new List<object>(); DataSet ds = oCN.RunProcReturn("exec h_p_KF_WorkShopICStockBillList '" + HBillType + "','" + HCarBarCode + "','" + HProcExBillNo + "','" + HMaterNumber + "'," + HWHID + "," + HSPID + ",'" + sWhere + "'", "h_p_KF_WorkShopICStockBillList"); //æ·»å åå 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; } 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
@@ -598,13 +598,14 @@ } } SumDay = uniqueDates.Count; if (oSystemParameter.omodel.WMS_CampanyName == "添康ç§æ") //ç³»ç»åæ° å®¢æ·å®å¶åå称 空ç½ä¸ºéç¨ { SumDay = 180; } SumDay = uniqueDates.Count; LogService.CustomWriteLog("2.3:" + i, DateTime.Now.ToString("yyyy-MM-dd")); for (int j = 0; j < SumDay; j++) { WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Xs_SendGoodsPlanBillController.cs
@@ -113,21 +113,24 @@ { error += $"没æ符åæ¡ä»¶å¾éå®è®¢åä¿¡æ¯ï¼å®¢æ·è®¢åå·:{ tb2.Rows[i]["客æ·è®¢åå·"].ToString()},产å代ç :{tb2.Rows[i]["ç©æç¼ç "].ToString()}"; } } if (error.Length > 0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = ErrorResult += $"Excel模æ¿åå¨é误ï¼è¡æ°{i + 1}:{error}\r\n"; ; objJsonResult.Message = ErrorResult += $"Excel模æ¿åå¨é误ï¼{error}\r\n"; ; objJsonResult.data = null; return objJsonResult; } else //æ¥è¯¢éå®è¡¨å¤ææ没æéå®è®¢åä¿¡æ¯ for (int i = 0; i < tb2.Rows.Count; i++) { tb2.Rows[i]["HMaterID"] = ds.Tables[0].Rows[0]["HMaterID"].ToString(); tb2.Rows[i]["SeOrderHInterID"] = ds.Tables[0].Rows[0]["FID"].ToString();//éå®è®¢å主id tb2.Rows[i]["SeOrderHEntryID"] = ds.Tables[0].Rows[0]["FENTRYID"].ToString();//éå®è®¢ååid } //æ¥æ¾æ¯å¦åå¨å¯¹åºå货计åå·¥å var dt = oCN.RunProcReturn($"select * from Xs_SendGoodsPlanBillMain where HSeOrderInterID in({ds.Tables[0].Rows[0]["FID"].ToString()}) and HSeOrderEntryID in({ds.Tables[0].Rows[0]["FENTRYID"].ToString()})", "Xs_SendGoodsPlanBillMain"); if (dt.Tables[0].Rows.Count > 0) WebAPI/Controllers/Æ·ÖʹÜÀí/ÖÊÁ¿±¨±í/QC_QualityReportsController.cs
@@ -482,6 +482,49 @@ } #endregion #region è´¨é模å è´¨é追溯æ¥è¡¨æ¥è¡¨æ¥è¯¢(å·¡æ£è®°å½å) /// <summary> /// è¿åè´¨é追溯æ¥è¡¨å表 ///åæ°ï¼string sqlã ///è¿åå¼ï¼objectã /// </summary> [Route("QC_Report/QualityTraceability5")] [HttpGet] public object QualityTraceability5(string HICMOBillNo, string HType) { try { List<object> columnNameList = new List<object>(); ds = oCN.RunProcReturn("exec h_p_Sc_QueryQualityByICMOBill '" + HType + "','" + HICMOBillNo + "'", "h_p_Sc_QueryQualityByICMOBill"); //æ·»å åå foreach (DataColumn col in ds.Tables[2].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[4]; 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 #region è´¨é模å SPCæ£éªååæ /// <summary> /// è¿åç´éçæ¥è¡¨å表 WebAPI/Controllers/ÌõÂë¹ÜÀí/WEBSController.cs
@@ -2549,6 +2549,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1202"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveProductInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -2690,6 +2691,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1201"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SavePOStockInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -2915,6 +2917,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1203"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveOtherInBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3069,6 +3072,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1204"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveMateOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3309,6 +3313,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1205"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveSellOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3448,6 +3453,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1211"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveEntrustOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3586,6 +3592,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1206"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveOtherOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3723,6 +3730,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1254"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveMateReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -3782,6 +3790,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1255"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveEntrustReplenishOutBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo)) @@ -4069,6 +4078,7 @@ websLsmain.HInterID = lsmain[0].HInterID; websLsmain.HBillNo = lsmain[0].HBillNo; websLsmain.HBillType = "1207"; websLsmain.HMaker = lsmain[0].HMaker; websLsmain.HSTOCKORGID = lsmain[0].HSTOCKORGID; if (oWebs.set_SaveMoveStockBill_BillCheck(websLsmain, ref DBUtility.ClsPub.sErrInfo))
