修改入库申请单入库后备注清空

.vs/SGGL_SeDin_New/v17/DocumentLayout.backup.json

@@ -0,0 +1,83 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "D:\\\u6570\u636E\\\u8BFA\u5FC5\u8FBE\\\u8D5B\u9F0E\\SGGL_SeDin_New\\",
+  "Documents": [],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 386,
+          "SelectedChildIndex": -1,
+          "Children": [
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1c4feeaa-4718-4aa9-859d-94ce25d182ba}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{e506b91c-c606-466a-90a9-123d1d1e12b3}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:130:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:132:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:133:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:134:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:1:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{1fc202d4-d401-403c-9834-5b218574bb67}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{13b12e3e-c1b4-4539-9371-4fe9a0d523fc}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:2:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:3:0:{f2bd8fb8-fc94-3dae-a733-fd993c73cc87}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:129:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:131:0:{116d2292-e37d-41cd-a077-ebacac4c8cc4}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{1a46fd64-28d5-434c-8eb3-17a02d419b53}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{5726b0e3-1012-5233-81f9-d1fad48e7a56}"
+            },
+            {
+              "$type": "Bookmark",
+              "Name": "ST:0:0:{aa2115a1-9712-457b-9047-dbb71ca2cdd2}"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

SGGL/BLL/CLGL/TwInputmasterService.cs

@@ -292,8 +292,13 @@ namespace BLL
                 TwMaterialstockService.UpdateStockNum(master.ProjectId, detail.MaterialCode, master.WarehouseCode, TwConst.InOutType.入库, detailTable.ActNum);
 
             }
-            plan.State= (int)TwConst.State.已完成;
+            var planTable =TwInOutplanmasterService.GetById(plan.Id);
-            TwInOutplanmasterService.Update(plan);
+            if (planTable != null)
+            {
+                planTable.State = (int)TwConst.State.已完成;
+                TwInOutplanmasterService.Update(planTable);
+            }
+            
         }
         /// <summary>
         /// 根据计划单撤销入库单

SGGL/FineUIPro.Web/CLGL/ArrivalStatistics.aspx.cs

@@ -12,6 +12,12 @@ namespace FineUIPro.Web.CLGL
 {
     public partial class ArrivalStatistics : PageBase
     {
+        #region Methods
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -27,7 +33,10 @@ namespace FineUIPro.Web.CLGL
             }
         }
 
+        #endregion Methods
+
         #region 绑定数据
+
         /// <summary>
         /// 绑定数据
         /// </summary>
@@ -61,14 +70,14 @@ namespace FineUIPro.Web.CLGL
                 if (model?.MatchRate < 1 || model?.MatchRate == null)
                 {
                     Grid1.Rows[i].RowCssClass = "red";
-
                 }
             }
         }
 
-        #endregion
+        #endregion 绑定数据
 
         #region GV 数据操作
+
         /// <summary>
         /// 过滤表头
         /// </summary>
@@ -79,6 +88,17 @@ namespace FineUIPro.Web.CLGL
         //    this.BindGrid();
         //}
 
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 分页
         /// </summary>
@@ -101,20 +121,10 @@ namespace FineUIPro.Web.CLGL
             this.Grid1.SortField = e.SortField;
             this.BindGrid();
         }
-
+        #endregion GV 数据操作
-        /// <summary>
-        /// 分页显示条数下拉框
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
-            this.BindGrid();
-        }
-        #endregion
 
         #region 关闭弹出窗
+
         /// <summary>
         /// 关闭弹出窗
         /// </summary>
@@ -124,11 +134,11 @@ namespace FineUIPro.Web.CLGL
         {
             BindGrid();
         }
-        #endregion
-
 
+        #endregion 关闭弹出窗
 
         #region 导出按钮
+
         /// 导出按钮
         /// </summary>
         /// <param name="sender"></param>
@@ -182,11 +192,7 @@ namespace FineUIPro.Web.CLGL
 
             return sb.ToString();
         }
-        #endregion
 
-        protected void btnSearch_Click(object sender, EventArgs e)
+        #endregion 导出按钮
-        {
-            BindGrid();
-        }
     }
 }

SGGL/FineUIPro.Web/CLGL/InPlanMaster.aspx.cs

@@ -15,6 +15,7 @@ namespace FineUIPro.Web.CLGL
 {
     public partial class InPlanMaster : PageBase
     {
+        #region Methods
 
         protected void Page_Load(object sender, EventArgs e)
         {
@@ -27,27 +28,20 @@ namespace FineUIPro.Web.CLGL
             }
         }
 
-        #region 绑定数据
+        #endregion Methods
-        private void InitDrpList()
-        {
-            this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-            drpWarehouse.DataTextField = "Text";
-            drpWarehouse.DataValueField = "Value";
-            drpWarehouse.DataSource = BLL.DropListService .HJGL_WarehouseCode();
-            drpWarehouse.DataBind();
-            Funs.FineUIPleaseSelect(this.drpWarehouse); 
-            drpTypeInt.DataTextField = "Key";
-            drpTypeInt.DataValueField = "Value";
-            drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x=>x.Key.Contains("入库"));
-            drpTypeInt.DataBind();
-            Funs.FineUIPleaseSelect(this.drpTypeInt);
-            drpStates.DataTextField = "Key";
-            drpStates.DataValueField = "Value";
-            drpStates.DataSource = BLL.TwConst.StateMap;
-            drpStates.DataBind();
-            Funs.FineUIPleaseSelect(this.drpStates);
 
+        #region 绑定数据
+
+        private void BindDetailGrid(string inOutPlanMasterId)
+        {
+            Model.Tw_InOutDetailOutput table = new Model.Tw_InOutDetailOutput();
+            table.InOutPlanMasterId = inOutPlanMasterId;
+            table.MaterialCode = txtMaterialCode.Text;
+            var tb = BLL.TwInOutplandetailService.GetListData(table, Grid2);
+            Grid2.DataSource = tb;
+            Grid2.DataBind();
         }
+
         /// <summary>
         /// 绑定数据
         /// </summary>
@@ -76,18 +70,31 @@ namespace FineUIPro.Web.CLGL
             Grid2.DataSource = null;
             Grid2.DataBind();
         }
-        private void BindDetailGrid(string inOutPlanMasterId)
+
+        private void InitDrpList()
         {
-            Model.Tw_InOutDetailOutput table = new Model.Tw_InOutDetailOutput();
+            this.ddlPageSize.SelectedValue = this.Grid1.PageSize.ToString();
-            table.InOutPlanMasterId = inOutPlanMasterId;
+            drpWarehouse.DataTextField = "Text";
-            table.MaterialCode = txtMaterialCode.Text; 
+            drpWarehouse.DataValueField = "Value";
-            var tb = BLL.TwInOutplandetailService.GetListData(table, Grid2); 
+            drpWarehouse.DataSource = BLL.DropListService.HJGL_WarehouseCode();
-            Grid2.DataSource = tb;
+            drpWarehouse.DataBind();
-            Grid2.DataBind(); 
+            Funs.FineUIPleaseSelect(this.drpWarehouse);
+            drpTypeInt.DataTextField = "Key";
+            drpTypeInt.DataValueField = "Value";
+            drpTypeInt.DataSource = BLL.TwConst.TypeIntMap.Where(x => x.Key.Contains("入库"));
+            drpTypeInt.DataBind();
+            Funs.FineUIPleaseSelect(this.drpTypeInt);
+            drpStates.DataTextField = "Key";
+            drpStates.DataValueField = "Value";
+            drpStates.DataSource = BLL.TwConst.StateMap;
+            drpStates.DataBind();
+            Funs.FineUIPleaseSelect(this.drpStates);
         }
-        #endregion
+
+        #endregion 绑定数据
 
         #region GV 数据操作
+
         /// <summary>
         /// 过滤表头
         /// </summary>
@@ -98,6 +105,17 @@ namespace FineUIPro.Web.CLGL
         //    this.BindGrid();
         //}
 
+        /// <summary>
+        /// 分页显示条数下拉框
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
+            this.BindGrid();
+        }
+
         /// <summary>
         /// 分页
         /// </summary>
@@ -109,6 +127,15 @@ namespace FineUIPro.Web.CLGL
             this.BindGrid();
         }
 
+        protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+        {
+            if (e.RowIndex >= 0)
+            {
+                string ID = Grid1.DataKeys[e.RowIndex][0].ToString();
+                BindDetailGrid(ID);
+            }
+        }
+
         /// <summary>
         /// 排序
         /// </summary>
@@ -120,72 +147,18 @@ namespace FineUIPro.Web.CLGL
             this.Grid1.SortField = e.SortField;
             this.BindGrid();
         }
-        protected void Grid1_RowClick(object sender, GridRowClickEventArgs e)
+
+        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
         {
-            if (e.RowIndex >= 0)
+            if (e.CommandName == "btnInPlanMasterPrint")
             {
-                string ID = Grid1.DataKeys[e.RowIndex][0].ToString();
+                Print(e.RowID);
-                BindDetailGrid(ID);
             }
         }
-        /// <summary>
+
-        /// 分页显示条数下拉框
+        #endregion GV 数据操作
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void ddlPageSize_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            this.Grid1.PageSize = Convert.ToInt32(this.ddlPageSize.SelectedValue);
-            this.BindGrid();
-        }
-        #endregion
 
         #region 数据编辑事件
-        protected void btnSearch_Click(object sender, EventArgs e)
-        {
-            BindGrid();
-        }
-
-
-        /// <summary>
-        /// 新增
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnImport_Click(object sender, EventArgs e)
-        {
-            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterDataIn.aspx?", "导入 - ")));
-        }
-
-        /// <summary>
-        /// 编辑按钮
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void btnEdit_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-            string ID = Grid1.SelectedRowID;
-            var model = BLL.TwInOutplanmasterService.GetById(ID);
-            if (model != null) ///已上报时不能删除
-            {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", ID, "编辑 - ")));
-            }
-        }
-
-        /// <summary>
-        /// Grid行双击事件
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
-        {
-            this.btnEdit_Click(null, null);
-        }
 
         /// <summary>
         /// 批量删除
@@ -212,10 +185,70 @@ namespace FineUIPro.Web.CLGL
                         ShowNotify("删除数据成功!", MessageBoxIcon.Success);
                     }
                 }
-
-                
             }
         }
+
+        /// <summary>
+        /// 编辑按钮
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnEdit_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string ID = Grid1.SelectedRowID;
+            var model = BLL.TwInOutplanmasterService.GetById(ID);
+            if (model != null) ///已上报时不能删除
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", ID, "编辑 - ")));
+            }
+        }
+
+        protected void btnGenInMaster_Click(object sender, EventArgs e)
+        {
+            if (Grid1.SelectedRowIndexArray.Length == 0)
+            {
+                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
+                return;
+            }
+            string planId = Grid1.SelectedRowID;
+            var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
+            if (planMaster.State != (int)TwConst.State.已审核)
+            {
+                Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
+                return;
+            }
+            else
+            {
+                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
+            }
+            //if ( planMaster.State != (int)TwConst.State.已审核)
+            //{
+            //    Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
+            //    return;
+            //}
+            //else
+            //{
+            //    TwInputmasterService.GenInMasterByPlanId(planId);
+            //    BindGrid();
+            //    ShowNotify("生成入库单成功！", MessageBoxIcon.Success);
+            //}
+        }
+
+        /// <summary>
+        /// 新增
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void btnImport_Click(object sender, EventArgs e)
+        {
+            PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterDataIn.aspx?", "导入 - ")));
+        }
+
         protected void btnPassMaster_OnClick(object sender, EventArgs e)
         {
             if (Grid1.SelectedRowIndexArray.Length == 0)
@@ -239,39 +272,6 @@ namespace FineUIPro.Web.CLGL
                 ShowNotify("审核通过！", MessageBoxIcon.Success);
                 BindGrid();
             }
-
-        }
-        protected void btnGenInMaster_Click(object sender, EventArgs e)
-        {
-            if (Grid1.SelectedRowIndexArray.Length == 0)
-            {
-                Alert.ShowInTop("请至少选择一条记录！", MessageBoxIcon.Warning);
-                return;
-            }
-            string planId = Grid1.SelectedRowID;
-            var planMaster = BLL.TwInOutplanmasterService.GetById(planId);
-            if (planMaster.State != (int)TwConst.State.已审核)
-            {
-                Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
-                return;
-            }
-            else
-            {
-                PageContext.RegisterStartupScript(Window1.GetShowReference(String.Format("InPlanMasterEdit.aspx?Id={0}", Grid1.SelectedRowID, "编辑 - ")));
-
-            }
-                //if ( planMaster.State != (int)TwConst.State.已审核)
-                //{
-                //    Alert.ShowInTop("请选择有效的计划！", MessageBoxIcon.Warning);
-                //    return;
-                //}
-                //else
-                //{
-                //    TwInputmasterService.GenInMasterByPlanId(planId);
-                //    BindGrid();
-                //    ShowNotify("生成入库单成功！", MessageBoxIcon.Success);
-                //}
-
         }
 
         protected void btnRevokeGenInMaster_Click(object sender, EventArgs e)
@@ -294,11 +294,27 @@ namespace FineUIPro.Web.CLGL
                 BindGrid();
                 ShowNotify("撤销入库单成功！", MessageBoxIcon.Success);
             }
-    
         }
-        #endregion
+
+        protected void btnSearch_Click(object sender, EventArgs e)
+        {
+            BindGrid();
+        }
+
+        /// <summary>
+        /// Grid行双击事件
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        protected void Grid1_RowDoubleClick(object sender, GridRowClickEventArgs e)
+        {
+            this.btnEdit_Click(null, null);
+        }
+
+        #endregion 数据编辑事件
 
         #region 关闭弹出窗
+
         /// <summary>
         /// 关闭弹出窗
         /// </summary>
@@ -308,9 +324,11 @@ namespace FineUIPro.Web.CLGL
         {
             BindGrid();
         }
-        #endregion
+
+        #endregion 关闭弹出窗
 
         #region 获取权限按钮
+
         /// <summary>
         /// 获取按钮权限
         /// </summary>
@@ -342,9 +360,11 @@ namespace FineUIPro.Web.CLGL
                 }
             }
         }
-        #endregion        
+
+        #endregion 获取权限按钮
 
         #region 导出按钮
+
         /// 导出按钮
         /// </summary>
         /// <param name="sender"></param>
@@ -399,21 +419,18 @@ namespace FineUIPro.Web.CLGL
             return sb.ToString();
         }
 
-        #endregion
+        #endregion 导出按钮
 
-        protected void Grid1_RowCommand(object sender, GridCommandEventArgs e)
+        protected void txtMaterialCode_OnTextChanged(object sender, EventArgs e)
         {
-            if (e.CommandName == "btnInPlanMasterPrint")
+            BindDetailGrid(Grid1.SelectedRowID);
-            {
-                Print(e.RowID);
-            }
         }
+
         private void Print(string Id)
         {
             BLL.FastReportService.ResetData();
             if (string.IsNullOrEmpty(Id))
             {
-
                 ShowNotify("请选择要打印的项", MessageBoxIcon.Warning);
                 return;
             }
@@ -427,7 +444,6 @@ namespace FineUIPro.Web.CLGL
             List<Model.Tw_PrintDetail> tw_PrintDetails = new List<Model.Tw_PrintDetail>();
             Model.Tw_PrintMaster printMaster = new Model.Tw_PrintMaster
             {
-
                 ReqUnitName = result.ReqUnitName,
                 CusBillCode = result.CusBillCode,
                 CreateDate = result.CreateDate.Value.ToString("yyyy-MM-dd"),
@@ -515,13 +531,7 @@ namespace FineUIPro.Web.CLGL
             if (File.Exists(rootPath + initTemplatePath))
             {
                 PageContext.RegisterStartupScript(Window2.GetShowReference(String.Format("~/Controls/Fastreport.aspx?ReportPath={0}", rootPath + initTemplatePath)));
-
+            }
-            }
-        }
-
-        protected void txtMaterialCode_OnTextChanged(object sender, EventArgs e)
-        {
-            BindDetailGrid(Grid1.SelectedRowID);
         }
     }
 }