From 6fedaca99e834bfe98c7efb95f8ae41dc0ea6d0f Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期一, 25 九月 2023 19:50:35 +0800
Subject: [PATCH] 1.MES工单打印接口 2.生产开报工,报工接口 3.生产报工发料接口、收料接口、不良处理提交接口
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 105 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 105 insertions(+), 0 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 84c4f34..9d0523c 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;
@@ -445,5 +446,109 @@
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
}
}
--
Gitblit v1.9.3