From 1b6830d5f8671e48bdc13d7155b848aa938283f5 Mon Sep 17 00:00:00 2001
From: zongzhibin <zongzhibin@weben-smart.com>
Date: 周五, 29 11月 2024 15:53:16 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs | 29 ++++++++++++++++++++++++++++-
1 files changed, 28 insertions(+), 1 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
index dc62396..6ce3158 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsTask/WmsOperationTaskService.cs
@@ -6,6 +6,7 @@
using System.Text;
using DocumentFormat.OpenXml.Office.CustomUI;
using Microsoft.CodeAnalysis.Operations;
+using Admin.NET.Application.Service.WmsTask.WmsRbLineTask.Dto;
namespace Admin.NET.Application;
/// <summary>
@@ -19,10 +20,13 @@
private readonly SqlSugarRepository<Mes_Package_Gather> _mesPackageGatherRep;
private readonly SqlSugarRepository<SysConfig> _sysConfigRep;
private readonly SqlSugarRepository<Mes_BatchOrderUPI_New> _mesBatchOrderUpiRep;
+ private readonly SqlSugarRepository<Mes_Order_Gather> _mesOrderGatherRep;
+
public WmsOperationTaskService(SqlSugarRepository<WmsRbLineTask> rep, SqlSugarRepository<WmsStockQuan> wmsStockQuanRep
, SqlSugarRepository<Mes_Package_Gather> mesPackageGatherRep
, SqlSugarRepository<SysConfig> sysConfigRep
, SqlSugarRepository<Mes_BatchOrderUPI_New> mesBatchOrderUpiRep
+ , SqlSugarRepository<Mes_Order_Gather> mesOrderGatherRep
)
{
_sysConfigRep = sysConfigRep;
@@ -30,6 +34,7 @@
_rep = rep;
_wmsStockQuanRep = wmsStockQuanRep;
_mesBatchOrderUpiRep = mesBatchOrderUpiRep;
+ _mesOrderGatherRep = mesOrderGatherRep;
}
@@ -114,7 +119,7 @@
{
throw Oops.Oh($"娌℃湁閰嶇疆 鍒ゆ柇榻愬 鍊�");
}
- if (!string.IsNullOrEmpty(sysConfig.Value))
+ if (!string.IsNullOrEmpty(sysConfig.Value) && sysConfig.Value != "鏃�")
{
throw Oops.Oh($"鍒ゆ柇榻愬鍊煎凡缁忓瓨鍦ㄥ�納sysConfig.Value},涓嶅厑璁告搷浣�");
}
@@ -159,5 +164,27 @@
}
return singlePackage;
}
+
+
+ /// <summary>
+ /// 鏌ヨ涓嶉綈濂楀崟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpGet]
+ [ApiDescriptionSettings(Name = "QueryNoKittingList")]
+ [Description("WmsOperationTask/QueryNoKittingList")]
+ public async Task<List<Mes_Order_Gather>> QueryNoKittingList([FromQuery] KittingListInput input)
+ {
+ var list = await _mesOrderGatherRep.AsQueryable()
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .WhereIF(!string.IsNullOrWhiteSpace(input.Info5), u => u.Info5.Contains(input.Info5.Trim()))
+ .Where(x=>((DateTime)x.CreateTime).ToString("yyyyMMdd")==DateTime.Now.ToString("yyyyMMdd"))
+ .Where(x => x.IsKitting == false)
+ .OrderBy(g => g.Id)
+ .ToListAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+ return list; // 缁撴灉
+ }
}
--
Gitblit v1.9.3