1

DataBase/版本日志/HJGLDB_DS_2025-07-21_gf.sql

@@ -0,0 +1,2 @@
+alter table [dbo].[Weld_UsingPlan] add UnitStoreId nvarchar(50) null
+GO

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<BaseTeamgroupItem> res = new List<BaseTeamgroupItem>();
+                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();

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;

HJGL_DS/BLL/WeldMat/BaseInfo/UnitStoreService.cs

@@ -113,5 +113,25 @@ namespace BLL
                 Funs.FineUIPleaseSelect(dropName);
             }
         }
+
+        /// <summary>
+        /// 根据主键获取单位仓库
+        /// </summary>
+        /// <param name="specificationsId"></param>
+        /// <returns></returns>
+        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;
+        }
     }
 }

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();
             }

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<SqlParameter> listStr = new List<SqlParameter>();
             //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";

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx

@@ -173,7 +173,7 @@
     </f:Panel>
         <f:Window ID="Window1" Title="编辑领料计划录入" Hidden="true" EnableIFrame="true" EnableMaximize="true"
             Target="Parent" EnableResize="true" runat="server" OnClose="Window1_Close" IsModal="true"
-            Width="800px" Height="380px">
+            Width="800px" Height="420px">
         </f:Window>
         <f:Window ID="Window2" Title="导入领料计划" Hidden="true" EnableIFrame="true" EnableMaximize="false"
             Target="Parent" EnableResize="false" runat="server" OnClose="Window1_Close" IsModal="true"

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlan.aspx.cs

@@ -403,6 +403,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                     usingPlan.IsSubmit = oldUsedPlan.IsSubmit;
                     usingPlan.InPutMan = CurrUser.UserId;
                     usingPlan.IsSteelStru = oldUsedPlan.IsSteelStru;
+                    usingPlan.UnitStoreId = oldUsedPlan.UnitStoreId;
                     usingPlan.Type = "1";
                     usingPlan.UsingPlanId = SQLHelper.GetNewID(typeof(Model.Weld_UsingPlan));
                     BLL.UsingPlanService.AddUsingPlan(usingPlan);

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx

@@ -21,11 +21,18 @@
                     </f:HiddenField>
                 </Items>
             </f:FormRow>
-            <f:FormRow ColumnWidths="50% 45% 5%">
+            <f:FormRow>
                 <Items>
                     <f:DropDownList ID="drpProjectId" runat="server" Label="施工号" LabelAlign="Right" Required="true" EnableEdit="true"
                         ShowRedStar="true" AutoPostBack="true" OnSelectedIndexChanged="drpProjectId_OnSelectedIndexChanged">
                     </f:DropDownList>
+                    <f:Label runat="server"></f:Label>
+                </Items>
+            </f:FormRow>
+            <f:FormRow ColumnWidths="50% 45% 5%">
+                <Items>
+                    <f:DropDownList ID="drpUnitStore" runat="server" Label="焊材库" LabelAlign="Right" EnableGroup="true" ShowRedStar="true">
+                    </f:DropDownList>
                     <f:TextBox ID="txtWeldName" runat="server" Label="焊材牌号" LabelAlign="Right" Readonly="true"
                         Required="true" ShowRedStar="true">
                     </f:TextBox>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.cs

@@ -44,6 +44,8 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 this.drpProjectId.DataBind();
                 Funs.FineUIPleaseSelect(this.drpProjectId);
 
+                BLL.UnitStoreService.InitUnitStoreDropDownList(drpUnitStore, null, true);
+
                 this.drpOrderTime.DataTextField = "Text";
                 this.drpOrderTime.DataValueField = "Value";
                 this.drpOrderTime.DataSource = BLL.DropListService.OrderTimeList();
@@ -84,6 +86,10 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                         if (!string.IsNullOrEmpty(usingPlan.WeldId))
                         {
                             this.hdWeldId.Text = usingPlan.WeldId;
+                            if (!string.IsNullOrEmpty(usingPlan.UnitStoreId))
+                            {
+                                this.drpUnitStore.SelectedValue = usingPlan.UnitStoreId;
+                            }
                             var weld = BLL.WeldInfoService.GetWeldInfoById(usingPlan.WeldId);
                             if (weld != null)
                             {
@@ -232,6 +238,11 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                 Alert.ShowInTop("请选择施工号！", MessageBoxIcon.Warning);
                 return;
             }
+            if (this.drpUnitStore.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
+                return;
+            }
             if (this.drpUsePosition.SelectedValue == BLL.Const._Null && drpUsePosition.Text == "")
             {
                 Alert.ShowInTop("请选择使用位置！", MessageBoxIcon.Warning);
@@ -319,6 +330,7 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
             }
 
             Model.Weld_UsingPlan usingPlan = new Model.Weld_UsingPlan();
+            usingPlan.UnitStoreId = this.drpUnitStore.SelectedValue;
             if (!string.IsNullOrEmpty(this.hdWeldId.Text.Trim()))
             {
                 usingPlan.WeldId = this.hdWeldId.Text.Trim();
@@ -540,7 +552,12 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
         /// <param name="e"></param>
         protected void btnSelect_Click(object sender, EventArgs e)
         {
-            string window = String.Format("ShowPlanWeld.aspx?projectId={0}", drpProjectId.SelectedValue, "编辑 - ");
+            if (this.drpUnitStore.SelectedValue == BLL.Const._Null)
+            {
+                Alert.ShowInTop("请选择焊材库！", MessageBoxIcon.Warning);
+                return;
+            }
+            string window = String.Format("ShowPlanWeld.aspx?projectId={0}&unitStoreId={1}", drpProjectId.SelectedValue, this.drpUnitStore.SelectedValue, "编辑 - ");
             PageContext.RegisterStartupScript(Window1.GetSaveStateReference(this.hdWeldId.ClientID) + Window1.GetShowReference(window));
         }
 

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanEdit.aspx.designer.cs

@@ -66,6 +66,15 @@ namespace FineUIPro.Web.WeldMat.UsingPlan {
         /// </remarks>
         protected global::FineUIPro.DropDownList drpProjectId;
         
+        /// <summary>
+        /// drpUnitStore 控件。
+        /// </summary>
+        /// <remarks>
+        /// 自动生成的字段。
+        /// 若要进行修改，请将字段声明从设计器文件移到代码隐藏文件。
+        /// </remarks>
+        protected global::FineUIPro.DropDownList drpUnitStore;
+        
         /// <summary>
         /// txtWeldName 控件。
         /// </summary>

HJGL_DS/FineUIPro.Web/WeldMat/UsingPlan/UsingPlanImport.aspx.cs

@@ -162,6 +162,26 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                             errorInfos += (i + 2) + "行, [施工号] 不能为空</br>";
                         }
 
+                        string unitStoreId = string.Empty;
+                        if (ds.Tables[0].Rows[i]["焊材库"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊材库"].ToString()))
+                        {
+                            var unitStore = from x in Funs.DB.Weld_UnitStore where x.UnitStoreName == ds.Tables[0].Rows[i]["焊材库"].ToString() select x;
+                            if (unitStore.Count() > 0)
+                            {
+                                usingPlan.UnitStoreId = unitStore.First().UnitStoreId;
+                                unitStoreId = unitStore.First().UnitStoreId;
+                            }
+                            else
+                            {
+                                errorInfos += (i + 2) + "行, [焊材库] 不存在</br>";
+                            }
+
+                        }
+                        else
+                        {
+                            errorInfos += (i + 2) + "行, [焊材库] 不能为空</br>";
+                        }
+
                         string steelType = string.Empty;
                         string weldTypeId = string.Empty;
                         if (ds.Tables[0].Rows[i]["焊材牌号"] != null && !string.IsNullOrEmpty(ds.Tables[0].Rows[i]["焊材牌号"].ToString())
@@ -184,7 +204,20 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                         }
                         else
                         {
-                            errorInfos += (i + 2) + "Line, [焊材牌号和规格] 不能为空</br>";
+                            errorInfos += (i + 2) + "行, [焊材牌号和规格] 不能为空</br>";
+                        }
+
+                        if (!string.IsNullOrEmpty(unitStoreId) && !string.IsNullOrEmpty(usingPlan.WeldId))
+                        {
+                            Model.SGGLDB db = Funs.DB;
+                            var q = from x in db.Weld_WeldInfo
+                                    where (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == usingPlan.WeldId select y.Amount ?? 0).Sum() - (from y in db.Weld_StockIn where y.UnitStoreId == unitStoreId && y.WeldId == usingPlan.WeldId select y.UsingAmount ?? 0).Sum() > 0
+                                    orderby x.WeldCode
+                                    select x;
+                            if (q.Count() == 0)
+                            {
+                                errorInfos += (i + 2) + "行, 焊材库对应焊材牌号和规格的焊材无库存 </br>";
+                            }
                         }
 
                         string unitId = string.Empty;

HJGL_DS/Model/APIItem/UsingPlanItem.cs

@@ -145,5 +145,6 @@ namespace Model.APIItem
 		public string WeldName { get; set; }
 		public string WeldSpec { get; set; }
         public string WeldCode { get; set; }
+        public string UnitStoreId { get; set; }
     }
 }

HJGL_DS/Model/Model.cs

@@ -112632,6 +112632,8 @@ namespace Model
 		
 		private string _Type;
 		
+		private string _UnitStoreId;
+		
 		private EntitySet<Weld_RecycleMat> _Weld_RecycleMat;
 		
 		private EntitySet<Weld_RecycleMatTop> _Weld_RecycleMatTop;
@@ -112694,6 +112696,8 @@ namespace Model
     partial void OnIsSteelStruChanged();
     partial void OnTypeChanging(string value);
     partial void OnTypeChanged();
+    partial void OnUnitStoreIdChanging(string value);
+    partial void OnUnitStoreIdChanged();
     #endregion
 		
 		public Weld_UsingPlan()
@@ -113209,6 +113213,26 @@ namespace Model
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_UnitStoreId", DbType="NVarChar(50)")]
+		public string UnitStoreId
+		{
+			get
+			{
+				return this._UnitStoreId;
+			}
+			set
+			{
+				if ((this._UnitStoreId != value))
+				{
+					this.OnUnitStoreIdChanging(value);
+					this.SendPropertyChanging();
+					this._UnitStoreId = value;
+					this.SendPropertyChanged("UnitStoreId");
+					this.OnUnitStoreIdChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.AssociationAttribute(Name="FK_Weld_RecycleMat_Weld_UsingPlan", Storage="_Weld_RecycleMat", ThisKey="UsingPlanId", OtherKey="UsingPlanId", DeleteRule="NO ACTION")]
 		public EntitySet<Weld_RecycleMat> Weld_RecycleMat
 		{

HJGL_DS/WebAPI/Controllers/BaseController.cs

@@ -46,13 +46,13 @@ namespace WebAPI.Controllers
             return respone;
         }
         [HttpGet]
-        public Model.ResponeData weldInfoList(string weldName, int page, int pageSize)
+        public Model.ResponeData weldInfoList(string weldName, string unitStoreId, int page, int pageSize)
         {
             Model.ResponeData respone = new ResponeData();
             try
             {
 
-                return APIBaseServices.weldInfoList(weldName, page, pageSize);
+                return APIBaseServices.weldInfoList(weldName, unitStoreId, page, pageSize);
             }
             catch (Exception e)
             {
@@ -149,6 +149,24 @@ namespace WebAPI.Controllers
 
         }
 
+        [HttpGet]
+        public Model.ResponeData unitStoreList()
+        {
+            Model.ResponeData respone = new ResponeData();
+            try
+            {
+
+                return APIBaseServices.unitStoreList();
+            }
+            catch (Exception e)
+            {
+                respone.code = 0;
+                respone.message = e.Message;
+            }
+            return respone;
+
+        }
+
         [HttpGet]
         public Model.ResponeData bsSteelList(string ste_Code, int page, int pageSize)
         {
@@ -191,10 +209,10 @@ namespace WebAPI.Controllers
             {
                 using (Model.SGGLDB db = new Model.SGGLDB(BLL.Funs.ConnString))
                 {
-                    Model.Sys_Const c = db.Sys_Const.FirstOrDefault(x=>x.ConstText== "Version");
+                    Model.Sys_Const c = db.Sys_Const.FirstOrDefault(x => x.ConstText == "Version");
                     if (c != null)
                     {
-                        respone.data= c.ConstValue;
+                        respone.data = c.ConstValue;
                         return respone;
                     }
                 }

HJGL_DS/WebAPI/Filter/TestPermissionAttribute.cs

@@ -165,6 +165,7 @@ namespace WebAPI.Filter
             //"Weld*CanAudit",
             //"Weld*addUsingPlan",
             "Base*weldInfoList",
+            "Base*unitStoreList",
             "Base*getWeldInfo",
             "Base*baseUnitList",
             "Base*usePositionList",

HJGL_DS/WebAPI/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -79,13 +79,13 @@
       <publishTime>09/10/2013 16:29:20</publishTime>
     </File>
     <File Include="bin/BLL.dll">
-      <publishTime>07/07/2025 18:58:25</publishTime>
+      <publishTime>07/24/2025 10:18:37</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/03/2024 11:01:05</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>07/07/2025 18:58:25</publishTime>
+      <publishTime>07/24/2025 10:18:37</publishTime>
     </File>
     <File Include="bin/BouncyCastle.Crypto.dll">
       <publishTime>12/17/2020 21:32:28</publishTime>
@@ -115,10 +115,10 @@
       <publishTime>07/25/2012 11:48:56</publishTime>
     </File>
     <File Include="bin/Model.dll">
-      <publishTime>07/07/2025 18:58:24</publishTime>
+      <publishTime>07/24/2025 10:18:37</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>07/07/2025 18:58:24</publishTime>
+      <publishTime>07/24/2025 10:18:37</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>02/18/2018 09:44:54</publishTime>
@@ -316,10 +316,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>07/07/2025 18:58:26</publishTime>
+      <publishTime>07/24/2025 10:18:40</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>07/07/2025 18:58:26</publishTime>
+      <publishTime>07/24/2025 10:18:40</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -445,7 +445,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>07/07/2025 18:58:35</publishTime>
+      <publishTime>07/24/2025 10:18:55</publishTime>
     </File>
   </ItemGroup>
 </Project>