FEDApi.git - Gitblit

			@@ -117,6 +117,8 @@
			/// </summary>
			/// <param name="mesorderstus">工单状态码</param>
			/// <param name="mesordercode">工单编号</param>
			/// <param name="sourceorder">源单单号</param>
			/// <param name="ordertype">单据类型</param>
			/// <param name="partcode">产品编码</param>
			/// <param name="partname">产品名称</param>
			/// <param name="partspec">产品规格</param>
			@@ -129,11 +131,11 @@
			/// <returns></returns>
			[Route(template: "MesOrderSearch")]
			[HttpGet]
			public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
			public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null,string sourceorder=null,string ordertype=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
			{
			int startNum = rows * (page - 1) + 1; //起始记录rowNum
			int endNum = rows * page; //结束记录 rowNum
			mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
			mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -195,6 +197,8 @@
			public HttpResponseMessage AddUpdateMesOrder([FromBody] JObject obj)
			{
			string mesorderstus = obj["mesorderstus"].ToString(); //工单状态码
			string sourceorder = obj["sourceorder"].ToString(); //源单编号
			string ordertype = obj["ordertype"].ToString(); //工单类型
			string mesordercode = obj["mesordercode"].ToString(); //工单编号
			string partcode = obj["partcode"].ToString(); //产品编码
			string mesqty = obj["mesqty"].ToString(); //工单数量
			@@ -205,7 +209,7 @@
			string orderlev = obj["orderlev"].ToString(); //工单等级
			string opertype = obj["OperType"].ToString(); //操作类型
			var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
			mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
			mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -489,8 +493,9 @@
			string reportqty = obj["reportqty"].ToString(); //报工工数量
			string ngqty = obj["ngqty"].ToString(); //不良数量
			string badcode = obj["badcode"].ToString(); //不良原因编码
			string remarks = obj["remarks"].ToString(); //备注
			var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
			mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, username);
			mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -539,8 +544,9 @@
			string sqty = obj["sqty"].ToString(); //收料数量
			string ngqty = obj["ngqty"].ToString(); //不良数量
			string badcode = obj["badcode"].ToString(); //不良原因编码
			string remarks = obj["remarks"].ToString(); //备注
			var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
			mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, username);
			mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
			return TJson.toJson(mes);
			}
			#endregion
			@@ -549,13 +555,13 @@
			/// <summary>
			/// 不良处理,提交
			/// </summary>
			/// <param name="username">处理人员编码</param>
			/// <param name="json">提交数据</param>
			/// <returns></returns>
			[Route(template: "EditOrderNgStepSeave")]
			[HttpPost]
			public HttpResponseMessage EditOrderNgStepSeave(ReportDefectHandle json)
			public HttpResponseMessage EditOrderNgStepSeave(string username, ReportDefectHandle json)
			{
			var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
			mes = ProductionManagementBLL.EditOrderNgStepSeave(json, username);
			return TJson.toJson(mes);
			}
			@@ -623,10 +629,11 @@
			string checktypecode = obj["checktypecode"].ToString(); //检验类型编码
			string checkresult = obj["checkresult"].ToString(); //检验结果
			string checkdescr = obj["checkdescr"].ToString(); //检验描述
			string checkqty = obj["checkqty"].ToString(); //检验数量
			string data = obj["data"].ToString();
			List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
			var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //操作人员
			mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, username,json);
			mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username,json);
			return TJson.toJson(mes);
			}
			#endregion