From 853849f9c3095036e4a3a28624e1a2907cf4d8ed Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 16 十月 2025 13:39:12 +0800
Subject: [PATCH] 报工优化入库申请单查询逻辑

---
 service/Wom/MesWorkProdManager.cs |   21 ++++++++++++++++-----
 1 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/service/Wom/MesWorkProdManager.cs b/service/Wom/MesWorkProdManager.cs
index c1352bf..badf030 100644
--- a/service/Wom/MesWorkProdManager.cs
+++ b/service/Wom/MesWorkProdManager.cs
@@ -3,6 +3,7 @@
 using NewPdaSqlServer.entity;
 using NewPdaSqlServer.entity.Base;
 using NewPdaSqlServer.util;
+using SharpCompress;
 using SqlSugar;
 using System.Data;
 using System.Data.SqlClient;
@@ -302,8 +303,13 @@
         if (po_outSum == 1)
         {
             rksqOrder = Db.Queryable<MesInvItemIns>()
-               .Where(x => x.RbillNo == barcode.BillNo && x.TransctionNo == "181" && x.CreateBy == request.StaffNo)
-               .First();
+        .LeftJoin<Womdaa>((a, daa) => a.TaskNo == daa.Daa001)
+        .Where(a => a.Status == 0)
+        .Where(a => a.TransctionNo == "181")
+        .Where((a, daa) => daa.Daa029 == item.ItemNo)
+        .Where((a, daa) => daa.Daa015 == workOrder.Daa015)
+        .Where(a => a.InsDate.Value.Date == DateTime.Today)
+        .First();
 
             if (rksqOrder != null)
             {
@@ -319,8 +325,13 @@
         else if (po_outSum == 2)
         {
             rksqOrder = Db.Queryable<MesInvItemIns>()
-              .Where(x => x.RbillNo == barcode.BillNo && x.TransctionNo == "181" && x.CreateBy == request.StaffNo)
-              .First();
+        .LeftJoin<Womdaa>((a, daa) => a.TaskNo == daa.Daa001)
+        .Where(a => a.Status == 0)
+        .Where(a => a.TransctionNo == "181")
+        .Where((a, daa) => daa.Daa029 == item.ItemNo)
+        .Where((a, daa) => daa.Daa015 == workOrder.Daa015)
+        .Where(a => a.InsDate.Value.Date == DateTime.Today)
+        .First();
 
             if (rksqOrder != null)
             {
@@ -583,7 +594,7 @@
             throw new Exception("璇峰厛閫夋嫨浜哄憳");
 
         var rksqOrder = Db.Queryable<MesInvItemIns>()
-            .Where(x => x.TransctionNo=="181"&& x.Status == 0 && x.CreateBy== request.StaffNo)
+            .Where(x => x.TransctionNo=="181"&& x.Status == 0)
             .ToList();
 
         return new ScanWorkResult

--
Gitblit v1.9.3