From 7ff74f599084561338eef1230db5aa45f74565f8 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 15 四月 2024 18:03:33 +0800
Subject: [PATCH] 1.ERP订单关闭增加单据id 2.MES工单关闭增加源单id关联
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 306 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 290 insertions(+), 16 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 84c4f34..9987b9a 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -1,4 +1,5 @@
锘縰sing Microsoft.AspNetCore.Mvc;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
@@ -7,6 +8,9 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.ErpOrder;
+using VueWebCoreApi.Models.ReportVerify;
+using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
using VueWebCoreApi.Tools;
@@ -20,13 +24,14 @@
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
ToMessage mes = new ToMessage();
- RedisHelper redis = new RedisHelper();
+ RedisCommon redis = new RedisCommon();
#region[ERP璁㈠崟鏌ヨ]
/// <summary>
/// ERP璁㈠崟鏌ヨ
/// </summary>
/// <param name="erporderstus">璁㈠崟鐘舵�佺爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="erpordercode">璁㈠崟缂栧彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
@@ -42,7 +47,7 @@
/// <returns></returns>
[Route(template: "ErpOrderSearch")]
[HttpGet]
- public JsonResult ErpOrderSearch(string erporderstus = null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public JsonResult ErpOrderSearch(string erporderstus = null,string wkshopcode=null, string erpordercode = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string paystartdate = null, string payenddate = null, string creatuser = 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());
@@ -62,7 +67,7 @@
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.ErpOrderSearch(erporderstus, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
+ mes = WorkOrderBLL.ErpOrderSearch(erporderstus, wkshopcode, erpordercode, saleordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -91,7 +96,20 @@
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
string saleOrderDeliveryDate = obj["saleOrderDeliveryDate"].ToString(); //浜や粯鏃堕棿
- mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate,us);
+ string clerkuser = obj["clerkuser"].ToString(); //閿�鍞鍗曚笟鍔″憳
+ mes = WorkOrderBLL.MarkSaveErpOrder(erporderid, sbid, erpordercode, saleordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, saleOrderDeliveryDate, clerkuser, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[璁㈠崟鎵归噺涓嬭揪]
+ [Route(template: "MarkBatchSaveErpOrder")]
+ [HttpPost]
+ public JsonResult MarkBatchSaveErpOrder(List<ErpOrderBatch> obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MarkBatchSaveErpOrder(obj, us);
return Json(mes);
}
#endregion
@@ -138,6 +156,7 @@
/// MES宸ュ崟鏌ヨ
/// </summary>
/// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -154,13 +173,13 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[HttpGet]
- public JsonResult MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesOrderSearch(int page, int rows, string prop, string order, string mesorderstus = null,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = 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.MesOrderSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -169,6 +188,7 @@
/// <summary>
/// MES鎶ュ簾琛ュ崟宸ュ崟鏌ヨ
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -184,11 +204,11 @@
/// <returns></returns>
[Route(template: "MesBadOrderSearch")]
[HttpGet]
- public JsonResult MesBadOrderSearch(int page, int rows, string prop, string order, string mesordercode = null, string sourceorder = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesBadOrderSearch(int page, int rows, string prop, string order,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
{
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = WorkOrderBLL.MesBadOrderSearch(mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesBadOrderSearch(wkshopcode,mesordercode, sourceorder, saleordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -263,6 +283,24 @@
}
#endregion
+ #region[MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭痌
+ /// <summary>
+ /// MES宸ュ崟鏌ユ壘鍘嗗彶寮曠敤鏈�鏂板伐搴忎俊鎭�
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="partcode">浜у搧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderNewStepContent")]
+ [HttpPost]
+ public JsonResult MesOrderNewStepContent(string wkshopcode, string partcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderNewStepContent(wkshopcode, partcode, us);
+ return Json(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟娲惧彂鎻愪氦]
/// <summary>
@@ -287,6 +325,7 @@
/// MES宸ュ崟鍏抽棴鍒楄〃鏌ヨ
/// </summary>
/// <param name="mesorderstus">宸ュ崟鐘舵��(宸插叧闂�/鏈叧闂�)</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
/// <param name="sourceorder">婧愬崟鍗曞彿</param>
/// <param name="saleordercode">閿�鍞崟鍙�</param>
@@ -303,13 +342,13 @@
/// <returns></returns>
[Route(template: "MesOrderClosedSearch")]
[HttpGet]
- public JsonResult MesOrderClosedSearch(int page, int rows, string prop, string order, string mesorderstus = null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null)
+ public JsonResult MesOrderClosedSearch(int page, int rows, string prop, string order, string mesorderstus = null,string wkshopcode=null, string mesordercode = null, string sourceorder = null, string saleordercode = null, string ordertype = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = 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.MesOrderClosedSearch(mesorderstus, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderClosedSearch(mesorderstus, wkshopcode, mesordercode, sourceorder, saleordercode, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -336,6 +375,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(鑷埗)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -347,13 +387,13 @@
/// <returns></returns>
[Route(template: "MesOrderStepSearch")]
[HttpGet]
- public JsonResult MesOrderStepSearch(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 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(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -362,6 +402,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(澶栧崗)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -373,13 +414,13 @@
/// <returns></returns>
[Route(template: "MesOrderWxStepSearch")]
[HttpGet]
- public JsonResult MesOrderWxStepSearch(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 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(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderWxStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -388,6 +429,7 @@
/// <summary>
/// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)
/// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
/// <param name="wocode">宸ュ崟鍙�</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
@@ -399,13 +441,13 @@
/// <returns></returns>
[Route(template: "MesOrderNgStepSearch")]
[HttpGet]
- public JsonResult MesOrderNgStepSearch(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 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(wocode, partcode, partname, partspec, startNum, endNum, prop, order);
+ mes = WorkOrderBLL.MesOrderNgStepSearch(wkshopcode,wocode, partcode, partname, partspec, startNum, endNum, prop, order);
return Json(mes);
}
#endregion
@@ -445,5 +487,237 @@
return Json(mes);
}
#endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎶ュ伐鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SavaMesOrderStepReport")]
+ [HttpPost]
+ public JsonResult SavaMesOrderStepReport([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string stepprice = obj["stepprice"].ToString(); //宸ュ簭宸ヤ环
+ string eqpcode = obj["eqpcode"].ToString(); //璁惧缂栫爜
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
+ string reckway = obj["reckway"].ToString(); //璁′欢鏂瑰紡(鐝粍:group銆佷釜浜�:person)
+ string usergroupcode = obj["usergroupcode"].ToString(); //鐝粍缂栫爜
+ string reportuser = obj["reportuser"].ToString(); //鎶ュ伐浜哄憳
+ string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
+ string startqty = obj["startqty"].ToString(); //寮�宸ユ暟閲�
+ string reportqty = obj["reportqty"].ToString(); //鎶ュ伐宸ユ暟閲�
+ string defectlist = obj["defectlist"].ToString();//涓嶈壇姹囨��
+ string remarks = obj["remarks"].ToString(); //澶囨敞
+ List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
+ mes = WorkOrderBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, stepprice, eqpcode, inbarcode, reckway, usergroupcode, reportuser, taskqty, startqty, reportqty, defectobjs, remarks, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,鍙戞枡鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,鍙戞枡鎻愪氦
+ /// </summary>
+ /// <param name="obj">鍙戞枡鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SavaMesOrderStepOut")]
+ [HttpPost]
+ public JsonResult SavaMesOrderStepOut([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
+ string outuser = obj["outuser"].ToString(); //鍙戞枡浜哄憳
+ string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
+ string fqty = obj["fqty"].ToString(); //鍙戞枡鏁伴噺
+ mes = WorkOrderBLL.SavaMesOrderStepOut(mesordercode, partcode, stepseq, stepcode, wxcode, outuser, taskqty, fqty, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,鏀舵枡鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,鏀舵枡鎻愪氦
+ /// </summary>
+ /// <param name="obj">鏀舵枡鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "SavaMesOrderStepIn")]
+ [HttpPost]
+ public JsonResult SavaMesOrderStepIn([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
+ string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
+ string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
+ string taskqty = obj["taskqty"].ToString(); //浠诲姟鏁伴噺
+ string sqty = obj["sqty"].ToString(); //鏀舵枡鏁伴噺
+ string defectlist = obj["defectlist"].ToString();//涓嶈壇姹囨��
+ string remarks = obj["remarks"].ToString(); //澶囨敞
+ List<ReportDefectList> defectobjs = JsonConvert.DeserializeObject<List<ReportDefectList>>(defectlist);
+ mes = WorkOrderBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inbarcode, inuser, taskqty, sqty, defectobjs, remarks, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[涓嶈壇澶勭悊,鎻愪氦]
+ /// <summary>
+ /// 涓嶈壇澶勭悊,鎻愪氦
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "EditOrderNgStepSeave")]
+ [HttpPost]
+ public JsonResult EditOrderNgStepSeave(ReportDefectHandle json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.EditOrderNgStepSeave(json, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐璋冩暣鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="reportuser">鎶ュ伐浜哄憳</param>
+ /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <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 reportuser = null, string reportdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ {
+ string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
+ string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportdateopendate = reportdate.Split('~')[0].ToString();
+ reportdateclosedate = reportdate.Split('~')[1].ToString();
+ }
+ int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
+ int endNum = rows * page; //缁撴潫璁板綍 rowNum
+ mes = WorkOrderBLL.MesOrderStepVerifySearch(wkshopcode,wo_code, partnumber, partname, partspec, reportuser, reportdateopendate, reportdateclosedate, startNum, endNum, prop, order);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鑾峰彇閫夊畾鎶ュ伐璁板綍鐨勪笉鑹暟鎹甝
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐璋冩暣鑾峰彇閫夊畾鎶ュ伐璁板綍鐨勪笉鑹暟鎹�
+ /// </summary>
+ /// <param name="wo_code">宸ュ崟鍙�</param>
+ /// <param name="step_code">宸ュ簭鍙�</param>
+ /// <param name="step_type">宸ュ簭绫诲瀷(鑷埗:Z 澶栧崗:W)</param>
+ /// <param name="isbott">鏄惁棣栭亾宸ュ簭</param>
+ /// <param name="isend">鏄惁鏈亾宸ュ簭</param>
+ /// <param name="id">鎶ュ伐涓籭d</param>
+ /// <param name="sbid">鎶ュ伐瀛恑d</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepModelSearch")]
+ [HttpGet]
+ public JsonResult MesOrderStepModelSearch(string wo_code,string step_code,string step_type,string isbott,string isend,string id, string sbid)
+ {
+ mes = WorkOrderBLL.MesOrderStepModelSearch(wo_code, step_code, step_type, isbott, isend,id,sbid);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐璋冩暣鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepUpdateSeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepUpdateSeave(List<UpdateProductReport> json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepUpdateSeave(us, json);
+ return Json(mes);
+ }
+ #endregion
+
+
+
+ #region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鍒楄〃鏁版嵁鏌ヨ鎺ュ彛
+ /// </summary>
+ /// <param name="reviewstatus">瀹℃牳鐘舵��</param>
+ /// <param name="wkshopcode">杞﹂棿缂栫爜</param>
+ /// <param name="wo_code">宸ュ崟缂栧彿</param>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <param name="partname">浜у搧鍚嶇О</param>
+ /// <param name="partspec">浜у搧瑙勬牸</param>
+ /// <param name="stepname">鎶ュ伐宸ュ簭</param>
+ /// <param name="reportuser">鎶ュ伐浜哄憳</param>
+ /// <param name="reportdate">鎶ュ伐鏃堕棿</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯</param>
+ /// <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)
+ {
+ string reportdateopendate = ""; //鎶ュ伐寮�濮嬫椂闂�
+ string reportdateclosedate = ""; //鎶ュ伐缁撴潫鏃堕棿
+ if (reportdate != "" && reportdate != null)
+ {
+ reportdateopendate = reportdate.Split('~')[0].ToString();
+ reportdateclosedate = reportdate.Split('~')[1].ToString();
+ }
+ 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);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐瀹℃牳鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐瀹℃牳鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepReportVerifySeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepReportVerifySeave([FromBody] DataModel json)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepReportVerifySeave(us, json);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3