| WebAPI/Controllers/Sc_ProcessMangementController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Controllers/WebAPIController.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/ListModels.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| WebAPI/Properties/PublishProfiles/API.pubxml.user | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
WebAPI/Controllers/Sc_ProcessMangementController.cs
@@ -444,6 +444,42 @@ return GetObjectJson(ds); } /// <summary> /// 返回不合格评审列表 /// </summary> /// <param name="sWhere"></param> /// <returns></returns> [Route("Sc_ProcessMangement/MES_QC_NoPassProdCheckBill_Json")] [HttpGet] public object MES_QC_NoPassProdCheckBill_Json(string sWhere) { DataSet ds; try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select top 500 * from h_v_QC_NoPassProdCheckBillList ", "h_v_QC_NoPassProdCheckBillList"); } else { string sql1 = "select * from h_v_QC_NoPassProdCheckBillList where 1 = 1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_QC_NoPassProdCheckBillList"); } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "没有返回任何记录！" + e.ToString(); objJsonResult.data = null; return objJsonResult; } return GetObjectJson(ds); } /// <summary> /// PDA工序汇报单保存 /// </summary> @@ -860,6 +896,142 @@ } /// <summary> /// 保存不良评审单信息 /// </summary> /// <param name="msg"></param> /// <returns></returns> [Route("SaveBadReasonList")] [HttpPost] public object SaveBadReasonList([FromBody] JObject msg) { var _value = msg["msg"].ToString(); string msg1 = _value.ToString(); string[] sArray = msg1.Split(new string[] { ";" }, StringSplitOptions.RemoveEmptyEntries); string msg2 = sArray[0].ToString(); string msg3 = sArray[1].ToString(); string UserName=""; ListModels oListModels = new ListModels(); try { DAL.ClsQC_NoPassProdCheckBill oBill = new DAL.ClsQC_NoPassProdCheckBill(); List<Model.ClsQC_NoPassProdCheckBillMain> lsmain = new List<Model.ClsQC_NoPassProdCheckBillMain>(); msg2 = msg2.Replace("\\", ""); msg2 = msg2.Replace("\n", ""); //\n lsmain = oListModels.getObjectByJson_NoPassProdCheckMain(msg2); foreach (Model.ClsQC_NoPassProdCheckBillMain oItem in lsmain) { //oItem.HMaker = ""; UserName=oItem.HMaker; oItem.HMakeDate = DBUtility.ClsPub.isStrNull(DateTime.Now.ToString("yyyy-MM-dd")); oItem.HYear = DBUtility.ClsPub.isLong(DateTime.Now.Year); //oItem.HDate = DBUtility.ClsPub.isDate(DateTime.Now.ToString("yyyy-MM-dd")); //oItem.HCurID = 1; //oItem.HExRate = 1; oItem.HMainSourceInterID = oItem.HInterID; oItem.HInterID = 0; //oItem.HInterID = DBUtility.ClsPub.CreateBillID_SRMProd("1103", ref DBUtility.ClsPub.sExeReturnInfo); if (DBUtility.ClsPub.isStrNull(oItem.HDate)=="") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！没有danju日期，无法保存！"; objJsonResult.data = 1; return objJsonResult; } oBill.omodel = oItem; } //表体数据 //按 },{来拆分数组 //去掉【和】 msg3 = msg3.Substring(1, msg3.Length - 2); msg3 = msg3.Replace("\\", ""); msg3 = msg3.Replace("\n", ""); //\n //msg2 = msg2.Replace("'", "’"); List<Model.ClsQC_NoPassProdCheckBillSub> ls = new List<Model.ClsQC_NoPassProdCheckBillSub>(); ls = oListModels.getObjectByJson_NoPassProdCheckSub(msg3); int i = 0; foreach (Model.ClsQC_NoPassProdCheckBillSub oItemSub in ls) { i++; if (oItemSub.HBadQty<=0) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！第" + i.ToString() + "行不良评审数量不大于0无法保存！"; objJsonResult.data = 1; return objJsonResult; } if ((double)oItemSub.HBadQty >oBill.omodel.HPlanQty ) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！第" + i.ToString() + "行数量不能大于不良数量！"; objJsonResult.data = 1; return objJsonResult; } if (DBUtility.ClsPub.isStrNull(oItemSub.HWasterReasonName)=="") { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！第" + i.ToString() + "行未填写不良原因！"; objJsonResult.data = 1; return objJsonResult; } oItemSub.HEntryID = i; oItemSub.HEntryCloseDate = DBUtility.ClsPub.isDate(DateTime.Now); oItemSub.HRemark = ""; oItemSub.HCloseMan = ""; oItemSub.HCloseType = false; oBill.DetailColl.Add(oItemSub); } //保存前判断(单据号重复，笔录项目) //保存 //保存完毕后处理 bool bResult; if (oBill.omodel.HInterID == 0) { // bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); bResult = oBill.AddBill(ref DBUtility.ClsPub.sExeReturnInfo); } else { bResult = oBill.ModifyBill(oBill.omodel.HInterID, ref DBUtility.ClsPub.sExeReturnInfo); } if (bResult) { objJsonResult.code = "0"; objJsonResult.count = 1; objJsonResult.Message = "保存成功！"; //WebAPIController.Add_Log("送货单下推", UserName, "生成送货单"); objJsonResult.data = 1; return objJsonResult; } else { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！" + DBUtility.ClsPub.sExeReturnInfo; objJsonResult.data = 1; return objJsonResult; } } catch (Exception e) { objJsonResult.code = "0"; objJsonResult.count = 0; objJsonResult.Message = "保存失败！" + e.ToString(); objJsonResult.data = 1; return objJsonResult; } } } } WebAPI/Controllers/WebAPIController.cs
@@ -933,6 +933,130 @@ return objjson; ; } } /// <summary> /// 获取不良原因列表 /// </summary> /// <returns></returns> [Route("Web/GetBadReasonList_Json")] [HttpGet] public object GetBadReasonList_Json(string BadReason) { //sWhere = " Where HStopFlag=0 and HEndFlag=1"; //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); if (BadReason != "") { sWhere = sWhere + " and ( HNumber like '%" + BadReason + "%' or HName like '%" + BadReason + "%' ) "; } try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("Select HItemID,HNumber ,HName from Gy_BadReason where HStopflag=0 Order by HItemID ", "Gy_BadReason"); } else { string sql1 = "Select HItemID,HNumber ,HName from Gy_BadReason where HStopflag=0 and HEndFlag=1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "Gy_BadReason"); } //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo; objjson.data = null; return objjson; } else { objjson.code = "0"; objjson.count = 1; objjson.Message = "获取成功!"; objjson.data = ds.Tables[0]; return objjson; } } catch (Exception ex) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + ex.ToString(); objjson.data = null; return objjson; } } /// <summary> /// 获取工序计划单列表 /// </summary> /// <returns></returns> [Route("Web/GetPlanList_Json")] [HttpGet] public object GetPlanList_Json(string Billno) { //sWhere = " Where HStopFlag=0 and HEndFlag=1"; //sWhere = " Where HStopFlag=0 and HEndFlag=1 and HUSEORGID = " + DBUtility.ClsPub.HORGANIZATIONSID.ToString(); if (Billno != "") { sWhere = sWhere + " and ( 单据号 like '%" + Billno + "%' ) "; } try { SQLHelper.ClsCN oCN = new SQLHelper.ClsCN(); if (sWhere == null || sWhere.Equals("")) { ds = oCN.RunProcReturn("select hmainid,hsubid,单据号,HMaterID,物料代码,物料名称,HCenterID,工作中心,规格型号,计划数量 from h_v_Sc_ProcessPlanList", "h_v_Sc_ProcessPlanList"); } else { string sql1 = "select hmainid,hsubid,单据号,HMaterID,物料代码,物料名称,HCenterID,工作中心,规格型号,计划数量 from h_v_Sc_ProcessPlanList where 1=1 "; string sql = sql1 + sWhere; ds = oCN.RunProcReturn(sql, "h_v_Sc_ProcessPlanList"); } //ds = webserver.GetUnitList(sWhere, ref DBUtility.ClsPub.sErrInfo); if (ds == null || ds.Tables[0].Rows.Count <= 0) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + DBUtility.ClsPub.sErrInfo; objjson.data = null; return objjson; } else { objjson.code = "0"; objjson.count = 1; objjson.Message = "获取成功!"; objjson.data = ds.Tables[0]; return objjson; } } catch (Exception ex) { objjson.code = "0"; objjson.count = 0; objjson.Message = "获取失败" + ex.ToString(); objjson.data = null; return objjson; } } #endregion }
@@ -200,5 +200,29 @@ return list; } /// <summary> /// 处理新增不良评审主表的json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsQC_NoPassProdCheckBillMain> getObjectByJson_NoPassProdCheckMain(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsQC_NoPassProdCheckBillMain> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdCheckBillMain>>(jsonString); return list; } /// <summary> /// 处理新增不良评审子表的json /// </summary> /// <param name="jsonString"></param> /// <returns></returns> public List<Model.ClsQC_NoPassProdCheckBillSub> getObjectByJson_NoPassProdCheckSub(string jsonString) { jsonString = "[" + jsonString.ToString() + "]"; List<Model.ClsQC_NoPassProdCheckBillSub> list = Newtonsoft.Json.JsonConvert.DeserializeObject<List<Model.ClsQC_NoPassProdCheckBillSub>>(jsonString); return list; } } } WebAPI/Properties/PublishProfiles/API.pubxml.user
@@ -164,10 +164,10 @@ <publishTime>11/24/2014 11:18:48</publishTime> </File> <File Include="bin/WebAPI.dll"> <publishTime>04/16/2021 08:47:47</publishTime> <publishTime>04/15/2021 21:07:29</publishTime> </File> <File Include="bin/WebAPI.pdb"> <publishTime>04/16/2021 08:47:47</publishTime> <publishTime>04/15/2021 21:07:29</publishTime> </File> <File Include="bin/WebAPI.XmlSerializers.dll"> <publishTime>02/04/2021 21:35:21</publishTime> @@ -341,7 +341,7 @@ <publishTime>04/13/2021 10:11:34</publishTime> </File> <File Include="Web.config"> <publishTime>04/16/2021 08:50:36</publishTime> <publishTime>04/15/2021 21:08:50</publishTime> </File> </ItemGroup> </Project>
