1

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

@@ -216,13 +216,14 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
         protected void btnSave_Click(object sender, EventArgs e)
         {
             Model.SGGLDB db = Funs.DB;
-            var amount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.Amount ?? 0).Sum();
+            var list = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y).ToList();
-            var usingAmount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.UsingAmount ?? 0).Sum();
+            var amount = list.Sum(x => x.Amount ?? 0);
-            var recycleAmount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.RecycleAmount ?? 0).Sum();
+            var usingAmount = list.Sum(x => x.UsingAmount ?? 0);
+            var recycleAmount = list.Sum(x => x.RecycleAmount ?? 0);
             decimal a = amount - usingAmount + recycleAmount;
             if (Funs.GetNewDecimal(this.txtAmount.Text.Trim()) > a)
             {
-                Alert.ShowInTop("焊材库存仅剩"+a.ToString("0.##")+"根，领用数量不能超过库存数量！", MessageBoxIcon.Warning);
+                Alert.ShowInTop("焊材库存仅剩" + a.ToString("0.##") + "根，领用数量不能超过库存数量！", MessageBoxIcon.Warning);
                 return;
             }
             SaveData(false);
@@ -231,9 +232,10 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
         protected void btnSubmit_Click(object sender, EventArgs e)
         {
             Model.SGGLDB db = Funs.DB;
-            var amount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.Amount ?? 0).Sum();
+            var list = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y).ToList();
-            var usingAmount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.UsingAmount ?? 0).Sum();
+            var amount = list.Sum(x => x.Amount ?? 0);
-            var recycleAmount = (from y in db.Weld_StockIn where y.UnitStoreId == this.drpUnitStore.SelectedValue && y.WeldId == this.hdWeldId.Text.Trim() select y.RecycleAmount ?? 0).Sum();
+            var usingAmount = list.Sum(x => x.UsingAmount ?? 0);
+            var recycleAmount = list.Sum(x => x.RecycleAmount ?? 0);
             decimal a = amount - usingAmount + recycleAmount;
             if (Funs.GetNewDecimal(this.txtAmount.Text.Trim()) > a)
             {
@@ -692,17 +694,17 @@ namespace FineUIPro.Web.WeldMat.UsingPlan
                                   && (x.IsSteelStru == false || x.IsSteelStru == null)
                             select x).ToList();
             }
-            
+
             foreach (var q in qualifys)
             {
                 if (q.QualifiedProjectCode.Split('-').Length == 3)  //该种合格项目只能领盘状焊丝
                 {
-                    if (q.QualifiedProjectCode.Contains("SAW"))   
+                    if (q.QualifiedProjectCode.Contains("SAW"))
                     {
                         if (weldTypeId == "9770311b-af69-4b6f-b8ad-161a4df88015" || weldTypeId == "23900d2f-f0e6-4d76-a44d-eb47eede3914")  //SAW可以领用焊剂和盘装焊丝没有材质的限制
                         {
                             isPass = true;
-                            break; 
+                            break;
                         }
                     }
                     else

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>10/16/2025 18:56:09</publishTime>
+      <publishTime>11/18/2025 11:30:43</publishTime>
     </File>
     <File Include="bin/BLL.dll.config">
       <publishTime>07/28/2025 20:15:00</publishTime>
     </File>
     <File Include="bin/BLL.pdb">
-      <publishTime>10/16/2025 18:56:09</publishTime>
+      <publishTime>11/18/2025 11:30:43</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>10/16/2025 18:56:08</publishTime>
+      <publishTime>11/18/2025 11:30:43</publishTime>
     </File>
     <File Include="bin/Model.pdb">
-      <publishTime>10/16/2025 18:56:08</publishTime>
+      <publishTime>11/18/2025 11:30:43</publishTime>
     </File>
     <File Include="bin/Newtonsoft.Json.dll">
       <publishTime>03/17/2021 20:03:36</publishTime>
@@ -319,10 +319,10 @@
       <publishTime>02/01/2018 12:20:56</publishTime>
     </File>
     <File Include="bin/WebAPI.dll">
-      <publishTime>10/16/2025 18:56:10</publishTime>
+      <publishTime>11/18/2025 11:30:44</publishTime>
     </File>
     <File Include="bin/WebAPI.pdb">
-      <publishTime>10/16/2025 18:56:10</publishTime>
+      <publishTime>11/18/2025 11:30:44</publishTime>
     </File>
     <File Include="bin/WebGrease.dll">
       <publishTime>01/23/2014 13:57:34</publishTime>
@@ -448,7 +448,7 @@
       <publishTime>07/03/2024 11:01:07</publishTime>
     </File>
     <File Include="Web.config">
-      <publishTime>10/16/2025 18:56:19</publishTime>
+      <publishTime>11/18/2025 11:30:50</publishTime>
     </File>
   </ItemGroup>
 </Project>