Model/生产管理/ClsSc_QualityReportBillSub.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/CJGL/Cj_SingleStationController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
WebAPI/Controllers/品质管理/基础资料/Gy_BaseInformationController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Model/Éú²ú¹ÜÀí/ClsSc_QualityReportBillSub.cs
@@ -31,5 +31,6 @@ public int HBadProcID;//çç» public int HNowProcID;//å½åå·¥åº public int HBadPhenomenaID;//ä¸è¯ç°è±¡ public int HBadTypeID;//ä¸è¯ç±»å } } WebAPI/Controllers/CJGL/Cj_SingleStationController.cs
@@ -290,8 +290,22 @@ oCN.RunProc("update Gy_BarCodeBill set HStatus='"+ HResult + "' where HBarCode='"+ oSub.HBarCode + "'"); //ä¿®æ¹åºç«åç ä¸è¯ æ¥åºæ°é if (HResult == "ä¸è¯") { oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); if (HResult == "ä¸è¯" && (oSub.HBadTypeID == 3 || oSub.HBadTypeID == 4 || oSub.HBadTypeID == 6)) { //å·¥åº if (oSub.HBadTypeID == 3) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Work+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); }//æåº else if (oSub.HBadTypeID == 4) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HWasterQty_Mater+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); }//è¿å·¥ else if (oSub.HBadTypeID == 6) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount+=1,HBackWorkQty+=1 where HProcExchBillNo='" + oSub.HProcExchBillNo + "' and HProcID=" + oSub.HProcID + " and HInterID=" + linterid); } } else if (HResult == "æ¥åº") { @@ -1657,8 +1671,20 @@ if (dataSet.Tables[0].Rows.Count > 0) { string HOutInterID = dataSet.Tables[0].Rows[0][0].ToString(); oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1 where HInterID='" + HOutInterID + "'"); //æ¯è«å°çæ åµ å å·¥åºæåº è¿å·¥ //å·¥åº if (subLsit[0].HBadTypeID == 3) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Work-=1 where HInterID='" + HOutInterID + "'"); }//æåº else if (subLsit[0].HBadTypeID == 4) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HWasterQty_Mater-=1 where HInterID='" + HOutInterID + "'"); }//è¿å·¥ else if (subLsit[0].HBadTypeID == 6) { oCN.RunProc("update Sc_StationOutBillMain set HBadCount-=1,HBackWorkQty-=1 where HInterID='" + HOutInterID + "'"); } } else { WebAPI/Controllers/Æ·ÖʹÜÀí/»ù´¡×ÊÁÏ/Gy_BaseInformationController.cs
@@ -757,7 +757,83 @@ return objJsonResult; } } #endregion #endregion #region SPCä¸å¿çº¿å表 æ¥è¯¢ [Route("QC_SpcCenterlineList/List")] [HttpGet] public object List(string sWhere, string user) { try { List<object> columnNameList = new List<object>(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select * from h_v_QC_SpcCenterlineList order by HInterID desc", "h_v_QC_SpcCenterlineList"); } else { string sql1 = "select * from h_v_QC_SpcCenterlineList where 1 = 1 "; string sql = sql1 + sWhere + " order by HInterID desc"; ds = oCN.RunProcReturn(sql, "h_v_QC_SpcCenterlineList"); } //æ·»å åå 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.data = ds.Tables[0]; 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ä¸å¿çº¿å表 å¼å¸¸æ°æ® æ´æ° [Route("QC_SpcCenterlineList/UpdateData")] [HttpGet] public object UpdateData(string HInterID, string user) { try { ds = oCN.RunProcReturn("select * from h_v_QC_SpcCenterlineList order by HInterID desc", "h_v_QC_SpcCenterlineList"); objJsonResult.code = "1"; objJsonResult.count = 1; objJsonResult.Message = "Sucessï¼"; objJsonResult.data = ds.Tables[0]; objJsonResult.list = null; return objJsonResult; } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "Exceptionï¼" + e.ToString(); objJsonResult.data = null; return objJsonResult; } } #endregion } }