From 26f357e815683a453e84beda235adae31eece223 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期日, 08 十月 2023 17:54:03 +0800
Subject: [PATCH] 1.人员基础资料、班组基础资料接口 2.报工调整查询接口、报工调整获取不良记录接口、报工调整提交接口
---
VueWebCoreApi/Controllers/WorkOrderController.cs | 178 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 178 insertions(+), 0 deletions(-)
diff --git a/VueWebCoreApi/Controllers/WorkOrderController.cs b/VueWebCoreApi/Controllers/WorkOrderController.cs
index 84c4f34..188fe8e 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,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.UpdateReport;
using VueWebCoreApi.Models.WorkData;
using VueWebCoreApi.Tools;
@@ -445,5 +447,181 @@
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="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 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(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
}
}
--
Gitblit v1.9.3