From b022fb899c2ffa56acb998cba475d32dd4f1d27e Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 十二月 2025 16:41:13 +0800
Subject: [PATCH] 1.生产报工增加订单号(自制、外协、不良) 2.报工调整、报工审核增加订单号
---
VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs | 20 +++++-----
VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs | 69 ++++++++++++++++++++++++----------
VueWebCoreApi/Controllers/WorkOrderController.cs | 25 +++++++-----
VueWebCoreApi/Models/WorkData/WorkList.cs | 4 ++
4 files changed, 78 insertions(+), 40 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index c5e967f..c5513d9 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -505,6 +505,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -515,13 +516,13 @@
/// <returns></returns>
[Route(template: "MesOrderStepSearch")]
[HttpGet]
- public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepSearch(string wkshopcode=null, string wocode = null,string orderno = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -532,6 +533,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -542,13 +544,13 @@
/// <returns></returns>
[Route(template: "MesOrderWxStepSearch")]
[HttpGet]
- public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderWxStepSearch(string wkshopcode, string wocode = null, string orderno = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -559,6 +561,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">瑙勬牸鍨嬪彿</param>
@@ -569,13 +572,13 @@
/// <returns></returns>
[Route(template: "MesOrderNgStepSearch")]
[HttpGet]
- public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderNgStepSearch(string wkshopcode=null, string wocode = null, string orderno = null, string partcode = null, string partname = null, string partspec = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -730,6 +733,7 @@
/// </summary>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -743,7 +747,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepcode=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepVerifySearch(string wkshopcode=null, string wo_code = null,string orderno=null, string partnumber = null, string partname = null, string partspec = null,string stepcode=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -754,7 +758,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, orderno, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -823,6 +827,7 @@
/// <param name="reviewstatus">瀹℃牳鐘舵��</param>
/// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="orderno">璁㈠崟鍙�</param>
/// <param name="partnumber">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -836,7 +841,7 @@
/// <returns></returns>
[Route(template: "MesOrderStepReportVerifySearch")]
[HttpGet]
- public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult MesOrderStepReportVerifySearch(string reviewstatus=null, string wkshopcode=null, string wo_code = null,string orderno=null, string partnumber = null, string partname = null, string partspec = null,string stepname=null, string reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
{
string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
@@ -847,7 +852,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, orderno, partnumber, partname, partspec,stepname,reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
diff --git a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
index f9fd312..20ffe7f 100644
--- a/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
+++ b/VueWebCoreApi/DLL/BLL/WorkOrderBLL.cs
@@ -176,23 +176,23 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
- public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode,string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode,string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderWxStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode,string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderNgStepSearch(wkshopcode,wocode, orderno, partcode, partname, partspec, startNum, endNum, prop, order);
}
#endregion
@@ -240,9 +240,9 @@
#region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepVerifySearch(string wkshopcode,string wo_code, string partnumber, string partname, string partspec,string stepcode, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepVerifySearch(string wkshopcode,string wo_code,string orderno, string partnumber, string partname, string partspec,string stepcode, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepVerifySearch(wkshopcode,wo_code, orderno, partnumber, partname, partspec, stepcode, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
}
#endregion
@@ -269,9 +269,9 @@
#region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepReportVerifySearch(string reviewstatus, string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepReportVerifySearch(string reviewstatus, string wkshopcode, string wo_code,string orderno, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
- return WorkOrderDAL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, partnumber, partname, partspec, stepname, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ return WorkOrderDAL.MesOrderStepReportVerifySearch(reviewstatus,wkshopcode, wo_code, orderno, partnumber, partname, partspec, stepname, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
}
#endregion
diff --git a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
index fc7d964..43d8155 100644
--- a/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
+++ b/VueWebCoreApi/DLL/DAL/WorkOrderDAL.cs
@@ -867,7 +867,7 @@
}
if (saleordercode != "" && saleordercode != null)
{
- search += "and W.saleOrderCode like '%'+@saleordercode+'%' ";
+ search += "and A.saleOrderCode like '%'+@saleordercode+'%' ";
dynamicParams.Add("@saleordercode", saleordercode);
}
if (ordertype != "" && ordertype != null)
@@ -930,7 +930,7 @@
// --------------鏌ヨ鎸囧畾鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select A.id, A.status,A.wotype,A.wo_code,A.materiel_code as partcode,B.partname,B.partspec,A.idTopInventory,A.TopInventoryCode,A.TopInventoryName,A.route_code,B.default_route,R.name as route_name,A.plan_qty,A.wkshp_code,C.torg_name as wkshp_name,
- A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,W.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep,A.clerkuser,
+ A.stck_code,D.name as stck_name,A.plan_startdate,A.plan_enddate,A.piroque,A.sourceid,A.m_po,A.saleOrderDeliveryDate,A.saleOrderCode,U.username as lm_user,A.lm_date,A.data_sources,A.isstep,A.clerkuser,
B.priuserdefnvc1,B.priuserdefnvc2,B.priuserdefnvc3,B.priuserdefnvc4,B.priuserdefnvc5,B.priuserdefnvc6,A.printcount
from TK_Wrk_Man A
left join TKimp_Ewo W on A.m_po=W.wo and A.materiel_code=W.materiel_code and A.sbid=W.sbid
@@ -1161,8 +1161,8 @@
if (operType == "Add")
{
//鍐欏叆宸ュ崟琛�
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)
- values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,saleOrderCode,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@saleOrderCode,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";
list.Add(new
{
str = sql,
@@ -1178,6 +1178,7 @@
materiel_code = json.partcode,
route_code = route_code,
sourceid = json.sourceid == "" ? null : json.sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
+ saleOrderCode=json.saleordercode,
m_po = json.sourcewo,
saleOrderDeliveryDate = json.deliverydate,
plan_startdate = json.paystartdate,
@@ -1236,7 +1237,7 @@
{
//淇敼宸ュ崟琛�
sql = @"update TK_Wrk_Man set wotype=@wotype,wkshp_code=@wkshp_code,plan_qty=@plan_qty,lm_user=@lm_user,lm_date=@lm_date,
- materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep
+ materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,saleOrderCode=@saleOrderCode,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep
where wo_code=@wo_code";
list.Add(new
{
@@ -1250,6 +1251,7 @@
materiel_code = json.partcode,
route_code = route_code,
sourceid = json.sourceid == "" ? null : json.sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
+ saleOrderCode = json.saleordercode,
m_po = json.sourcewo,
saleOrderDeliveryDate = json.deliverydate,
plan_startdate = json.paystartdate,
@@ -1459,8 +1461,8 @@
{
route_code = json[i].routecode;
//鍐欏叆宸ュ崟琛�
- sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)
- values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";
+ sql = @"insert into TK_Wrk_Man(wo_code,wotype,status,wkshp_code,plan_qty,lm_user,lm_date,materiel_code,route_code,sourceid,saleOrderCode,m_po,saleOrderDeliveryDate,plan_startdate,plan_enddate,piroque,isaps,data_sources,isstep)
+ values(@wo_code,@wotype,@status,@wkshp_code,@plan_qty,@lm_user,@lm_date,@materiel_code,@route_code,@sourceid,@saleOrderCode,@m_po,@saleOrderDeliveryDate,@plan_startdate,@plan_enddate,@orderlev,@isaps,@data_sources,@isstep)";
list.Add(new
{
str = sql,
@@ -1476,6 +1478,7 @@
materiel_code = json[i].partcode,
route_code = route_code,
sourceid = json[i].sourceid == "" ? null : json[i].sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
+ saleOrderCode=json[i].saleordercode,
m_po = json[i].sourcewo,
saleOrderDeliveryDate = json[i].deliverydate,
plan_startdate = json[i].paystartdate,
@@ -1538,7 +1541,7 @@
route_code = json[i].routecode;
//淇敼宸ュ崟琛�
sql = @"update TK_Wrk_Man set wotype=@wotype,wkshp_code=@wkshp_code,plan_qty=@plan_qty,lm_user=@lm_user,lm_date=@lm_date,
- materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep
+ materiel_code=@materiel_code,route_code=@route_code,sourceid=@sourceid,saleOrderCode=@saleOrderCode,m_po=@m_po,saleOrderDeliveryDate=@saleOrderDeliveryDate,plan_startdate=@plan_startdate,plan_enddate=@plan_enddate,isstep=@isstep
where wo_code=@wo_code";
list.Add(new
{
@@ -1552,6 +1555,7 @@
materiel_code = json[i].partcode,
route_code = route_code,
sourceid = json[i].sourceid == "" ? null : json[i].sourceid, //鏃犳簮鍗曟椂璧嬪�糔ULL
+ saleOrderCode=json[i].saleordercode,
m_po = json[i].sourcewo,
saleOrderDeliveryDate = json[i].deliverydate,
plan_startdate = json[i].paystartdate,
@@ -2196,7 +2200,7 @@
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)]
- public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepSearch(string wkshopcode, string wocode,string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -2255,6 +2259,11 @@
}
}
}
+ if (orderno != "" && orderno != null)
+ {
+ search += "and B.m_po like '%'+@orderno+'%' ";
+ dynamicParams.Add("@orderno", orderno);
+ }
if (partcode != "" && partcode != null)
{
search += "and M.partcode like '%'+@partcode+'%' ";
@@ -2271,7 +2280,7 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
+ sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,B.m_po,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_quantity,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date,
M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
from TK_Wrk_Step A
@@ -2299,7 +2308,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)]
- public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderWxStepSearch(string wkshopcode, string wocode, string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -2358,6 +2367,11 @@
}
}
}
+ if (orderno != "" && orderno != null)
+ {
+ search += "and B.m_po like '%'+@orderno+'%' ";
+ dynamicParams.Add("@orderno", orderno);
+ }
if (partcode != "" && partcode != null)
{
search += "and M.partcode like '%'+@partcode+'%' ";
@@ -2374,7 +2388,7 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
+ sql = @"select A.id,A.status,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,B.m_po,M.partcode,M.partname,M.partspec,A.seq,A.isbott,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_quantity,A.plan_qty,A.good_qty,A.ng_qty,
(select isnull(sum(fqty),0) as fqty from TK_Wrk_OutRecord where wo_code=A.wo_code and step_code=A.step_code and style='F') as fqty,
A.laborbad_qty,A.materielbad_qty,A.plan_startdate,A.plan_enddate,B.lm_date,
@@ -2405,7 +2419,7 @@
#endregion
#region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
- public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderNgStepSearch(string wkshopcode, string wocode, string orderno, string partcode, string partname, string partspec, int startNum, int endNum, string prop, string order)
{
var sql = "";
string search = "";
@@ -2462,6 +2476,11 @@
return mes;
}
}
+ if (orderno != "" && orderno != null)
+ {
+ search += "and B.m_po like '%'+@orderno+'%' ";
+ dynamicParams.Add("@orderno", orderno);
+ }
if (partcode != "" && partcode != null)
{
search += "and M.partcode like '%'+@partcode+'%' ";
@@ -2478,7 +2497,7 @@
dynamicParams.Add("@partspec", partspec);
}
//鏍规嵁鏉′欢鏌ヨ宸ュ崟宸ュ簭浠诲姟(鑷埗宸ュ簭)
- sql = @"select A.id,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,M.partcode,M.partname,M.partspec,A.seq,A.isend,
+ sql = @"select A.id,B.wkshp_code,T.torg_name as wkshp_name,A.wo_code,B.m_po,M.partcode,M.partname,M.partspec,A.seq,A.isend,
S.stepcode,S.stepname,S.descr,A.plan_quantity,A.plan_qty,A.good_qty,A.ng_qty,A.laborbad_qty,A.materielbad_qty,B.lm_date,
M.priuserdefnvc1,M.priuserdefnvc2,M.priuserdefnvc3,M.priuserdefnvc4,M.priuserdefnvc5,M.priuserdefnvc6
from TK_Wrk_Step A
@@ -3398,7 +3417,7 @@
#region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepVerifySearch(string wkshopcode, string wo_code, string partnumber, string partname, string partspec,string stepcode, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepVerifySearch(string wkshopcode, string wo_code,string orderno, string partnumber, string partname, string partspec,string stepcode, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -3413,6 +3432,11 @@
{
search += "and AA.wo_code like '%'+@wo_code+'%' ";
dynamicParams.Add("@wo_code", wo_code);
+ }
+ if (orderno != "" && orderno != null)
+ {
+ search += "and AA.m_po like '%'+@orderno+'%' ";
+ dynamicParams.Add("@orderno", orderno);
}
if (partnumber != "" && partnumber != null)
{
@@ -3455,7 +3479,7 @@
// --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
+ select A.id,B.id as sbid,A.wo_code,M.m_po,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,A.style,k.isbott as first_choke,k.isend as last_choke,A.step_price,B.reckway,B.usergroup_code,G.usergroupname as usergroup_name,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -3474,7 +3498,7 @@
left join TGroup G on G.usergroupcode=B.usergroup_code
where A.style='B' and B.style='B' and M.status<>'CLOSED' and A.verify='N'
union all
- select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
+ select A.id,B.id as sbid,A.wo_code,M.m_po,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,A.style,k.isbott as first_choke,k.isend as last_choke,A.step_price,'person' as reckway,'' as usergroup_code,'' as usergroup_name,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
@@ -4520,7 +4544,7 @@
#region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
- public static ToMessage MesOrderStepReportVerifySearch(string reviewstatus, string wkshopcode, string wo_code, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
+ public static ToMessage MesOrderStepReportVerifySearch(string reviewstatus, string wkshopcode, string wo_code, string orderno, string partnumber, string partname, string partspec, string stepname, string reportuser, string reportdateopendate, string reportdateclosedate, int startNum, int endNum, string prop, string order)
{
var dynamicParams = new DynamicParameters();
string search = "";
@@ -4540,6 +4564,11 @@
{
search += "and AA.wo_code like '%'+@wo_code+'%' ";
dynamicParams.Add("@wo_code", wo_code);
+ }
+ if (orderno != "" && orderno != null)
+ {
+ search += "and AA.m_po like '%'+@orderno+'%' ";
+ dynamicParams.Add("@orderno", orderno);
}
if (partnumber != "" && partnumber != null)
{
@@ -4582,7 +4611,7 @@
// --------------鏌ヨ鎸囧畾鑷埗鎶ュ伐澶栧崗鏀舵枡鏁版嵁--------------
var total = 0; //鎬绘潯鏁�
var sql = @"select * from(
- select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
+ select A.id,B.id as sbid,A.wo_code,M.m_po,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.eqp_code,E.name as eqp_name,
A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,B.reckway,B.usergroup_code,G.usergroupname as usergroup_name,
B.report_person as usercode,
STUFF((SELECT ',' + U.username
@@ -4601,7 +4630,7 @@
left join TGroup G on G.usergroupcode=B.usergroup_code
where A.style='B' and B.style='B' and M.status<>'CLOSED'
union all
- select A.id,B.id as sbid,A.wo_code,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
+ select A.id,B.id as sbid,A.wo_code,M.m_po,A.materiel_code as partnumber,P.partname,P.partspec,K.plan_quantity,K.plan_qty as task_qty,M.wkshp_code,T.torg_name as wkshp_name,A.wx_code as eqp_code,E.name as eqp_name,
A.step_seq,A.step_code,S.stepname,S.flwtype as steptype,k.isbott as first_choke,k.isend as last_choke,A.step_price,'person' as reckway,'' as usergroup_code,'' as usergroup_name,
B.in_person as usercode,
STUFF((SELECT ',' + U.username
diff --git a/VueWebCoreApi/Models/WorkData/WorkList.cs b/VueWebCoreApi/Models/WorkData/WorkList.cs
index 771429c..7f9e97a 100644
--- a/VueWebCoreApi/Models/WorkData/WorkList.cs
+++ b/VueWebCoreApi/Models/WorkData/WorkList.cs
@@ -67,6 +67,10 @@
/// 鏄惁鍏宠仈宸ュ簭
/// </summary>
public string isstep { get; set; }
+ /// <summary>
+ /// 閿�鍞鍗曞彿
+ /// </summary>
+ public string saleordercode { get; set; }
public List<WorkListSub> WorkListSub { get; set; }
}
public class WorkListSub
--
Gitblit v1.9.3