From f3bdc703bebd49d6149c5fd053cd8f57d50efc44 Mon Sep 17 00:00:00 2001
From: admin <qiutairan163@163.com>
Date: 星期三, 03 十二月 2025 17:04:58 +0800
Subject: [PATCH] 开发获取需要质检的批次号GetInspectLotNoList接口
---
Wms/Wms/Controllers/BllQualityController.cs | 96 ++++++++++++++++++++++--------------------------
1 files changed, 44 insertions(+), 52 deletions(-)
diff --git a/Wms/Wms/Controllers/BllQualityController.cs b/Wms/Wms/Controllers/BllQualityController.cs
index fffe319..2673376 100644
--- a/Wms/Wms/Controllers/BllQualityController.cs
+++ b/Wms/Wms/Controllers/BllQualityController.cs
@@ -1,18 +1,19 @@
锘縰sing Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
-using System.Security.Claims;
+using Microsoft.Extensions.Options;
+using Model.ModelVm;
+using Model.ModelVm.BllQualityVm;
using System;
+using System.Collections.Generic;
+using System.Drawing.Printing;
+using System.IO;
+using System.Linq;
+using System.Security.Claims;
+using System.Threading.Tasks;
+using Wms.Tools;
using WMS.Entity.BllQualityEntity;
using WMS.IBLL.IBllQualityServer;
-using Model.ModelVm.BllQualityVm;
-using Model.ModelVm;
-using Wms.Tools;
-using Microsoft.Extensions.Options;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading.Tasks;
-using System.Linq;
namespace Wms.Controllers
@@ -31,7 +32,7 @@
/// 鏋勯�犲嚱鏁�
/// </summary>
/// <param name="qualityServer">璐ㄦ淇℃伅</param>
- public BllQualityController(IQualityInspectServer qualityServer,IInspectionRequest inspectionRequestServer, IOptions<ApiUrlConfig> setting)
+ public BllQualityController(IQualityInspectServer qualityServer, IInspectionRequest inspectionRequestServer, IOptions<ApiUrlConfig> setting)
{
_qualityServer = qualityServer;
_inspectionRequestServer = inspectionRequestServer;
@@ -54,6 +55,28 @@
var bolls = _qualityServer.GetBllQualityList(model);
return Ok(new { code = 0, msg = "璐ㄦ淇℃伅", data = bolls });
+ }
+ catch (Exception e)
+ {
+ return Ok(new { code = 1, msg = e.Message });
+ }
+ }
+
+
+ /// <summary>
+ /// 鑾峰彇闇�瑕佽川妫�鐨勬壒娆″彿
+ /// </summary>
+ /// <param name="pageIndex">椤电爜</param>
+ /// <param name="pageSize">椤靛ぇ灏�</param>
+ /// <returns></returns>
+ [HttpGet]
+ public IActionResult GetInspectLotNoList(int pageIndex, int pageSize)
+ {
+ try
+ {
+ var data = _qualityServer.GetInspectLotNoList(pageIndex, pageSize);
+
+ return Ok(new { code = 0, msg = "闇�瑕佽川妫�鐨勬壒娆″彿", data = data });
}
catch (Exception e)
{
@@ -104,7 +127,7 @@
/// <param name="model">鏌ヨ鏉′欢</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetInspectionRequest(BllQualityInspectionRequestVm model)
+ public IActionResult GetInspectionRequest(BllQualityInspectionRequestVm model)
{
try
{
@@ -124,7 +147,7 @@
/// <param name="model">鏌ヨ鏉′欢</param>
/// <returns></returns>
[HttpPost]
- public IActionResult GetSamplingDetails(BllSamplingDetailsVm model)
+ public IActionResult GetSamplingDetails(BllSamplingDetailsVm model)
{
try
{
@@ -144,7 +167,7 @@
/// <param name="model">涓婚敭ID</param>
/// <returns></returns>
[HttpPost]
- public IActionResult DelSamplingDetails(IdVm model)
+ public IActionResult DelSamplingDetails(IdVm model)
{
try
{
@@ -161,7 +184,7 @@
var models = _inspectionRequestServer.DelSamplingDetails(model, int.Parse(userId));
- return Ok(new { code = 0, count=0, msg = "鍒犻櫎鍙栨牱璁板綍鎴愬姛", data = models });
+ return Ok(new { code = 0, count = 0, msg = "鍒犻櫎鍙栨牱璁板綍鎴愬姛", data = models });
}
catch (Exception e)
{
@@ -170,7 +193,7 @@
}
[HttpPost]
- public IActionResult upLoadRequest(IdVm model)
+ public IActionResult upLoadRequest(IdVm model)
{
try
{
@@ -187,7 +210,7 @@
var userName = claimsIdentity.FindFirst(ClaimTypes.NameIdentifier)?.Value;
- return Ok(new { code = 0, count = 0, msg = "涓婁紶鍥剧墖鎴愬姛!"});
+ return Ok(new { code = 0, count = 0, msg = "涓婁紶鍥剧墖鎴愬姛!" });
}
catch (Exception e)
{
@@ -195,38 +218,7 @@
}
}
- /// <summary>
- /// 鍙戦�佽楠屽崟鎹�
- /// </summary>
- /// <param name="model">涓婚敭ID</param>
- /// <returns></returns>
- [HttpPost]
- public IActionResult SendInspectionRequest(IdVm model)
- {
- try
- {
- 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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
- }
- var userName = claimsIdentity.FindFirst(ClaimTypes.NameIdentifier)?.Value;
- string url = _config.WcsHost + _config.IssueComApiUrl;
- var models = _inspectionRequestServer.SendInspectionRequest(model, int.Parse(userId),url,userName);
-
- return Ok(new { code = 0, count=0, msg = "鍚慙imes璇烽獙鎴愬姛!", data = models });
- }
- catch (Exception e)
- {
- return Ok(new { code = 1, msg = e.Message });
- }
- }
/// <summary>
/// 鍒犻櫎璇烽獙鍗曚俊鎭�
@@ -251,7 +243,7 @@
var models = _inspectionRequestServer.DelInspectionRequest(model, int.Parse(userId));
- return Ok(new { code = 0, count=0, msg = "鍒犻櫎璇烽獙鍗曚俊鎭垚鍔�", data = models });
+ return Ok(new { code = 0, count = 0, msg = "鍒犻櫎璇烽獙鍗曚俊鎭垚鍔�", data = models });
}
catch (Exception e)
{
@@ -275,7 +267,7 @@
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
}
var userId = claimsIdentity.FindFirst(ClaimTypes.Name)?.Value;
-
+
if (string.IsNullOrWhiteSpace(userId))
{
return Ok(new { code = 1, msg = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
@@ -284,13 +276,13 @@
string url = _config.WcsHost + _config.IssueComApiUrl;
var models = _inspectionRequestServer.OutWhInspectionRequest(model, int.Parse(userId), url);
- return Ok(new { code = 0, count=0, msg = "鍙栨牱鍑哄簱鎿嶄綔鎴愬姛!", data = models });
+ return Ok(new { code = 0, count = 0, msg = "鍙栨牱鍑哄簱鎿嶄綔鎴愬姛!", data = models });
}
catch (Exception e)
{
return Ok(new { code = 1, msg = e.Message });
}
- }
+ }
/// <summary>
/// 瀹屾垚璇烽獙鍗曟嵁
@@ -314,7 +306,7 @@
}
string url = _config.WcsHost + _config.IssueComApiUrl;
- var models = _inspectionRequestServer.ClossInspectionRequest(model, int.Parse(userId),url);
+ var models = _inspectionRequestServer.ClossInspectionRequest(model, int.Parse(userId), url);
return Ok(new { code = 0, msg = "瀹屾垚璇烽獙鍗�", data = models });
}
--
Gitblit v1.8.0