From c727b5cacfe8da78e976d416c9a668f7ce147bf2 Mon Sep 17 00:00:00 2001 From: gaofei1985 <181547018@qq.com> Date: Thu, 24 Jul 2025 15:18:24 +0800 Subject: [PATCH] 1 --- DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql | 2 + HJGL_DS/BLL/API/APIBaseServices.cs | 32 +++++++++++++++- HJGL_DS/BLL/API/APIWeldServices.cs | 4 +- .../BLL/WeldMat/BaseInfo/UnitStoreService.cs | 20 ++++++++++ .../BLL/WeldMat/UsingPlan/UsingPlanService.cs | 2 + .../File/Excel/领料计划导入模板.xlsx | Bin 16910 -> 16949 bytes .../WeldMat/UsingPlan/ShowPlanWeld.aspx.cs | 4 +- .../WeldMat/UsingPlan/UsingPlan.aspx | 2 +- .../WeldMat/UsingPlan/UsingPlan.aspx.cs | 1 + .../WeldMat/UsingPlan/UsingPlanEdit.aspx | 9 ++++- .../WeldMat/UsingPlan/UsingPlanEdit.aspx.cs | 19 +++++++++- .../UsingPlan/UsingPlanEdit.aspx.designer.cs | 9 +++++ .../WeldMat/UsingPlan/UsingPlanImport.aspx.cs | 35 +++++++++++++++++- HJGL_DS/Model/APIItem/UsingPlanItem.cs | 1 + HJGL_DS/Model/Model.cs | 24 ++++++++++++ HJGL_DS/WebAPI/Controllers/BaseController.cs | 26 +++++++++++-- .../WebAPI/Filter/TestPermissionAttribute.cs | 1 + .../PublishProfiles/FolderProfile.pubxml.user | 14 +++---- 18 files changed, 187 insertions(+), 18 deletions(-) create mode 100644 DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql diff --git a/DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql b/DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql new file mode 100644 index 0000000..361860e --- /dev/null +++ b/DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql @@ -0,0 +1,2 @@ +alter table [dbo].[Weld_UsingPlan] add UnitStoreId nvarchar(50) null +GO \ No newline at end of file diff --git a/HJGL_DS/BLL/API/APIBaseServices.cs b/HJGL_DS/BLL/API/APIBaseServices.cs index 55cbd05..e7658df 100644 --- a/HJGL_DS/BLL/API/APIBaseServices.cs +++ b/HJGL_DS/BLL/API/APIBaseServices.cs @@ -156,12 +156,19 @@ namespace BLL.API } return respone; } - public static Model.ResponeData weldInfoList(string weldName, int page, int pageSize) + public static Model.ResponeData weldInfoList(string weldName, string unitStoreId, int page, int pageSize) { Model.ResponeData respone = new ResponeData(); using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var q = (from x in db.Weld_WeldInfo orderby x.WeldCode select x).ToList(); + if (!string.IsNullOrEmpty(unitStoreId)) + { + q = (from x in db.Weld_WeldInfo + where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == x.WeldId select y.Amount ?? 0).Sum() - (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == x.WeldId select y.UsingAmount ?? 0).Sum() > 0 + orderby x.WeldCode + select x).ToList(); + } if (!string.IsNullOrEmpty(weldName)) { q = q.Where(x => x.WeldName.Contains(weldName)).ToList(); @@ -344,6 +351,29 @@ namespace BLL.API } return respone; } + + public static Model.ResponeData unitStoreList() + { + Model.ResponeData respone = new ResponeData(); + using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) + { + var q = from x in Funs.DB.Weld_UnitStore + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + orderby y.UnitName, x.UnitStoreCode + select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + x.UnitStoreName + ")"), y.UnitName, x.UnitId }; + List res = new List(); + foreach (var p in q) + { + BaseTeamgroupItem item = new BaseTeamgroupItem(); + item.TeamGroupId = p.UnitStoreId; + item.TeamGroupName = p.UnitStoreName; + res.Add(item); + } + + respone.data = res; + } + return respone; + } public static Model.ResponeData bsWelderList(string projectId) { Model.ResponeData respone = new ResponeData(); diff --git a/HJGL_DS/BLL/API/APIWeldServices.cs b/HJGL_DS/BLL/API/APIWeldServices.cs index 3995cc7..b4fd91b 100644 --- a/HJGL_DS/BLL/API/APIWeldServices.cs +++ b/HJGL_DS/BLL/API/APIWeldServices.cs @@ -109,6 +109,7 @@ namespace BLL.API UsingPlanItem planItem = new UsingPlanItem(); planItem.UsingPlanId = x.UsingPlanId; planItem.WeldId = x.WeldId; + planItem.UnitStoreId= BLL.UnitStoreService.GetUnitStoreNameById(x.UnitStoreId); planItem.ProjectId = x.ProjectId; planItem.UsePosition = x.UsePosition; planItem.Amount = x.Amount; @@ -253,7 +254,7 @@ namespace BLL.API planItem.STE_ID = usingPlan.STE_ID; planItem.IsFinish = usingPlan.IsFinish; planItem.STE_Name = usingPlan.STE_Name; - + planItem.UnitStoreId = BLL.UnitStoreService.GetUnitStoreNameById(usingPlan.UnitStoreId); if (!string.IsNullOrEmpty(planItem.ProjectId)) { @@ -361,6 +362,7 @@ namespace BLL.API newUsingPlan.WeldId = usingPlan.WeldId; newUsingPlan.ProjectId = usingPlan.ProjectId; newUsingPlan.UsePosition = usingPlan.UsePosition; + newUsingPlan.UnitStoreId = usingPlan.UnitStoreId; newUsingPlan.Amount = usingPlan.Amount; newUsingPlan.UsingManOne = usingPlan.UsingManOne; newUsingPlan.UsingManTwo = usingPlan.UsingManTwo; diff --git a/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs b/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs index 6742ab9..1dd926f 100644 --- a/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs +++ b/HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs @@ -113,5 +113,25 @@ namespace BLL Funs.FineUIPleaseSelect(dropName); } } + + /// + /// 根据主键获取单位仓库 + /// + /// + /// + public static string GetUnitStoreNameById(string unitStoreId) + { + string name = string.Empty; + var store = from x in Funs.DB.Weld_UnitStore + join y in Funs.DB.Base_Unit on x.UnitId equals y.UnitId + where x.UnitStoreId== unitStoreId + orderby y.UnitName, x.UnitStoreCode + select new { x.UnitStoreId, UnitStoreName = (y.UnitName + "(" + x.UnitStoreName + ")"), y.UnitName, x.UnitId }; + if (store.Count() > 0) + { + name = store.First().UnitStoreName; + } + return name; + } } } diff --git a/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanService.cs b/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanService.cs index d01c740..c3416d1 100644 --- a/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanService.cs +++ b/HJGL_DS/BLL/WeldMat/UsingPlan/UsingPlanService.cs @@ -49,6 +49,7 @@ namespace BLL newUsingPlan.InPutMan = usingPlan.InPutMan; newUsingPlan.IsSteelStru = usingPlan.IsSteelStru; newUsingPlan.Type = usingPlan.Type; + newUsingPlan.UnitStoreId = usingPlan.UnitStoreId; db.Weld_UsingPlan.InsertOnSubmit(newUsingPlan); db.SubmitChanges(); @@ -83,6 +84,7 @@ namespace BLL newUsingPlan.IsSubmit = usingPlan.IsSubmit; newUsingPlan.InPutMan = usingPlan.InPutMan; newUsingPlan.IsSteelStru = usingPlan.IsSteelStru; + newUsingPlan.UnitStoreId = usingPlan.UnitStoreId; db.SubmitChanges(); } diff --git a/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx b/HJGL_DS/FineUIPro.Web/File/Excel/领料计划导入模板.xlsx index e9397177ccbebedcb2adbbde56d789a37646b17c..9ac870f30f1db07db42d5ab32b8db7dac1a8ae37 100644 GIT binary patch delta 6156 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 delta 6092 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 Bmb(A| diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs index b2f11c7..f4b7cc1 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/ShowPlanWeld.aspx.cs @@ -53,9 +53,11 @@ namespace FineUIPro.Web.WeldMat.UsingPlan WeldType.WeldTypeName,WeldType.WeldUnit FROM dbo.Weld_WeldInfo weld LEFT JOIN Weld_WeldType AS weldType ON weldType.WeldTypeId =weld.WeldTypeId - WHERE 1 = 1 "; + WHERE 1 = 1 +and (select (SUM(ISNULL(stockIn.Amount,0))-SUM(ISNULL(stockIn.UsingAmount,0))) from Weld_StockIn stockIn where UnitStoreId=@UnitStoreId and WeldId=weld.WeldId)>0"; List listStr = new List(); //listStr.Add(new SqlParameter("@ProjectId", this.ProjectId)); + listStr.Add(new SqlParameter("@UnitStoreId", Request.Params["unitStoreId"])); if (drpWeldType.SelectedValue != BLL.Const._Null) { strSql += " AND weld.WeldTypeId = @WeldTypeId"; diff --git a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx index 966bfce..e5295ab 100644 --- a/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx +++ b/HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx @@ -173,7 +173,7 @@