From 1a7818203c3fdb4f9878e60e576c76264f6f11fd Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 06 三月 2023 16:34:57 +0800
Subject: [PATCH] 1.节拍工价新增、编辑加工价类型字段区分自制、外协 2.工序编辑，工序类型切换保存时删除对应节拍工价表 3.工单派发时判断区分自制、外协工序 4.计件工资报表增加剔除工序参数
---
VueWebApi/Controllers/BasicSettingController.cs | 33 +++++++++++++++++++++------------
1 files changed, 21 insertions(+), 12 deletions(-)
diff --git a/VueWebApi/Controllers/BasicSettingController.cs b/VueWebApi/Controllers/BasicSettingController.cs
index f3b1f65..3fe5bdc 100644
--- a/VueWebApi/Controllers/BasicSettingController.cs
+++ b/VueWebApi/Controllers/BasicSettingController.cs
@@ -616,15 +616,13 @@
string unitid = obj["id"].ToString(); //寰�鏉ュ崟浣峣d(涓婚敭)
string unitcode = obj["unitcode"].ToString(); //寰�鏉ュ崟浣嶇紪鐮佺紪鐮�
string unitname = obj["unitname"].ToString(); //寰�鏉ュ崟浣嶅悕绉�
- string mtypecode = obj["mtypecode"].ToString(); //澶栬喘渚涙柟缂栫爜
- string btypecode = obj["btypecode"].ToString(); //澶栧崗渚涙柟缂栫爜
- string htypecode = obj["htypecode"].ToString(); //瀹㈡埛缂栫爜
+ string typecode = obj["typecode"].ToString(); //鍗曚綅灞炴�х紪鐮�
string person = obj["person"].ToString(); //鑱旂郴浜�
string contact = obj["contact"].ToString(); //鑱旂郴鏂瑰紡
string description = obj["description"].ToString(); //琛ュ厖鎻忚堪
var usercode = HttpContext.Current.Request.Cookies["admin"].Value.ToString();
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, mtypecode, btypecode,htypecode, person, contact, description, usercode, OperType);
+ mes = BasicSettingBLL.AddUpdateCurrentUnit(unitid, unitcode, unitname, typecode, person, contact, description, usercode, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -649,18 +647,12 @@
/// <summary>
/// 瀹夌伅绯荤粺/鑷畾涔夊畨鐏懠鍙被鍨嬫煡璇�
/// </summary>
- /// <param name="page">椤电爜</param>
- /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
- /// <param name="prop">鎺掑簭瀛楁</param>
- /// <param name="order">鎺掑簭瑙勫垯</param>
/// <returns></returns>
[Route(template: "AnDengTypeSearch")]
[HttpGet]
- public HttpResponseMessage AnDengTypeSearch(int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage AnDengTypeSearch()
{
- int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
- int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = BasicSettingBLL.AnDengTypeSearch(startNum, endNum, prop, order);
+ mes = BasicSettingBLL.AnDengTypeSearch();
return TJson.toJson(mes);
}
#endregion
@@ -780,5 +772,22 @@
return TJson.toJson(mes);
}
#endregion
+
+
+
+ #region[閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅]
+ /// <summary>
+ /// 閫氳繃杞﹂棿缂栫爜鏌ユ壘璁惧淇℃伅
+ /// </summary>
+ /// <param name="wkshpcode">杞﹂棿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "WhkspIsEqpSearch")]
+ [HttpGet]
+ public HttpResponseMessage WhkspIsEqpSearch(string wkshpcode)
+ {
+ mes = BasicSettingBLL.WhkspIsEqpSearch(wkshpcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
}
}
\ No newline at end of file
--
Gitblit v1.9.3