Merge branch 'master' of https://gitee.com/cquni-wcs/wcs

货架标准上位机/ViewModels/MatInventoryDetailViewModel.cs

@@ -77,6 +77,14 @@ namespace 货架标准上位机.ViewModel
             }
         }
 
+        private string shelfCode;
+        public string ShelfCode
+        {
+            get => shelfCode;
+            set { SetProperty(ref shelfCode, value); }
+        }
+
+
         /// <summary>
         /// 物料编码
         /// </summary>
@@ -207,6 +215,8 @@ namespace 货架标准上位机.ViewModel
                     MatCode = MatCode,
                     StoreCode = StoreCode,
 
+                    ShelfCode = ShelfCode,
+
                     UserName = LocalStatic.CurrentUser,
                     DeviceType = LocalFile.Config.DeviceType,
                     PageNumber = CurrentPage,

货架标准上位机/Views/MatInventoryDetailView.xaml

@@ -43,6 +43,13 @@
                               FontSize="18" 
                               IsEditable="True"/>
 
+                    <TextBlock  Grid.Row="0" Grid.Column="2" Margin="5"
+                             VerticalAlignment="Center" HorizontalAlignment="Right" 
+                             Text="货架编码：" FontSize="18" ></TextBlock>
+                    <TextBox  Grid.Row="0" Grid.Column="3" Text="{Binding ShelfCode}"
+                             VerticalAlignment="Center" HorizontalAlignment="Left" 
+                             FontSize="18" MinWidth="120" ></TextBox>
+
                     <TextBlock Grid.Row="1" Grid.Column="0" Margin="5"
                         VerticalAlignment="Center" HorizontalAlignment="Right" 
                         Text="物料编码：" FontSize="18" ></TextBlock>