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/ProductModelController.cs | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/VueWebApi/Controllers/ProductModelController.cs b/VueWebApi/Controllers/ProductModelController.cs
index c9759d5..dfa7877 100644
--- a/VueWebApi/Controllers/ProductModelController.cs
+++ b/VueWebApi/Controllers/ProductModelController.cs
@@ -243,9 +243,13 @@
string materialtypecode = obj["materialtypecode"].ToString(); //鐗╂枡绫诲瀷缂栫爜
string minstockqty = obj["minstockqty"].ToString(); //鏈�灏忓簱瀛�
string maxstockqty = obj["maxstockqty"].ToString(); //鏈�澶у簱瀛�
+ string is_batchno = obj["is_batchno"].ToString(); //鏄惁鎵规绠＄悊
+ string is_fifo = obj["is_fifo"].ToString(); //鏄惁鍏堣繘鍏堝嚭
+ string is_incheck = obj["is_incheck"].ToString(); //鏄惁鍏ュ巶妫�楠�
+ string is_outcheck = obj["is_outcheck"].ToString(); //鏄惁鍑哄巶妫�楠�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
string OperType = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
- mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty, username, OperType);
+ mes = ProductModelBLL.AddUpdateInventoryFile(materialid, materialcode, materialname, materialspec, uomcode, warehousecode, stocktypecode, materialtypecode, minstockqty, maxstockqty,is_batchno,is_fifo,is_incheck,is_outcheck, username, OperType);
return TJson.toJson(mes);
}
#endregion
@@ -717,6 +721,7 @@
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
/// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <param name="steptype">宸ュ簭绫诲瀷</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -724,12 +729,12 @@
/// <returns></returns>
[Route(template: "StepSelectEqpList")]
[HttpGet]
- public HttpResponseMessage StepSelectEqpList(string partcode, string routecode, string stepcode, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage StepSelectEqpList(string partcode, string routecode, string stepcode,string steptype, 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 = ProductModelBLL.StepSelectEqpList(partcode, routecode, stepcode, startNum, endNum, prop, order);
+ mes = ProductModelBLL.StepSelectEqpList(partcode, routecode, stepcode, steptype, startNum, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3