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 |   32 +++++++++++++++++++++++++-------
 1 files changed, 25 insertions(+), 7 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 c77a4e3..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()

--
Gitblit v1.9.3