From 7390344109084b62327e3c026da05b1b98beb8e5 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 17:11:09 +0800
Subject: [PATCH] 222

---
 LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
index ed7aa55..b7f323f 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/ThirdInterFace/ThirdInterFaceService.cs
@@ -45,15 +45,24 @@
             throw Oops.Oh("鏈鏈夐噸澶嶇殑UPI锛侀噸澶嶅彿涓�:" + dit.Key + ",閲嶅鏉℃暟:" + dit.Value);
         }
 
+        //鎸夌収鎵规鍙�+璁㈠崟鍙峰垹闄�
         List<string> packageList = new List<string>();
-        input.ForEach(x => packageList.Add(x.PackageCode));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
+        input.ForEach(x => packageList.Add(x.PlanNo + "_" + x.OrderId));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
 
-        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PackageCode)).ToListAsync();//batchOrderUPIs鏄噸澶嶇殑upi闆嗗悎
+        var batchOrderUPIs = await _rep.AsQueryable().Where(x => packageList.Contains(x.PlanNo + "_" + x.OrderId)).ToListAsync();//batchOrderUPIs鏄噸澶嶇殑upi闆嗗悎
         //鎵归噺鍒犻櫎
         await _rep.DeleteAsync(batchOrderUPIs);
 
         //鎵归噺鍒犻櫎
-        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PackageCode));
+        await _mes_Package_Gather_Rep.DeleteAsync(x => packageList.Contains(x.PlanNo + "_" + x.OrderId));
+
+        //鍒犻櫎閲嶅鐨剈pi鏁版嵁
+        List<string> upis = new List<string>();
+        input.ForEach(x => upis.Add(x.UPI));//upis鏄紶杩囨潵鐨剈pi瀛楁闆嗗悎
+        var queryDateTime = DateTime.Now.AddDays(-7);
+        var batchOrderUPIs22 = await _rep.AsQueryable().Where(x => upis.Contains(x.UPI) && x.CreateTime >= queryDateTime).ToListAsync();//batchOrderUPIs鏄噸澶嶇殑upi闆嗗悎
+        //鎵归噺鍒犻櫎
+        await _rep.DeleteAsync(batchOrderUPIs22);
 
         foreach (var item in input)
         {

--
Gitblit v1.9.3