From 67e332646916284bbdd9b6623a4f067fa07b1a21 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Wed, 12 Nov 2025 09:54:42 +0800 Subject: [PATCH] 1 --- HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs index cd9a1a3..7a43afd 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingMat.aspx.cs @@ -332,7 +332,7 @@ namespace FineUIPro.Web.WeldMat.UsingSentMat LEFT JOIN HJGL_BS_Welder AS Welder2 ON Welder2.WED_ID = UsingPlan.UsingManTwo LEFT JOIN dbo.Weld_UsingMat usingMat ON usingMat.UsingPlanId = UsingPlan.UsingPlanId WHERE (UsingPlan.IsCancel=0 OR UsingPlan.IsCancel IS NULL) - AND UsingPlan.IsSubmit=1 AND convert(char(10),UsingPlan.OrderDate,120)=convert(char(10),GetDate(),120) + AND UsingPlan.IsSubmit=1 AND (convert(char(10),UsingPlan.OrderDate,120)=convert(char(10),GetDate(),120) or dateadd(day,1,UsingPlan.OrderDate)>GETDATE()) AND usingMat.UsingMatId IS NULL --一条计划只给领用一次 --AND (UsingPlan.IsNeedConfirm IS NULL OR UsingPlan.IsNeedConfirm = 0) -- 不需要确认 AND UsingPlan.UsingManOne=@WelderId";