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.IBLL/IBllQualityServer/IQualityInspectServer.cs | 10 +++
Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs | 25 ++++++++
Wms/Wms/Controllers/BllQualityController.cs | 67 +++++++++++++++-------
Wms/Model/ModelDto/BllQualityDto/QualityInspectDto.cs | 23 +++++++
4 files changed, 103 insertions(+), 22 deletions(-)
diff --git a/Wms/Model/ModelDto/BllQualityDto/QualityInspectDto.cs b/Wms/Model/ModelDto/BllQualityDto/QualityInspectDto.cs
new file mode 100644
index 0000000..47c6bf8
--- /dev/null
+++ b/Wms/Model/ModelDto/BllQualityDto/QualityInspectDto.cs
@@ -0,0 +1,23 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Model.ModelDto.BllQualityDto
+{
+ /// <summary>
+ /// 璐ㄩ噺妫�楠宒to
+ /// </summary>
+ public class QualityInspectDto
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿
+ /// </summary>
+ public List<string> AsnNo { get; set; }
+
+ /// <summary>
+ /// 鐗╂枡缂栫爜
+ /// </summary>
+ public string SkuNo { get; set; }
+
+ }
+}
diff --git a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
index c818606..a389d14 100644
--- a/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
+++ b/Wms/WMS.BLL/BllQualityServer/QualityInspectServer.cs
@@ -1,6 +1,7 @@
锘縰sing System;
using System.Collections.Generic;
using System.Data;
+using System.Linq;
using System.Text;
using System.Threading.Tasks;
using Model.InterFaceModel;
@@ -87,6 +88,30 @@
/// <summary>
+ /// 鑾峰彇闇�瑕佽川妫�鐨勬壒娆″彿
+ /// </summary>
+ /// <param name="pageIndex">椤电爜</param>
+ /// <param name="pageSize">椤靛ぇ灏�</param>
+ /// <returns></returns>
+ public IEnumerable<string> GetInspectLotNoList(int pageIndex, int pageSize)
+ {
+ int index = (pageIndex <= 1) ? 1 : pageIndex;
+ int size = (pageSize <= 100) ? 100 : pageSize;
+
+ string lotnoSql = $@"select LotNo
+ from DataStockDetail
+ where isnull(InspectStatus,'')='0' and isnull(ASNNo,'')!='' and isnull(SkuNo,'')!=''
+ group by LotNo
+ order by LotNo
+ offset {(index - 1) * size} rows fetch next {size} rows only";
+ DataTable lotnoDt = Db.Ado.GetDataTable(lotnoSql);
+
+ var result = lotnoDt.Rows.Cast<DataRow>().Select(e => e["LotNo"] + "");
+ return result;
+ }
+
+
+ /// <summary>
/// 娣诲姞鐗╂枡璐ㄦ淇℃伅
/// </summary>
/// <param name="model">璐ㄦ淇℃伅瀹炰綋妯″瀷</param>
diff --git a/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs b/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
index 2faf7f6..83ea8bd 100644
--- a/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
+++ b/Wms/WMS.IBLL/IBllQualityServer/IQualityInspectServer.cs
@@ -19,6 +19,16 @@
/// <returns></returns>
List<BllQualityInspectDto> GetBllQualityList(BllQualityInspect model);
+
+ /// <summary>
+ /// 鑾峰彇闇�瑕佽川妫�鐨勬壒娆″彿
+ /// </summary>
+ /// <param name="pageIndex">椤电爜</param>
+ /// <param name="pageSize">椤靛ぇ灏�</param>
+ /// <returns></returns>
+ IEnumerable<string> GetInspectLotNoList(int pageIndex, int pageSize);
+
+
/// <summary>
/// 娣诲姞鐗╂枡璐ㄦ淇℃伅
/// </summary>
diff --git a/Wms/Wms/Controllers/BllQualityController.cs b/Wms/Wms/Controllers/BllQualityController.cs
index 61409bf..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,7 +218,7 @@
}
}
-
+
/// <summary>
/// 鍒犻櫎璇烽獙鍗曚俊鎭�
@@ -220,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)
{
@@ -244,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 = "鏈幏鍙栧埌褰撳墠鎿嶄綔浜轰俊鎭�" });
@@ -253,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>
/// 瀹屾垚璇烽獙鍗曟嵁
@@ -283,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