From c1c1b1f95b0880cd58afadb98d6933287fe6311c Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周日, 15 12月 2024 16:41:37 +0800
Subject: [PATCH] 22
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs | 76 ++++++++++++++++++++++++++++++-------
1 files changed, 61 insertions(+), 15 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 37a2e8c..f85d612 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsCommonnQuery/WmsCommonnQueryService.cs
@@ -144,18 +144,36 @@
[Description("WmsCommonnQuery/QueryCurrentOrder")]
public async Task<Mes_Order_Gather> QueryCurrentOrder()
{
- //鑾峰彇涓婄彮鏃堕棿銆�
- 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 == "鏃�")
+ ////鑾峰彇涓婄彮鏃堕棿銆�
+ //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;
+ //}
+ //var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
+ //var packagecode = arr[0];
+ //var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
+ //if (packObj == null)
+ //{
+ // throw Oops.Oh($"娌℃湁鎵惧埌鍖厈packagecode}鐨勬眹鎬绘暟鎹�");
+ //}
+
+ //var list = await _mesOrderGatherRep.AsQueryable()
+ // .Where(x => x.Info5 == packObj.Info5)
+ // .FirstAsync(); // 纭繚鑾峰彇缁撴灉涓� List
+
+ //return list; // 缁撴灉
+
+ var packageQueue = await _mesPackage_LineQueueRep.AsQueryable().Where(x => 1 == 1).ToListAsync();
+ var single_packageQueue = packageQueue.OrderBy(x => x.Id).FirstOrDefault();
+ if (single_packageQueue == null)
{
return null;
}
- var arr = sysConfig_wms_wms_unline_oper.Value.Split('|');
- var packagecode = arr[0];
- var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == packagecode);
+ var packObj = await _mesPackageGatherRep.AsQueryable().FirstAsync(x => x.PackageCode == single_packageQueue.PackageCode);
if (packObj == null)
{
- throw Oops.Oh($"娌℃湁鎵惧埌鍖厈packagecode}鐨勬眹鎬绘暟鎹�");
+ throw Oops.Oh($"娌℃湁鎵惧埌鍖厈single_packageQueue.PackageCode}鐨勬眹鎬绘暟鎹�");
}
var list = await _mesOrderGatherRep.AsQueryable()
@@ -687,7 +705,7 @@
throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
}
- var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi || x.PackageCode == input.Upi).FirstAsync();
if (singleUpi == null)
{
throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
@@ -700,7 +718,35 @@
}
var upiList = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.PackageCode == singleUpi.PackageCode).ToListAsync();
+ upiList = upiList.OrderBy(x => x.Shelf).ToList();
+ return upiList;
+ }
+
+
+ /// <summary>
+ /// 鏍规嵁鏌愪釜Upi锛屾煡璇㈡澘浠舵暟鎹�
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "QuerySingleUpiByUpi")]
+ [Description("WmsCommonnQuery/QuerySingleUpiByUpi")]
+ public async Task<List<Mes_BatchOrderUPI_New>> QuerySingleUpiByUpi(QueryUpiListByUpiInput input)
+ {
+ if (input == null || input.Upi == null)
+ {
+ throw Oops.Oh("鍙傛暟涓嶈兘涓虹┖");
+ }
+
+ var singleUpi = await _mesBatchOrderUpiRep.AsQueryable().Where(x => x.UPI == input.Upi).FirstAsync();
+ if (singleUpi == null)
+ {
+ throw Oops.Oh($"娌℃湁鎵惧埌閮ㄤ欢鏉＄爜{input.Upi}鐨勬暟鎹�");
+ }
+
+ List<Mes_BatchOrderUPI_New> upiList = new List<Mes_BatchOrderUPI_New>();
+ upiList.Add(singleUpi);
return upiList;
}
@@ -783,10 +829,10 @@
{
Time = 12 - i,
InWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
+ // .Where(x => x.OrderType == OrderTypeEnum.涓婃灦鍗�)
.ToList().Count(),
OutWare = recordsOfDay
- // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ // .Where(x => x.OrderType == OrderTypeEnum.涓嬫灦鍗�)
.ToList().Count(),
StockNum = 0,
AveStockNum = 0,
@@ -803,8 +849,8 @@
DateTime all_startDate = GetStartOfWeek(currentDate).AddDays(-7 * 11);
DateTime all_endDate = GetEndOfWeek(currentDate);
var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
- //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
- //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -841,8 +887,8 @@
DateTime all_startDate = currentDate.AddMonths(-11).AddDays(1 - currentDate.Day);
DateTime all_endDate = currentDate.AddMonths(1).AddDays(-1);
var all_recordsOfDay = await _mesOrderGatherRep.AsQueryable().Where(r => r.CreateTime >= all_startDate && r.CreateTime <= all_endDate
- //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
- //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
+ //&& (r.OrderStatus == OrderStatusEnum.宸插畬鎴�)
+ //&& (r.OrderType == OrderTypeEnum.涓婃灦鍗� || r.OrderType == OrderTypeEnum.涓嬫灦鍗�)
).ToListAsync();
for (int i = 0; i < 12; i++)
@@ -890,6 +936,6 @@
{
return startDate.AddDays(6); // 鍥犱负璧峰鏃ユ湡宸茬粡鏄懆涓�锛屾墍浠ョ洿鎺ュ姞6澶╁嵆鍙緱鍒板懆鏃�
}
-
+
}
--
Gitblit v1.9.3