From 37b39b9748eaaa7900271d83a94698299d53fed4 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期三, 18 十月 2023 20:00:52 +0800
Subject: [PATCH] 1.模具扫码入库、出库功能接口 2.模具维修图片上传接口修改
---
VueWebCoreApi/Controllers/MouldManagerController.cs | 119 ++++++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 97 insertions(+), 22 deletions(-)
diff --git a/VueWebCoreApi/Controllers/MouldManagerController.cs b/VueWebCoreApi/Controllers/MouldManagerController.cs
index d31c025..e1428fe 100644
--- a/VueWebCoreApi/Controllers/MouldManagerController.cs
+++ b/VueWebCoreApi/Controllers/MouldManagerController.cs
@@ -7,6 +7,7 @@
using System.Threading.Tasks;
using VueWebCoreApi.DLL.BLL;
using VueWebCoreApi.Models;
+using VueWebCoreApi.Models.MouldVerify;
using VueWebCoreApi.Tools;
namespace VueWebCoreApi.Controllers
@@ -70,13 +71,12 @@
string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
string mouldname = obj["mouldname"].ToString(); //妯″叿鍚嶇О
string mouldspec = obj["mouldspec"].ToString(); //妯″叿瑙勬牸
- string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
string surplife = obj["surplife"].ToString(); //棰勮瀵垮懡
string resilife = obj["resilife"].ToString(); //鍓╀綑瀵垮懡
string status = obj["status"].ToString(); //妯″叿鐘舵��
string mouldpart = obj["mouldpart"].ToString(); //鍏宠仈浜у搧
string opertype = obj["opertype"].ToString(); //鎿嶄綔绫诲瀷
- mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, warehousecode, surplife, resilife, status, mouldpart, opertype, us);
+ mes = MouldManagerBLL.AddUpdateMouldManger(mouldcode, mouldname, mouldspec, surplife, resilife, status, mouldpart, opertype, us);
return Json(mes);
}
#endregion
@@ -584,22 +584,24 @@
}
#endregion
- #region[璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨]
+ #region[妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨]
/// <summary>
- /// 璁惧缁翠慨鐢宠,鎻愪氦淇濆瓨
+ /// 妯″叿缁翠慨鐢宠,鎻愪氦淇濆瓨
/// </summary>
+ /// <param name="menucode">鍔熻兘缂栧彿</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="faultsourcecode">鏁呴殰鏉ユ簮</param>
+ /// <param name="faultdescr">鏁呴殰鎻忚堪</param>
/// <returns></returns>
[Route(template: "MaintainScanMouldApplySave")]
[HttpPost]
- public JsonResult MaintainScanMouldApplySave([FromBody] JObject obj, List<IFormFile> files)
+ public JsonResult MaintainScanMouldApplySave([FromForm] string menucode, [FromForm] string mouldcode,[FromForm] string faultsourcecode,[FromForm] string faultdescr)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- string menucode = obj["menucode"].ToString(); //鍔熻兘缂栫爜
- string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
- string faultsourcecode = obj["faultsourcecode"].ToString(); //鏁呴殰鏉ユ簮缂栫爜
- string faultdescr = obj["faultdescr"].ToString(); //鏁呴殰鎻忚堪
- mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode,mouldcode, faultsourcecode, faultdescr,us, files);
+ var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
+ mes = MouldManagerBLL.MaintainScanMouldApplySave(menucode, mouldcode, faultsourcecode, faultdescr, us, files);
+ mes.Message = menucode;
return Json(mes);
}
#endregion
@@ -624,20 +626,21 @@
/// <summary>
/// 妯″叿缁翠慨鎻愪氦
/// </summary>
+ /// <param name="menucode">鍔熻兘缂栧彿</param>
+ /// <param name="docu_code">缁翠慨鐢宠鍗曞彿</param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <param name="faultdescr">鏁呴殰鎻忚堪</param>
+ /// <param name="is_stoprepair">涓嬫満缁翠慨</param>
+ /// <param name="repaircontent">缁翠慨鍐呭</param>
/// <returns></returns>
[Route(template: "RepairScanMouldSave")]
[HttpPost]
- public JsonResult RepairScanMouldSave([FromBody] JObject obj, List<IFormFile> files)
+ public JsonResult RepairScanMouldSave([FromForm] string menucode, [FromForm] string docu_code, [FromForm] string mouldcode, [FromForm] string faultdescr, [FromForm] string is_stoprepair,[FromForm] string repaircontent)
{
var token = HttpContext.Request.Headers["Token"].ToString();
User us = JwtTools.Denocode(token.ToString());
- string menucode = obj["menucode"].ToString(); //鍔熻兘缂栧彿
- string docu_code = obj["docu_code"].ToString(); //缁翠慨鐢宠鍗曞彿
- string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
- string faultdescr = obj["faultdescr"].ToString(); //鏁呴殰鎻忚堪
- string is_stoprepair = obj["is_stoprepair"].ToString(); //涓嬫満缁翠慨
- string repaircontent = obj["repaircontent"].ToString(); //缁翠慨鍐呭
- mes = MouldManagerBLL.RepairScanMouldSave(menucode,docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent,us, files);
+ var files = Request.Form.Files; // 鑾峰彇浼犺緭鐨勬枃浠跺垪琛�
+ mes = MouldManagerBLL.RepairScanMouldSave(menucode, docu_code, mouldcode, faultdescr, is_stoprepair, repaircontent, us, files);
return Json(mes);
}
#endregion
@@ -700,7 +703,7 @@
/// <summary>
/// 妯″叿涓婃満,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldUpQrCodeData")]
[HttpGet]
@@ -736,7 +739,7 @@
/// <summary>
/// 妯″叿涓嬫満,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldDownQrCodeData")]
[HttpGet]
@@ -773,7 +776,7 @@
/// <summary>
/// 妯″叿澶栧��,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldLendOutQrCodeData")]
[HttpGet]
@@ -808,7 +811,7 @@
/// <summary>
/// 妯″叿褰掕繕,鎵弿妯″叿缂栫爜
/// </summary>
- /// <param name="mouldcode"></param>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
/// <returns></returns>
[Route(template: "MouldReturnQrCodeData")]
[HttpGet]
@@ -837,5 +840,77 @@
return Json(mes);
}
#endregion
+
+
+ #region[妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿鍏ュ簱,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MouldInWareHouseQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldInWareHouseQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldInWareHouseQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍏ュ簱鎻愪氦]
+ /// <summary>
+ /// 妯″叿鍏ュ簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldInWareHouseSave")]
+ [HttpPost]
+ public JsonResult MouldInWareHouseSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string description = obj["description"].ToString(); //鍏ュ簱鎻忚堪
+ mes = MouldManagerBLL.MouldInWareHouseSave(mouldcode, warehousecode,description, us);
+ return Json(mes);
+ }
+ #endregion
+
+
+ #region[妯″叿鍑哄簱,鎵弿妯″叿缂栫爜]
+ /// <summary>
+ /// 妯″叿鍑哄簱,鎵弿妯″叿缂栫爜
+ /// </summary>
+ /// <param name="mouldcode">妯″叿缂栫爜</param>
+ /// <returns></returns>
+ [Route(template: "MouldOutWareHouseQrCodeData")]
+ [HttpGet]
+ public JsonResult MouldOutWareHouseQrCodeData(string mouldcode)
+ {
+ mes = MouldManagerBLL.MouldOutWareHouseQrCodeData(mouldcode);
+ return Json(mes);
+ }
+ #endregion
+
+ #region[妯″叿鍑哄簱鎻愪氦]
+ /// <summary>
+ /// 妯″叿鍑哄簱鎻愪氦
+ /// </summary>
+ /// <param name="obj">鎻愪氦鏁版嵁</param>
+ /// <returns></returns>
+ [Route(template: "MouldOutWareHouseSave")]
+ [HttpPost]
+ public JsonResult MouldOutWareHouseSave([FromBody] JObject obj)
+ {
+ var token = HttpContext.Request.Headers["Token"].ToString();
+ User us = JwtTools.Denocode(token.ToString());
+ string mouldcode = obj["mouldcode"].ToString(); //妯″叿缂栫爜
+ string warehousecode = obj["warehousecode"].ToString(); //浠撳簱缂栫爜
+ string description = obj["description"].ToString(); //鍑哄簱鎻忚堪
+ mes = MouldManagerBLL.MouldOutWareHouseSave(mouldcode, warehousecode, description, us);
+ return Json(mes);
+ }
+ #endregion
}
}
--
Gitblit v1.9.3