From 36ce82f94805fb73459ac28aaa4ebdb5900c8d65 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 29 八月 2022 17:24:08 +0800
Subject: [PATCH] 修改设备保养项(去除保养周期) 新增设备保养App扫描设备(工位)接口
---
VueWebApi/Controllers/ProductionManagementController.cs | 180 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 157 insertions(+), 23 deletions(-)
diff --git a/VueWebApi/Controllers/ProductionManagementController.cs b/VueWebApi/Controllers/ProductionManagementController.cs
index 9b9be5e..70e08b1 100644
--- a/VueWebApi/Controllers/ProductionManagementController.cs
+++ b/VueWebApi/Controllers/ProductionManagementController.cs
@@ -1,4 +1,5 @@
-锘縰sing Newtonsoft.Json.Linq;
+锘縰sing Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,12 +8,14 @@
using System.Web;
using System.Web.Http;
using VueWebApi.DLL.BLL;
+using VueWebApi.Models;
using VueWebApi.Tools;
namespace VueWebApi.Controllers
{
[RoutePrefix(prefix: "api/ProductionManagement")]
[ControllerGroup("鐢熶骇绠＄悊", "鍦ㄧ嚎鎺ュ彛")]
+ //[ChannelActionFilter]
public class ProductionManagementController : ApiController
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -30,9 +33,9 @@
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
- /// <param name="paydate">浜や粯鏃堕棿</param>
+ /// <param name="paystartdate">棰勮寮�宸ユ椂闂�</param>
+ /// <param name="payenddate">棰勮瀹屽伐鏃堕棿</param>
/// <param name="creatuser">鍒涘缓浜哄憳</param>
- /// <param name="createdate">鍒涘缓鏃堕棿</param>
/// <param name="page">椤电爜</param>
/// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
/// <param name="prop">鎺掑簭瀛楁</param>
@@ -40,25 +43,25 @@
/// <returns></returns>
[Route(template: "ErpOrderSearch")]
[HttpGet]
- public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = null, string partcode = null, string partname = null, string partspec = null, string paydate = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage ErpOrderSearch(string erporderstus = null, string erpordercode = 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)
{
- string paydatestartdate = ""; //浜や粯寮�濮嬫椂闂�
- string paydateenddate = ""; //浜や粯缁撴潫鏃堕棿
- string createstartdate = ""; //鎿嶄綔寮�濮嬫椂闂�
- string createenddate = ""; //鎿嶄綔缁撴潫鏃堕棿
- if (paydate != "" && paydate != null)
+ string paydatestartdate = ""; //棰勮寮�宸ュ紑濮嬫椂闂�
+ string paydateenddate = ""; //棰勮寮�宸ョ粨鏉熸椂闂�
+ string paydatestartdate1 = ""; //棰勮瀹屽伐寮�濮嬫椂闂�
+ string paydateenddate2 = ""; //棰勮瀹屽伐缁撴潫鏃堕棿
+ if (paystartdate != "" && paystartdate != null)
{
- paydatestartdate = paydate.Split('~')[0].ToString();
- paydateenddate = paydate.Split('~')[1].ToString();
+ paydatestartdate = paystartdate.Split('~')[0].ToString();
+ paydateenddate = paystartdate.Split('~')[1].ToString();
}
- if (createdate != "" && createdate != null)
+ if (payenddate != "" && payenddate != null)
{
- createstartdate = createdate.Split('~')[0].ToString();
- createenddate = createdate.Split('~')[1].ToString();
+ paydatestartdate1 = payenddate.Split('~')[0].ToString();
+ paydateenddate2 = payenddate.Split('~')[1].ToString();
}
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
- mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, creatuser, createstartdate, createenddate, endNum, prop, order);
+ mes = ProductionManagementBLL.ErpOrderSearch(erporderstus, erpordercode, partcode, partname, partspec, startNum, paydatestartdate, paydateenddate, paydatestartdate1, paydateenddate2, creatuser, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -73,6 +76,7 @@
[HttpPost]
public HttpResponseMessage MarkSaveErpOrder([FromBody] JObject obj)
{
+ string erporderid = obj["erporderid"].ToString(); //璁㈠崟id
string erpordercode = obj["erpordercode"].ToString(); //璁㈠崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string wkshopcode = obj["wkshopcode"].ToString(); //杞﹂棿缂栫爜
@@ -82,7 +86,7 @@
string ordernum = obj["ordernum"].ToString(); //涓嬪崟鍗曟暟
string relse_qty = obj["relse_qty"].ToString(); //宸蹭笅鍗曟暟閲�
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.MarkSaveErpOrder(erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
+ mes = ProductionManagementBLL.MarkSaveErpOrder(erporderid,erpordercode, partcode, wkshopcode, warehousecode, erpqty, markqty, ordernum, relse_qty, username);
return TJson.toJson(mes);
}
#endregion
@@ -91,15 +95,16 @@
/// <summary>
/// ERP璁㈠崟鍏抽棴
/// </summary>
+ /// <param name="erporderid">璁㈠崟id</param>
/// <param name="erpordercode">璁㈠崟鍙�</param>
/// <returns></returns>
[Route(template: "ClosedErpOrder")]
[HttpPost]
- public HttpResponseMessage ClosedErpOrder(string erpordercode)
+ public HttpResponseMessage ClosedErpOrder(string erporderid, string erpordercode)
{
//var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
var username = "Admin";
- mes = ProductionManagementBLL.ClosedErpOrder(erpordercode, username);
+ mes = ProductionManagementBLL.ClosedErpOrder(erporderid,erpordercode, username);
return TJson.toJson(mes);
}
#endregion
@@ -112,6 +117,8 @@
/// </summary>
/// <param name="mesorderstus">宸ュ崟鐘舵�佺爜</param>
/// <param name="mesordercode">宸ュ崟缂栧彿</param>
+ /// <param name="sourceorder">婧愬崟鍗曞彿</param>
+ /// <param name="ordertype">鍗曟嵁绫诲瀷</param>
/// <param name="partcode">浜у搧缂栫爜</param>
/// <param name="partname">浜у搧鍚嶇О</param>
/// <param name="partspec">浜у搧瑙勬牸</param>
@@ -124,11 +131,11 @@
/// <returns></returns>
[Route(template: "MesOrderSearch")]
[HttpGet]
- public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, int page = 0, int rows = 0, string prop = null, string order = null)
+ public HttpResponseMessage MesOrderSearch(string mesorderstus = null, string mesordercode = null,string sourceorder=null,string ordertype=null, string partcode = null, string partname = null, string partspec = null, string creatuser = null, string createdate = null, 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 = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
+ mes = ProductionManagementBLL.MesOrderSearch(mesorderstus, mesordercode, sourceorder, ordertype, partcode, partname, partspec, startNum, creatuser, createdate, endNum, prop, order);
return TJson.toJson(mes);
}
#endregion
@@ -190,6 +197,8 @@
public HttpResponseMessage AddUpdateMesOrder([FromBody] JObject obj)
{
string mesorderstus = obj["mesorderstus"].ToString(); //宸ュ崟鐘舵�佺爜
+ string sourceorder = obj["sourceorder"].ToString(); //婧愬崟缂栧彿
+ string ordertype = obj["ordertype"].ToString(); //宸ュ崟绫诲瀷
string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string mesqty = obj["mesqty"].ToString(); //宸ュ崟鏁伴噺
@@ -200,7 +209,7 @@
string orderlev = obj["orderlev"].ToString(); //宸ュ崟绛夌骇
string opertype = obj["OperType"].ToString(); //鎿嶄綔绫诲瀷
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
+ mes = ProductionManagementBLL.AddUpdateMesOrder(mesorderstus, sourceorder, ordertype, mesordercode, partcode, mesqty, routecode, wkshopcode, planstartdate, planenddate, orderlev, username, opertype);
return TJson.toJson(mes);
}
#endregion
@@ -293,6 +302,42 @@
int startNum = rows * (page - 1) + 1; //璧峰璁板綍rowNum
int endNum = rows * page; //缁撴潫璁板綍 rowNum
mes = ProductionManagementBLL.MesOrderWxStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇)
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ /// <param name="page">椤电爜</param>
+ /// <param name="rows">姣忛〉鏄剧ず鏉℃暟</param>
+ /// <param name="prop">鎺掑簭瀛楁</param>
+ /// <param name="order">鎺掑簭瑙勫垯(榛樿鎸夌収璁″垝寮�宸ユ椂闂存搴�)</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderNgStepSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderNgStepSearch(string orderstepqrcode = null, 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 = ProductionManagementBLL.MesOrderNgStepSearch(orderstepqrcode, startNum, endNum, prop, order);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇鏄庣粏)]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐鎵爜鑾峰彇宸ュ崟瀵瑰簲宸ュ簭浠诲姟(涓嶈壇鏄庣粏)
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿鐨勪簩缁寸爜淇℃伅</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderNgSubStepSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderNgSubStepSearch(string orderstepqrcode)
+ {
+ mes = ProductionManagementBLL.MesOrderNgSubStepSearch(orderstepqrcode);
return TJson.toJson(mes);
}
#endregion
@@ -448,8 +493,9 @@
string reportqty = obj["reportqty"].ToString(); //鎶ュ伐宸ユ暟閲�
string ngqty = obj["ngqty"].ToString(); //涓嶈壇鏁伴噺
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
+ string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepReport(mesordercode, partcode, stepseq, stepcode, eqpcode, usergroupcode, reportuser, taskqty, startqty, reportqty, ngqty, badcode, remarks, username);
return TJson.toJson(mes);
}
#endregion
@@ -498,8 +544,96 @@
string sqty = obj["sqty"].ToString(); //鏀舵枡鏁伴噺
string ngqty = obj["ngqty"].ToString(); //涓嶈壇鏁伴噺
string badcode = obj["badcode"].ToString(); //涓嶈壇鍘熷洜缂栫爜
+ string remarks = obj["remarks"].ToString(); //澶囨敞
var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
- mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, username);
+ mes = ProductionManagementBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, wxcode, inuser, taskqty, sqty, ngqty, badcode, remarks, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[涓嶈壇澶勭悊,鎻愪氦]
+ /// <summary>
+ /// 涓嶈壇澶勭悊,鎻愪氦
+ /// </summary>
+ /// <param name="username">澶勭悊浜哄憳缂栫爜</param>
+ /// <param name="json">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "EditOrderNgStepSeave")]
+ [HttpPost]
+ public HttpResponseMessage EditOrderNgStepSeave(string username, ReportDefectHandle json)
+ {
+ mes = ProductionManagementBLL.EditOrderNgStepSeave(json, username);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭痌
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾壂鐮佽幏鍙栦换鍔′俊鎭�
+ /// </summary>
+ /// <param name="orderstepqrcode">鎵弿浜岀淮鐮佷俊鎭�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckSearch")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckSearch(string orderstepqrcode)
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckSearch(orderstepqrcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁]
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠岃幏鍙栨楠屾爣鍑嗕笅鎷夋鏁版嵁
+ /// </summary>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckSelect")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckSelect()
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckSelect();
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛╙
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾牴鎹楠屾爣鍑嗚幏鍙栨楠岄」鐩垪琛�
+ /// </summary>
+ /// <param name="checkstandcode">妫�楠屾爣鍑嗙紪鐮�</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepCheckItemList")]
+ [HttpGet]
+ public HttpResponseMessage MesOrderStepCheckItemList(string checkstandcode)
+ {
+ mes = ProductionManagementBLL.MesOrderStepCheckItemList(checkstandcode);
+ return TJson.toJson(mes);
+ }
+ #endregion
+
+ #region[鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛榏
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐,宸ュ簭妫�楠屾彁浜や繚瀛�
+ /// </summary>
+ /// <param name="obj">鎻愪氦淇℃伅</param>
+ /// <returns></returns>
+ [Route(template: "SaveMesOrderStepCheckItem")]
+ [HttpPost]
+ public HttpResponseMessage SaveMesOrderStepCheckItem([FromBody] JObject obj)
+ {
+ string mesordercode = obj["mesordercode"].ToString(); //宸ュ崟缂栧彿
+ string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
+ string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string checkstanedcode = obj["checkstanedcode"].ToString(); //妫�楠屾爣鍑嗙紪鐮�
+ string checkusercode = obj["checkusercode"].ToString(); //妫�楠屼汉鍛樼紪鐮�
+ string checktypecode = obj["checktypecode"].ToString(); //妫�楠岀被鍨嬬紪鐮�
+ string checkresult = obj["checkresult"].ToString(); //妫�楠岀粨鏋�
+ string checkdescr = obj["checkdescr"].ToString(); //妫�楠屾弿杩�
+ string checkqty = obj["checkqty"].ToString(); //妫�楠屾暟閲�
+ string data = obj["data"].ToString();
+ List<StepCheck> json = Newtonsoft.Json.JsonConvert.DeserializeObject<List<StepCheck>>(data);
+ var username = HttpContext.Current.Request.Cookies["admin"].Value.ToString(); //鎿嶄綔浜哄憳
+ mes = ProductionManagementBLL.SaveMesOrderStepCheckItem(mesordercode, partcode, stepcode, checkstanedcode, checkusercode, checktypecode, checkresult, checkdescr, checkqty, username,json);
return TJson.toJson(mes);
}
#endregion
--
Gitblit v1.9.3