1

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