From 478fa37ec863b2f7eb20ce19ad5cce96072bd4f9 Mon Sep 17 00:00:00 2001
From: liuying <1427574514@qq.com>
Date: 周日, 01 12月 2024 17:22:19 +0800
Subject: [PATCH] 标记ng页面
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 39 ++++++++++++++++++++++++++++++++++++++-
1 files changed, 38 insertions(+), 1 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
index 635e74a..ded416f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -8,6 +8,7 @@
using Microsoft.CodeAnalysis.Operations;
using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
using Admin.NET.Application.Service.WmsCommonnQuery.Dto;
+using System.Collections.Generic;
namespace Admin.NET.Application;
/// <summary>
@@ -24,6 +25,7 @@
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
private readonly SqlSugarRepository<Mes_Package_UnLine_Record> _mesPackage_UnLine_RecordRep;
+ private readonly SqlSugarRepository<Mes_Package_LineQueue> _mesPackage_LineQueueRep;
public WmsCommonnQueryService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
, SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
@@ -31,6 +33,7 @@
, SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
, SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
, SqlSugarRepository<Mes_Package_UnLine_Record> mesPackage_UnLine_RecordRep
+ , SqlSugarRepository<Mes_Package_LineQueue> mesPackage_LineQueueRep
)
{
_sysConfigRep = sysConfigRep;
@@ -40,6 +43,7 @@
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
_mesOrderGatherRep = mesOrderGatherRep;
_mesPackage_UnLine_RecordRep = mesPackage_UnLine_RecordRep;
+ _mesPackage_LineQueueRep = mesPackage_LineQueueRep;
}
/// <summary>
@@ -63,6 +67,39 @@
return list; // 缁撴灉
}
+
+
+ /// <summary>
+ /// 鏌ヨ 璁″垝鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級
+ /// </summary>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryPlanOrderList")]
+ [Description("WmsCommonnQuery/QueryPlanOrderList")]
+ public async Task<List<Mes_Order_Gather>> QueryPlanOrderList()
+ {
+ var list = await _mesPackage_LineQueueRep.AsQueryable()
+ .OrderBy(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+ List<Mes_Order_Gather> resultList = new List<Mes_Order_Gather>();
+ foreach (var item in list)
+ {
+ if (resultList.Select(x => x.Info5).ToList().Contains(item.Info5))
+ {
+
+ }
+ else
+ {
+ var mesOrderGather = await _mesOrderGatherRep.GetFirstAsync(x => x.Info5 == item.Info5);
+ if (mesOrderGather != null)
+ {
+ resultList.Add(mesOrderGather);
+ }
+ }
+ }
+
+ return resultList; // 缁撴灉
+ }
/// <summary>
/// 鏌ヨ 鍘嗗彶鐢熶骇璁㈠崟璁板綍 锛堝ぇ灞忎娇鐢級
@@ -101,7 +138,7 @@
public async Task<Mes_Order_Gather> QueryCurrentOrder()
{
//鑾峰彇涓婄彮鏃堕棿銆�
- var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.wms_unline_oper);
+ var sysConfig_wms_wms_unline_oper = await _sysConfigRep.GetFirstAsync(x => x.Code == CommonConst.WmsBZ30_QiTao);
if (sysConfig_wms_wms_unline_oper == null || sysConfig_wms_wms_unline_oper.Value == "鏃�")
{
return null;
--
Gitblit v1.9.3