From 1a6cb3c63ec20ac79fe5ea2172775b9eb9c95b44 Mon Sep 17 00:00:00 2001
From: gaofei1985 <181547018@qq.com>
Date: Thu, 7 Aug 2025 15:06:59 +0800
Subject: [PATCH] 1
---
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx | 3 +++
HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs | 3 ++-
.../WeldMat/UsingSentMat/UsingtMatSelect.aspx | 7 +++++--
3 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
index e5295ab..27d23e6 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx
@@ -104,6 +104,9 @@
+
+
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
index 83ae35c..ba7f0b4 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs
@@ -54,7 +54,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
private void BindGrid()
{
string projectIds = BLL.Project_UserService.GetStrProjectIds(this.CurrUser.UserId);
- string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,
+ string strSql = @"SELECT UsingPlan.UsingPlanId, UsingPlan.WeldId, UsingPlan.ProjectId, UsingPlan.UsePosition,TeamGroupId,UsingPlan.STE_Name,UnitStore.UnitStoreName,
unit.UnitName AS UsingUnit,UsingPlan.Amount, UsingPlan.UsingManOne, UsingPlan.InPutDate,
CONVERT(varchar(100), UsingPlan.OrderDate, 23)+' '+UsingPlan.OrderTime as OrderTime, UsingPlan.CancelDate,UsingPlan.IsNeedConfirm,
(CASE UsingPlan.IsSteelStru WHEN 1 THEN '是' WHEN 0 THEN '否' ELSE '' END) AS IsSteelStru,
@@ -75,6 +75,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
LEFT JOIN dbo.HJGL_BS_Welder AS Welder ON Welder.WED_ID = UsingPlan.UsingManOne
LEFT JOIN dbo.Base_Unit unit ON unit.UnitId=UsingPlan.UsingUnit
LEFT JOIN dbo.Sys_User AS userInput ON userInput.UserId=UsingPlan.InPutMan
+ LEFT JOIN dbo.Weld_UnitStore AS UnitStore ON UnitStore.UnitStoreId=UsingPlan.UnitStoreId
LEFT JOIN dbo.HJGL_BS_Welder AS welderInput ON welderInput.WED_ID=UsingPlan.InPutMan
WHERE Project.IsClosed=0 ";
List listStr = new List();
diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
index 5330bbc..76e31e5 100644
--- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
+++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingSentMat/UsingtMatSelect.aspx
@@ -91,6 +91,9 @@
+
+
@@ -122,9 +125,9 @@
-
-
+ --%>