From c43a4dfbc7a80d6be6e9823cdd0e182898fc2562 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 05 九月 2024 14:06:58 +0800
Subject: [PATCH] 1.生产报工根据工单、工序获取设备/外协供应商信息
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 92 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 90 insertions(+), 2 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 632c879..2843485 100644
--- a/VueWebCoreApi/Controllers/WorkOrderController.cs
+++ b/VueWebCoreApi/Controllers/WorkOrderController.cs
@@ -19,7 +19,7 @@
[ApiExplorerSettings(GroupName = "宸ュ崟绠＄悊")]
[ApiController]
[Route("api/[controller]")]
- //[ChannelActionFilter]
+ [ChannelActionFilter]
public class WorkOrderController : Controller
{
//瀹氫箟鍏ㄥ眬淇℃伅杩斿洖鍙橀噺
@@ -248,6 +248,21 @@
}
#endregion
+ #region[MES宸ュ崟鏂板缂栬緫鏃�,鏍规嵁浜у搧鑾峰彇Bom鐗╂枡娓呭崟]
+ /// <summary>
+ /// MES宸ュ崟鏂板缂栬緫鏃�,鏍规嵁浜у搧鑾峰彇Bom鐗╂枡娓呭崟
+ /// </summary>
+ /// <param name="partnumber">浜у搧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderAddUpdateBomVison")]
+ [HttpGet]
+ public JsonResult MesOrderAddUpdateBomVison(string partnumber)
+ {
+ mes = WorkOrderBLL.MesOrderAddUpdateBomVison(partnumber);
+ return Json(mes);
+ }
+ #endregion
+
#region[MES宸ュ崟鏂板銆佺紪杈戞彁浜
/// <summary>
/// MES宸ュ崟鏂板銆佺紪杈戞彁浜�
@@ -301,6 +316,41 @@
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
mes = WorkOrderBLL.MesOrderNewStepContent(wkshopcode, routecode, partcode, us);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏌ョ湅宸ュ崟SOP]
+ /// <summary>
+ /// MES宸ュ崟鏌ョ湅宸ュ崟SOP
+ /// </summary>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="materielcode">浜у搧缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderSopSearch")]
+ [HttpGet]
+ public JsonResult MesOrderSopSearch(string wocode, string materielcode)
+ {
+ mes = WorkOrderBLL.MesOrderSopSearch(wocode, materielcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[MES宸ュ崟鏌ョ湅宸ヨ壓SOP]
+ /// <summary>
+ /// MES宸ュ崟鏌ョ湅宸ヨ壓SOP
+ /// </summary>
+ /// <param name="materielcode">浜у搧缂栫爜</param>
+ /// <param name="routecode">宸ヨ壓璺嚎缂栫爜</param>
+ /// <param name="stepcode">宸ュ簭缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderProcessSopSearch")]
+ [HttpGet]
+ public JsonResult MesOrderProcessSopSearch(string materielcode,string routecode,string stepcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderProcessSopSearch(materielcode, routecode, stepcode,us);
return Json(mes);
}
#endregion
@@ -494,6 +544,25 @@
}
#endregion
+ #region [鐢熶骇寮�鎶ュ伐锛氭姤宸�/澶栧崗(鍙戞枡/鏀舵枡)鏃惰幏鍙栬澶�/澶栧崗渚涘簲鍟嗘暟鎹繑鍥炴帴鍙
+ /// <summary>
+ /// 鐢熶骇寮�鎶ュ伐锛氭姤宸�/澶栧崗(鍙戞枡/鏀舵枡)鏃惰幏鍙栬澶�/澶栧崗渚涘簲鍟嗘暟鎹繑鍥炴帴鍙�
+ /// </summary>
+ /// <param name="OperType">鎿嶄綔绫诲瀷锛氳嚜鍒�(ZZ)/澶栧崗(WX)</param>
+ /// <param name="wocode">宸ュ崟缂栧彿</param>
+ /// <param name="stepcode">宸ュ簭缂栧彿</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepDeviceCusstomer")]
+ [HttpGet]
+ public JsonResult MesOrderStepDeviceCusstomer(string OperType, string wocode, string stepcode)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepDeviceCusstomer(OperType, wocode, stepcode, us);
+ return Json(mes);
+ }
+ #endregion
+
#region[鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦]
/// <summary>
/// 鐢熶骇寮�鎶ュ伐,鎶ュ伐鎻愪氦
@@ -568,6 +637,7 @@
string partcode = obj["partcode"].ToString(); //浜у搧缂栫爜
string stepseq = obj["stepseq"].ToString(); //宸ュ簭搴忓彿
string stepcode = obj["stepcode"].ToString(); //宸ュ簭缂栫爜
+ string stepprice = obj["stepprice"].ToString(); //宸ュ簭宸ヤ环
string wxcode = obj["wxcode"].ToString(); //澶栧崗渚涘簲鍟嗙紪鐮�
string inbarcode = obj["inbarcode"].ToString(); //鍏ュ簱鏉＄爜
string inuser = obj["inuser"].ToString(); //鏀舵枡浜哄憳
@@ -576,7 +646,7 @@
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);
+ mes = WorkOrderBLL.SavaMesOrderStepIn(mesordercode, partcode, stepseq, stepcode, stepprice, wxcode, inbarcode, inuser, taskqty, sqty, defectobjs, remarks, us);
return Json(mes);
}
#endregion
@@ -725,5 +795,23 @@
return Json(mes);
}
#endregion
+
+ #region[鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦]
+ /// <summary>
+ /// 鐢熶骇鎵ц,鎶ュ伐寮冨鏁版嵁鎻愪氦
+ /// </summary>
+ /// <param name="id">鎶ュ伐璁板綍id</param>
+ /// <param name="steptype">宸ュ簭绫诲瀷</param>
+ /// <returns></returns>
+ [Route(template: "MesOrderStepReportNotVerifySeave")]
+ [HttpPost]
+ public JsonResult MesOrderStepReportNotVerifySeave(string id, string steptype)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ mes = WorkOrderBLL.MesOrderStepReportNotVerifySeave(us, id, steptype);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3