From 236ce686ed03f6cb786a5acd7492339bc2ea16ad Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 07 二月 2025 11:03:14 +0800
Subject: [PATCH] Merge branch 'zwc'
---
Wms/Wms/Controllers/BllQualityController.cs | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Wms/Wms/Controllers/BllQualityController.cs b/Wms/Wms/Controllers/BllQualityController.cs
index 6176bb4..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
{
@@ -73,7 +74,7 @@
model.CreateUser = int.Parse(userId);
_qualityServer.InsertQuality(model);
- return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅鎿嶄綔鎴愬姛", data = "" });
+ return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅娣诲姞鎴愬姛", data = "" });
}
catch (Exception e)
{
@@ -89,7 +90,7 @@
/// <param name="model">璐ㄦ淇℃伅瀹炰綋妯″瀷</param>
/// <returns></returns>
[HttpPost]
- public IActionResult InsertFuHe(BllQualityInspect model)
+ public IActionResult InsertFuHe(FinshVm model)
{
try
{
@@ -104,8 +105,7 @@
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
- model.CreateUser = int.Parse(userId);
- _qualityServer.InsertQuality(model);
+ _qualityServer.FinshQuality(model.Id,model.UserNo,model.Password, int.Parse(userId));
return Ok(new { code = 0, count = 0, msg = "鐗╂枡璐ㄦ淇℃伅鎿嶄綔鎴愬姛", data = "" });
}
--
Gitblit v1.8.0