From 72d62c3296c968bbca7c610fd6248306fe2b46c2 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期二, 30 八月 2022 17:41:25 +0800
Subject: [PATCH] 外协收料,添加工单号+工序号+外协供方做过滤
---
VueWebApi/Controllers/DeviceManagerController.cs | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/VueWebApi/Controllers/DeviceManagerController.cs b/VueWebApi/Controllers/DeviceManagerController.cs
index db957e1..985c415 100644
--- a/VueWebApi/Controllers/DeviceManagerController.cs
+++ b/VueWebApi/Controllers/DeviceManagerController.cs
@@ -286,7 +286,7 @@
/// <returns></returns>
[Route(template: "DeviceCheckItemSearch")]
[HttpGet]
- public HttpResponseMessage DeviceCheckItemSearch(string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage DeviceCheckItemSearch(int page, int rows, string prop,string order,string checkitemcode = null, string checkitemname = null, string checkdescr = null, string isqrcode = null,string cycle=null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
@@ -343,7 +343,6 @@
/// <param name="maiitemname">淇濆吇閮ㄤ綅鍚嶇О</param>
/// <param name="maidescr">淇濆吇瑕佹眰</param>
/// <param name="isqrcode">閫変腑鎵爜</param>
- /// <param name="cycle">淇濆吇鍛ㄦ湡</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -351,11 +350,11 @@
/// <returns></returns>
[Route(template: "DeviceMaiItemSearch")]
[HttpGet]
- public HttpResponseMessage DeviceMaiItemSearch(string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null, string cycle = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage DeviceMaiItemSearch(int page, int rows, string prop, string order,string maiitemcode = null, string maiitemname = null, string maidescr = null, string isqrcode = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, cycle, startNum, endNum, prop, order);
+ mes = DeviceManagerBLL.DeviceMaiItemSearch(maiitemcode, maiitemname, maidescr, isqrcode, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -374,11 +373,10 @@
string maiitemcode = obj["maiitemcode"].ToString(); //璁惧淇濆吇閮ㄤ綅缂栫爜
string maiitemname = obj["maiitemname"].ToString(); //璁惧淇濆吇閮ㄤ綅鍚嶇О
string maiitemdescr = obj["maiitemdescr"].ToString(); //璁惧淇濆吇閮ㄤ綅瑕佹眰
- string cycle = obj["cycle"].ToString(); //璁惧鐐规閮ㄤ綅鍛ㄦ湡
string isqrcode = obj["isqrcode"].ToString(); //鏄惁鎵爜
var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, cycle, isqrcode, usercode, OperType);
+ mes = DeviceManagerBLL.AddUpdateDeviceMaiItem(maiitemid, maiitemcode, maiitemname, maiitemdescr, isqrcode, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -413,7 +411,7 @@
/// <returns></returns>
[Route(template: "DeviceCheckStandArdSearch")]
[HttpGet]
- public HttpResponseMessage DeviceCheckStandArdSearch(string checkstandcode = null, string checkstandname = null, string checkcontr = null,int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage DeviceCheckStandArdSearch(int page, int rows, string prop, string order,string checkstandcode = null, string checkstandname = null, string checkcontr = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
@@ -531,7 +529,7 @@
/// <returns></returns>
[Route(template: "DeviceRepairStandArdSearch")]
[HttpGet]
- public HttpResponseMessage DeviceRepairStandArdSearch(string repairstandcode = null, string repairstandname = null, string repairstanddescr = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage DeviceRepairStandArdSearch(int page, int rows, string prop, string order,string repairstandcode = null, string repairstandname = null, string repairstanddescr = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
@@ -578,7 +576,7 @@
/// <returns></returns>
[Route(template: "AddUpdateDeviceRepairStandArd")]
[HttpPost]
- public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, RoutEdit json)
+ public HttpResponseMessage AddUpdateDeviceRepairStandArd(string opertype, EqpRepair json)
{
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
mes = DeviceManagerBLL.AddUpdateDeviceRepairStandArd(opertype, json, username);
@@ -633,5 +631,7 @@
}
#endregion
+
+
}
}
--
Gitblit v1.9.3