From f2bc08e28dda7022202f07217f6a3c150f818af7 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期一, 20 一月 2025 08:32:16 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/liudongl/jc24-wms
---
Wms/Wms/Controllers/BllQualityController.cs | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/Wms/Wms/Controllers/BllQualityController.cs b/Wms/Wms/Controllers/BllQualityController.cs
index 25b529b..757407f 100644
--- a/Wms/Wms/Controllers/BllQualityController.cs
+++ b/Wms/Wms/Controllers/BllQualityController.cs
@@ -5,6 +5,7 @@
using System;
using WMS.Entity.BllQualityEntity;
using WMS.IBLL.IBllQualityServer;
+using Model.ModelVm;
namespace Wms.Controllers
{
@@ -40,7 +41,7 @@
{
var bolls = _qualityServer.GetBllQualityList(model);
- return Ok(new { code = 0, msg = "璐ㄦ淇℃伅", data = bolls });
+ return Ok(new { code = 0,count = bolls.Count, msg = "璐ㄦ淇℃伅", data = bolls });
}
catch (Exception e)
{
@@ -73,6 +74,39 @@
model.CreateUser = int.Parse(userId);
_qualityServer.InsertQuality(model);
+ return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅娣诲姞鎴愬姛", data = "" });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
+
+ /// <summary>
+ /// 娣诲姞澶嶆牳淇℃伅
+ /// </summary>
+ /// <param name="model">璐ㄦ淇℃伅瀹炰綋妯″瀷</param>
+ /// <returns></returns>
+ [HttpPost]
+ public IActionResult InsertFuHe(FinshVm model)
+ {
+ try
+ {
+ //鑾峰彇褰撳墠鐧诲綍鐨勭敤鎴稩D
+ var claimsIdentity = this.User.Identity as ClaimsIdentity;
+ if (claimsIdentity == null)
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
+ if (string.IsNullOrWhiteSpace(userId))
+ {
+ return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
+ }
+ _qualityServer.FinshQuality(model.Id,model.UserNo,model.Password, int.Parse(userId));
+
return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅鎿嶄綔鎴愬姛", data = "" });
}
catch (Exception e)
@@ -81,6 +115,7 @@
}
}
+
#endregion
}
}
--
Gitblit v1.8.0