派生自 MES-WEB-API
| WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/LMESController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/MateOutController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/SCGL/日计划管理/JIT_DayPlanPlatFormBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/SCGL/日计划管理/Sc_JIT_ComplementGoodBillController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/CJGL/Cj_StationEntrustInBillController.cs
@@ -772,7 +772,7 @@ #endregion #region 对è²è®°å½æ°å¢ä¿å [Route("ColorRecord/ColorRecordAddBill")] [Route("MES_SampleRecordBill_PDA/ColorRecordAddBill")] [HttpPost] public object ColorRecordAddBill([FromBody] JObject oMain) { WebAPI/Controllers/LMESController.cs
@@ -159,7 +159,7 @@ } SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); ds = oCN.RunProcReturn("select * from h_v_Sc_ProcessExchangeBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillList"); ds = oCN.RunProcReturn("select top 1000 * from h_v_Sc_ProcessExchangeBillList where 1 = 1 " + sWhere + " order by hmainid desc ", "h_v_Sc_ProcessExchangeBillList"); } else { WebAPI/Controllers/MateOutController.cs
@@ -1562,8 +1562,6 @@ #endregion #region æå产éæ¥è¡¨ [Route("ProdProcessSumReport/ProdProcessSumReport_DyeColor_third")] [HttpGet] @@ -1611,6 +1609,153 @@ } #endregion #region çå¹²å®ååºç« [Route("ProdProcessSumReport/Kf_DryFinalizeOutReport")] [HttpGet] public object Kf_DryFinalizeOutReport(string sWhere) { try { ds = oCN.RunProcReturn($"select * from h_v_Kf_DryFinalizeOutReport where 1=1 "+sWhere, "h_v_Kf_DryFinalizeOutReport"); //è·ååå 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 = 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("ProdProcessSumReport/Kf_SizingFinalizeOutReport")] [HttpGet] public object Kf_SizingFinalizeOutReport(string sWhere) { try { ds = oCN.RunProcReturn($"select * from h_v_Kf_SizingFinalizeOutReport where 1=1 " + sWhere, "h_v_Kf_SizingFinalizeOutReport"); //è·ååå 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 = 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("ProdProcessSumReport/Kf_BrushingOutReport")] [HttpGet] public object Kf_BrushingOutReport(string sWhere) { try { ds = oCN.RunProcReturn($"select * from h_v_Kf_BrushingOutReport where 1=1 " + sWhere, "h_v_Kf_BrushingOutReport"); //è·ååå 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 = 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("ProdProcessSumReport/Kf_ColorBlankLustringOutReport")] [HttpGet] public object Kf_ColorBlankLustringOutReport(string sWhere) { try { ds = oCN.RunProcReturn($"select * from h_v_Kf_ColorBlankLustringOutReport where 1=1 " + sWhere, "h_v_Kf_ColorBlankLustringOutReport"); //è·ååå 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 = 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
@@ -144,6 +144,7 @@ return objJsonResult; } LogService.CustomWriteLog("1:"+msg2, DateTime.Now.ToString("yyyy-MM-dd")); //JSONåºåå转æ¢åå ¸éå List<Dictionary<string, string>> list = new List<Dictionary<string, string>>(); List<object> jb = JsonConvert.DeserializeObject<List<object>>(msg2); @@ -157,6 +158,7 @@ list.Add(dic); } LogService.CustomWriteLog("2:", DateTime.Now.ToString("yyyy-MM-dd")); int TrueCount = 0, SumCount = 0; for (int i = 0; i < list.Count; i++) @@ -729,7 +731,7 @@ omdelMian = JsonConvert.DeserializeObject<Sc_WorkBillSortBillMain>(sWhere); string sql = $"exec JIT_qtfx {omdelMian.HProdORGID},{omdelMian.HWorkShopID},'{user}' "; ds = oCN.RunProcReturn(sql, "JIT_qtfx"); LogService.Write("é½å¥åæsql:" + sql); //LogService.Write("é½å¥åæsql:" + sql); List<PRD_PPBOM> BomList = new List<PRD_PPBOM>(); DataTable resulTable = ds.Tables[0]; if (resulTable.Rows[0][0].ToString().Contains("失败")) @@ -768,7 +770,7 @@ fDayPlanFids = string.Join(",", fidList); fDayPlanFEntryids = string.Join(",", fentryidList); } LogService.Write("æ¥è®¡åå·¥åids" + fDayPlanFids); //LogService.Write("æ¥è®¡åå·¥åids" + fDayPlanFids); sw.Start();//å¼å§è®¡æ¶ @@ -789,24 +791,24 @@ //ååºåæ°é FMustQty ä¸è¦åå¼éæ±æ°éFNeedQty é¢ææ°æ® string LLsql = string.Format(@"exec h_p_jit_PPBOMList '{0}'", fDayPlanFids); List<DayPlanPickedModel> DayPlanPickedModel = new List<DayPlanPickedModel>(); LogService.Write("LLsql:" + LLsql); //LogService.Write("LLsql:" + LLsql); ds = oCN.RunProcReturn(LLsql, "SC_WORKBILLSORTBILLMAIN"); LogService.Write(JsonConvert.SerializeObject(ds)); //LogService.Write(JsonConvert.SerializeObject(ds)); DayPlanPickedModel = ds.ToModelList<DayPlanPickedModel>(); LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel)); //LogService.Write(JsonConvert.SerializeObject(DayPlanPickedModel)); //CompleteAnalysisTempModel ç¨äºåå¨ä¸´æ¶éè¦æå ¥æ°æ® List<CompleteAnalysisTempModel> completeAnalysisTempModel = new List<CompleteAnalysisTempModel>(); //å建åå ¸ ç¨äºå¨åç©æ + å ç¨æ°é Dictionary<string, decimal> occupyDic = new Dictionary<string, decimal>(); LogService.Write($"é½å¥åæï¼æ°æ®åå¤é¶æ®µï¼ç¨æ¶" + sw.Elapsed + "æ»è¡æ°ï¼" + BomList.Count); LogService.Write($"é½å¥åæï¼æ°æ®åå¤é¶æ®µï¼ç¨æ¶" + sw.Elapsed + "æ»éè¦å¾ªç¯çbomæ°éï¼" + DatePlanList.Count); //LogService.Write($"é½å¥åæï¼æ°æ®åå¤é¶æ®µï¼ç¨æ¶" + sw.Elapsed + "æ»è¡æ°ï¼" + BomList.Count); //LogService.Write($"é½å¥åæï¼æ°æ®åå¤é¶æ®µï¼ç¨æ¶" + sw.Elapsed + "æ»éè¦å¾ªç¯çbomæ°éï¼" + DatePlanList.Count); //第ä¸ä¸ªå¾ªç¯ æ¥è®¡åå·¥åæç» ä¸å¤©+ä¸ä¸ªå·¥å ä¸ä¸ªå¾ªç¯ int o = 0; foreach (var item in DatePlanList) { o++; LogService.Write("循ç¯:" + o); //LogService.Write("循ç¯:" + o); //æ¥è®¡åç¨ææ¸ åæç» æ¯ä¸å¤©çå®é ç¨ææ åµ var _BomList = BomList.Where(x => x.HMasterDate == item.HMasterDate && x.HICMOEntryID_Sec == item.HICMOEntryID_Sec).ToList(); //æ¯ä¸ä¸ªç©æè¿è¡åºåè®¡ç® @@ -875,24 +877,24 @@ }); //æ£é¤å©ä½å¯ç¨é¢ææ°é _DayPlanPickedModel.FRemainPickedQty -= need; LogService.Write($"h" + need); //LogService.Write($"h" + need); //循ç¯ä¸ä¸ä¸ªç©æ continue; } else { LogService.Write($"kxs" + need); //LogService.Write($"kxs" + need); need -= _DayPlanPickedModel.FRemainPickedQty; //å©ä½éæ±æ°é LogService.Write($"i1" + need); //LogService.Write($"i1" + need); FOccupyPickedCount = _DayPlanPickedModel.FRemainPickedQty; _DayPlanPickedModel.FRemainPickedQty = 0; LogService.Write($"i" + need); //LogService.Write($"i" + need); } if (_pRD_WorkHouseCompar.Count > 0) { //缺ææ°é éæ±æ°é - å®é åºå >0 ? ä¸ä¸ªç©æä¸ç®¡å ç¨å¤å°æ¡ åºå+货主 æ°æ® 缺ææ°éæ¯åä¸ä¸ªæ°é decimal _fLackCount = need > jskcQty ? (need - jskcQty) : 0; LogService.Write($"j" + _fLackCount); //LogService.Write($"j" + _fLackCount); //LogHelper.Info("ç»ç»ï¼" + _item.FStockOrgId + " ,åæ¶åºå" + jskcQty); //æ»åºå为0äº ç´æ¥ç»åº 缺ææ°é if (jskcQty == 0) @@ -926,7 +928,7 @@ continue; } LogService.Write($"k" + 2); //LogService.Write($"k" + 2); foreach (var WorkHouse in _pRD_WorkHouseCompar) { //åºåæ°æ®å¹é @@ -1027,7 +1029,7 @@ //Thread.Sleep(6000); i++; } LogService.Write($"é½å¥åæï¼æ°æ®åå¤å®æï¼ä¿åå°Modelå®ä½ï¼æ»è¡æ°ï¼{completeAnalysisTempModel.Count}ï¼èæ¶ï¼" + sw.Elapsed); //LogService.Write($"é½å¥åæï¼æ°æ®åå¤å®æï¼ä¿åå°Modelå®ä½ï¼æ»è¡æ°ï¼{completeAnalysisTempModel.Count}ï¼èæ¶ï¼" + sw.Elapsed); List<string> sqlList = new List<string>(); DataTable insertDT = new DataTable(); insertDT.TableName = "JIT_MOMaterReadysBill"; @@ -1117,7 +1119,7 @@ $", {item["FCOMPLETECOUNT1"].ToString()}, {item["FERPCLSID"].ToString()}, {item["FWORKSHOPID"].ToString()}, {item["FSTOCKID"].ToString()}, {item["FOCCUPYPICKEDCOUNT"].ToString()}, '{item["HMainICMOBillNo"].ToString()}'" + $",{item["HLOT"].ToString()},'{item["HInventoryFID"].ToString()}')"); } LogService.Write("æ¹éæå ¥å°æ°æ®åºç¨æ¶ï¼" + sw.Elapsed); //LogService.Write("æ¹éæå ¥å°æ°æ®åºç¨æ¶ï¼" + sw.Elapsed); //æ§è¡å®æå æ´æ°æ¥è®¡åå·¥åç¶æ string updatesql = string.Format(@" update Sc_WorkBillSortBillSub set HComplete = 'æªé½å¥' where HEntryID IN @@ -1136,7 +1138,7 @@ //éæ¾é½å¥æä½ é¿å å¤äººåæ¶è¿è¡é½å¥åæ oCN.RunProc($"update T_PRD_QTFX set FSTATUS = 0 where FPRDORGID ={omdelMian.HProdORGID} and FSTATUS = 1 "); sw.Stop();//ç»æè®¡æ¶ LogService.Write("é½å¥åæè¿è¡æ»æ¶é¿ï¼" + sw.Elapsed); //LogService.Write("é½å¥åæè¿è¡æ»æ¶é¿ï¼" + sw.Elapsed); objJsonResult.code = "1"; objJsonResult.count = 1; @@ -1602,7 +1604,7 @@ //sqléå æ´æ°éè´è®¢åå ç¨çææ计åæ°é List<string> sqlList = new List<string>(); LogService.Write("1"); //LogService.Write("1"); string Error = ""; foreach (var item in MaterialIDList) { @@ -1614,7 +1616,7 @@ continue; } LogService.Write("1.1"); //LogService.Write("1.1"); ////LogHelper.Info(item.FMATERIALID.ToString()); //å½åç©æååºåç»ç»å¯¹åºçéè¿è¡ææ计åçæ°æ® @@ -1630,7 +1632,7 @@ int i = 0; //è®°å½å¨æå°éè´ééæ±ä¸çæ¥è®¡åæç»FentyrID LogService.Write("1.2"); //LogService.Write("1.2"); List<int> FEntryIdList = new List<int>(); foreach (var _item in _DayPlanPpbom) @@ -1642,7 +1644,7 @@ break; } LogService.Write("1.2.1"); //LogService.Write("1.2.1"); if (NeedQty == 0) { @@ -1660,7 +1662,7 @@ continue; } LogService.Write("1.2.2"); //LogService.Write("1.2.2"); foreach (var Purchase in _PurchaseInventory) { @@ -1705,7 +1707,7 @@ DayPlanPpbomls.NeedQty = 0; } LogService.Write("1.2.3"); //LogService.Write("1.2.3"); FEntryIdList.Clear(); //æ´æ°éè´è®¢å @@ -1784,7 +1786,7 @@ } } LogService.Write("1.2.4"); //LogService.Write("1.2.4"); NeedQty = 0; @@ -1797,7 +1799,7 @@ int tlmmm = 0; JArray FinalyResult = new JArray(); LogService.Write("2"); //LogService.Write("2"); foreach (var item in PODemandPlanList) { @@ -1970,7 +1972,7 @@ // tlmmm++; } LogService.Write("3"); //LogService.Write("3"); if (Error != "") { oCN.Commit(); WebAPI/Controllers/SCGL/Èռƻ®¹ÜÀí/Sc_JIT_ComplementGoodBillController.cs
@@ -909,12 +909,10 @@ int i = 1; foreach (Dictionary<string, string> item in list) { long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//è·å¾ä¸ä¸ªæ°çid string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//è·å¾ä¸ä¸ªæ°çåæ®å· string HOrgID = item["HOrgID"].ToString();//ç»ç»ID string HSupID = item["HSupID"].ToString();//ä¾åºå string HSupplierName = item["ä¾åºå"].ToString(); string HMaterID = item["HMaterID"].ToString();//ç©æID string HOrgID = item["HOrgID"].ToString();//ç»ç»ID string HSupplierName = item["ä¾åºå"].ToString(); string HMaterName = item["ç©æå称"].ToString(); string HMaterModel = item["è§æ ¼åå·"].ToString(); string HUnitID = item["HUnitID"].ToString();//计éåä½ @@ -929,6 +927,14 @@ string JIMLC = item["JITæå°èµ·éé"].ToString(); string HRemark = item["å¤æ³¨"].ToString(); ds = oCN.RunProcReturn("select * from Cg_PODemandPlanConfigBillSub where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID, "Cg_PODemandPlanConfigBillSub"); if (ds.Tables[0].Rows.Count == 0) { long HInterID = DBUtility.ClsPub.CreateBillID_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo);//è·å¾ä¸ä¸ªæ°çid string HBillNo = DBUtility.ClsPub.CreateBillCode_Prod("4611", ref DBUtility.ClsPub.sExeReturnInfo, true);//è·å¾ä¸ä¸ªæ°çåæ®å· string sql = "insert into Cg_PODemandPlanConfigBillMain(HInterID,HBillNo,HYear,HPeriod,HBillType,HBillSubType,HDate,HBillStatus,HMaker,HMakeDate,HOrgId)" + $"values({HInterID}, '{HBillNo}',{DateTime.Now.Year}, {DateTime.Now.Month}, '4611', '4611', GETDATE(), 1, '{user}', GETDATE(), {HOrgID})"; @@ -938,12 +944,16 @@ $"({HInterID}, 1, '{HRemark}', {(HSupID == "" ? "0" : HSupID)}, '{HSupplierName}', {(HMaterID == "" ? "0" : HMaterID)}," + $" '{HMaterName}', '{HMaterModel}', '{JITType}', {(JITPSL == "" ? "0" : JITPSL)}, {(JITMDSC == "" ? "0" : JITMDSC)},{(JIPEB == "" ? "0" : JIPEB)},{(JITPBCC == "" ? "0" : JITPBCC)}," + $" {(JISLT == "" ? "0" : JISLT)}, {(JIDLT == "" ? "0" : JIDLT)}, '', {(JITDCD == "" ? "0" : JITDCD)} ,{HUnitID},{JIMLC})"; LogService.Write("sql" + i + ":" + sql); LogService.Write("sql1" + i + ":" + sql1); //主表 oCN.RunProc(sql); //å表 oCN.RunProc(sql1); } else { oCN.RunProc(" update Cg_PODemandPlanConfigBillSub set HLeadTime=" + JISLT + " where HMaterID=" + HMaterID + " and HSupplierID=" + HSupID); } i++; }
