1

BBWY.Client/Models/APIModel/Request/ConsumableRequest.cs

@@ -64,5 +64,9 @@ namespace BBWY.Client.Models.APIModel.Request
         /// 备注
         /// </summary>
         public string Remark { get; set; }
+        /// <summary>
+        /// 耗材归属
+        /// </summary>
+        public ConsumableType? ConsumableType { get; set; }
     }
 }

BBWY.Client/Models/APIModel/Request/CreateTaskRequest.cs

@@ -109,5 +109,9 @@ namespace BBWY.Client.Models.APIModel.Request
         public Worry IsWorry { get; set; }
         public string OrderId { get; set; }
         public Platform Platform { get;  set; }
+
+        public bool NeedBar { get;set; }
+
+        public bool NeedCer { get; set; }
     }
 }

BBWY.Client/Models/APIModel/Response/PackTask/ProductSkuResponse.cs

@@ -126,6 +126,9 @@ namespace BBWY.Client.Models.APIModel.Response.PackTask
         public int Availability { get; set; }
 
 
+        public bool NeedBar { get; set; }
+
+        public bool NeedCer { get; set; }
     }
 
 

BBWY.Client/Models/Enums.cs

@@ -395,4 +395,11 @@
     {
         待发布 = 0, 打包中 = 1, 已完成 = 2
     }
+    public enum ConsumableType
+    {
+        箱子 = 0,
+        气泡纸 = 1,
+        胶带 = 2,
+        其他 = 3
+    }
 }

BBWY.Client/Models/PackTask/ConsumableModel.cs

@@ -5,6 +5,7 @@ using BBWY.Client.Views.PackTask;
 using BBWY.Common.Models;
 using GalaSoft.MvvmLight.Command;
 using HandyControl.Controls;
+using NPOI.Util;
 using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
@@ -18,6 +19,18 @@ namespace BBWY.Client.Models.PackTask
 {
     public class ConsumableModel : BaseVM, IDenpendency
     {
+        public ObservableCollection<string> consumableTypeList = new ObservableCollection<string>()
+        {
+            "箱子", "气泡纸", "胶带", "其他"
+        };
+        public ObservableCollection<string> ConsumableTypeList { get => consumableTypeList; set { Set(ref consumableTypeList, value); } }
+
+        private ConsumableType? consumableType;
+        public ConsumableType? ConsumableType
+        { get => consumableType; set { Set(ref consumableType, value); } }
+
+
+
         public ConsumableService consumableService;
         public ICommand EditConsumableCommand { get; set; }
         public ICommand DeletedConsumableCommand { get; set; }
@@ -59,7 +72,8 @@ namespace BBWY.Client.Models.PackTask
                     Price = Price.Value,
                     Remark = Remark,
                     Weigth = Weigth,
-                    Width = Width
+                    Width = Width,
+                     ConsumableType= ConsumableType,
                 });
 
             }
@@ -74,7 +88,8 @@ namespace BBWY.Client.Models.PackTask
                     Price = Price.Value,
                     Remark = Remark,
                     Weigth = Weigth,
-                    Width = Width
+                    Width = Width,
+                    ConsumableType = ConsumableType,
                 });
 
             }
@@ -91,13 +106,14 @@ namespace BBWY.Client.Models.PackTask
             }
             else
             {
+                if(res!=null)
                 new TipsWindow(res.Msg).Show();
             }
         }
 
         public void DeletedConsumable(ObservableCollection<ConsumableModel> list)
         {
-            MessageBoxResult result =System.Windows. MessageBox.Show("是否删除?", "提示",
+            MessageBoxResult result = System.Windows.MessageBox.Show("是否删除?", "提示",
                                              MessageBoxButton.YesNo,
                                              MessageBoxImage.Warning);
             if (result != MessageBoxResult.Yes) return;
@@ -116,15 +132,20 @@ namespace BBWY.Client.Models.PackTask
 
         public void EditConsumable()
         {
-            EditConsumable add = new EditConsumable(new ConsumableModel(consumableService) { 
-             Heigth=this.Heigth, Length=this.Length,
-              Id=this.Id, Name=this.Name, Weigth=this.Weigth,
-               Remark = this.Remark,
-               Width = this.Width ,
-                Price = this.Price 
-             
+            EditConsumable add = new EditConsumable(new ConsumableModel(consumableService)
+            {
+                Heigth = this.Heigth,
+                Length = this.Length,
+                Id = this.Id,
+                Name = this.Name,
+                Weigth = this.Weigth,
+                Remark = this.Remark,
+                Width = this.Width,
+                Price = this.Price,
+                ConsumableType = this.ConsumableType,
+
             });
-          
+
             add.Show();
         }
 

BBWY.Client/Models/PackTask/ShopTotal.cs

@@ -62,6 +62,33 @@ namespace BBWY.Client.Models.PackTask
         /// </summary>
         public string MarkMessage { get; set; }
 
+        /// <summary>
+        /// 打包单价
+        /// </summary>
+        public decimal? PackSingleFees { get; set; }
+
+        /// <summary>
+        /// 打包费用
+        /// </summary>
+        public decimal? PackAllFees { get; set; }
+
+        /// <summary>
+        /// 箱子费用
+        /// </summary>
+        public decimal? BoxConsumableFees { get; set; }
+        /// <summary>
+        /// 气泡纸耗材费
+        /// </summary>
+        public decimal? AirConsumableFees { get; set; }
+        /// <summary>
+        /// 胶带耗材费
+        /// </summary>
+        public decimal? TapeConsumableFees { get; set; }
+        /// <summary>
+        /// 其他耗材费
+        /// </summary>
+        public decimal? OtherConsumableFees { get; set; }
+
         public override string ToString()
         {
             return $"{TaskId},{CreateTime.ToString("yyyy-MM-dd")},{IsSettle},{DepartmentName},{ShopName}" +

BBWY.Client/ViewModels/PackTask/ConsumableViewModel.cs

@@ -106,7 +106,8 @@ namespace BBWY.Client.ViewModels.PackTask
                                     Price = item.Price,
                                     Remark = item.Remark,
                                     Weigth = item.Weigth,
-                                    Width = item.Width
+                                    Width = item.Width,
+                                     ConsumableType = item.ConsumableType,
 
                                 });
                             });

BBWY.Client/ViewModels/PackTask/PublishTaskViewModel.cs

@@ -53,6 +53,11 @@ namespace BBWY.Client.ViewModels.PackTask
         "需要", "不需要" };
         public ObservableCollection<string> IsNeedBarCodeList { get => isNeedBarCodeList; set { Set(ref isNeedBarCodeList, value); } }
 
+        private ObservableCollection<string> isNeedCerList = new ObservableCollection<string> {
+        "需要", "不需要" };
+        public ObservableCollection<string> IsNeedCerList { get => isNeedCerList; set { Set(ref isNeedCerList, value); } }
+
+
         private ObservableCollection<string> certificatePositionList = new ObservableCollection<string> {
                  "无","外部包装","产品包装"
              };
@@ -180,7 +185,7 @@ namespace BBWY.Client.ViewModels.PackTask
             {
 
                 Set(ref isSetBarCode, value);
-                IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
+               // IsNeedBarCode = IsSetBarCode ? Need.不需要 : Need.需要;
             }
         }
 
@@ -194,7 +199,7 @@ namespace BBWY.Client.ViewModels.PackTask
             {
 
                 Set(ref isSetCertificate, value);
-                IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
+               //IsNeedCertificateModel = IsSetCertificate ? Need.不需要 : Need.需要;
             }
         }
         private string setSpuCerStatus;
@@ -325,6 +330,11 @@ namespace BBWY.Client.ViewModels.PackTask
             {
                 return;
             }
+            if (TaskId>0&&string.IsNullOrEmpty(SpuId))//修改界面刷新配置数据
+            {
+                SearchSku(SkuId);
+            }
+
             if (BarCodeModel == null)
             {
                 BarCodeModel = new BarCodeModel();
@@ -425,7 +435,6 @@ namespace BBWY.Client.ViewModels.PackTask
                 Logo = skuResponse.Data[0].Logo.Replace("80x80", "200x200");
                 SkuName = skuResponse.Data[0].Title;
 
-
                 SpuId = skuResponse.Data[0].ProductId;
 
                 productApiResponse = productService.GetProductList(skuResponse.Data[0].ProductId, string.Empty, string.Empty, 1);
@@ -443,12 +452,42 @@ namespace BBWY.Client.ViewModels.PackTask
 
                 }
                 var productSku = packTaskService.GetProductSku(skuid);
-                if (productSku == null || !productSku.Success)
+                if (productSku == null || !productSku.Success||productSku.Data==null)
+                    return;
+                BrandName = productSku.Data.BrandName;
+                CertificateModel = productSku.Data.Cers;
+                if (CertificateModel == null)
                 {
+                    CertificateModel = new CertificateModel[] {
+                    new CertificateModel{ }
+                    };
+                    
 
-                    return;
                 }
+                foreach (var item in CertificateModel)
+                {
+                    item.Brand = Brand;
+                    if (!string.IsNullOrEmpty(BrandName))
+                        item.BrandName = BrandName;
+                    item.ProductNo = ProductNo;
+                    item.SkuId = skuid;
+                }
+                BarCodeModel = productSku.Data.BarCodeModel;
+                if (BarCodeModel == null)
+                {
+                    BarCodeModel = new BarCodeModel();
+                }
+                BarCodeModel.Brand = Brand;
+                if (!string.IsNullOrEmpty(BrandName))
+                    BarCodeModel.BrandName = BrandName;
+                BarCodeModel.ProductNo = ProductNo;
+                BarCodeModel.SkuId = skuid;
+                BarCodeModel.SkuName = SkuName;
+
 
+                IsNeedBarCode = Need.需要;
+                IsSetBarCode = true;
+                IsSetCertificate = true;
                 if (productSku.Data.PackConfig != null)
                 {
                     var config = productSku.Data.PackConfig;
@@ -461,6 +500,11 @@ namespace BBWY.Client.ViewModels.PackTask
                     CertificatePosition = config.CertificatePosition == null ? CertificatePosition.无 : (CertificatePosition)config.CertificatePosition.Value;
                     // Increment1 = config.Increment1;
                     string[] increateDatas = config.Increment1.Split(',');
+                    IsNeedBarCode = config.NeedBar ? Need.需要 : Need.不需要;
+                    IsNeedCertificateModel = config.NeedCer ? Need.需要 : Need.不需要;
+
+                    IsSetBarCode = !config.NeedBar;
+                    IsSetCertificate =!config.NeedCer;
 
                     bool isSelected = false;
                     foreach (var item in increates)
@@ -481,42 +525,6 @@ namespace BBWY.Client.ViewModels.PackTask
                     }
 
                 }
-
-                BrandName = productSku.Data.BrandName;
-
-
-                CertificateModel = productSku.Data.Cers;
-                IsSetCertificate = false;
-                if (CertificateModel == null)
-                {
-                    CertificateModel = new CertificateModel[] {
-                    new CertificateModel{ }
-                    };
-                    IsSetCertificate = true;
-
-                }
-                foreach (var item in CertificateModel)
-                {
-                    item.Brand = Brand;
-                    if (!string.IsNullOrEmpty(BrandName))
-                        item.BrandName = BrandName;
-                    item.ProductNo = ProductNo;
-                    item.SkuId = skuid;
-                }
-
-                BarCodeModel = productSku.Data.BarCodeModel;
-                IsSetBarCode = false;
-                if (BarCodeModel == null)
-                {
-                    BarCodeModel = new BarCodeModel();
-                    IsSetBarCode = true;
-                }
-                BarCodeModel.Brand = Brand;
-                if (!string.IsNullOrEmpty(BrandName))
-                    BarCodeModel.BrandName = BrandName;
-                BarCodeModel.ProductNo = ProductNo;
-                BarCodeModel.SkuId = skuid;
-                BarCodeModel.SkuName = SkuName;
             }
             else
             {
@@ -525,6 +533,7 @@ namespace BBWY.Client.ViewModels.PackTask
                 return;
             }
 
+           //加载配置文件
         }
 
         public void SearSpuCer()
@@ -641,7 +650,7 @@ namespace BBWY.Client.ViewModels.PackTask
                     });
                 });
             }
-            SearchSku(SkuId);
+           // SearchSku(SkuId);
 
         }
         private void OpenSkuDetail(object param)
@@ -663,9 +672,6 @@ namespace BBWY.Client.ViewModels.PackTask
             }
 
         }
-
-
-
         private void CreateTask(object obj)
         {
             if (string.IsNullOrEmpty(SkuId))
@@ -706,12 +712,14 @@ namespace BBWY.Client.ViewModels.PackTask
                 SkuCount = SkuCount,
                 UserId = globalContext.User.Id.ToString(),
                 ShopId = globalContext.User.Shop.ShopId.ToString(),
+                 NeedBar =IsNeedBarCode==Need.需要,
+                 NeedCer =IsNeedCertificateModel==Need.需要
                  
                 //IsWorry = IsWorry
             };
             if (IsNeedBarCode == Need.需要)
             {
-                if (BarCodeModel == null || BarCodeModel.Id <= 0)
+                if (BarCodeModel == null ||IsSetBarCode|| BarCodeModel.Id <= 0)
                 {
                     new TipsWindow("请设置条形码模板").Show();
                     return;
@@ -720,7 +728,7 @@ namespace BBWY.Client.ViewModels.PackTask
             }
             if (IsNeedCertificateModel == Need.需要)
             {
-                if (CertificateModel == null || CertificateModel.Count() <= 0)
+                if (CertificateModel == null || IsSetCertificate || CertificateModel.Count() <= 0)
                 {
                     new TipsWindow("请设置合格证模板").Show();
                     return;

BBWY.Client/Views/PackTask/Consumable.xaml

@@ -65,6 +65,7 @@
                 </Grid.RowDefinitions>
                 <Grid Background="{StaticResource Border.Background}" Margin="10 0 5 0">
                     <Grid.ColumnDefinitions>
+                        <ColumnDefinition Width="100"/>
                         <ColumnDefinition Width="250"/>
                         <ColumnDefinition Width="100"/>
                         <ColumnDefinition Width="100"/>
@@ -73,14 +74,15 @@
                         <ColumnDefinition Width="170"/>
 
                     </Grid.ColumnDefinitions>
-                    <TextBlock Text="耗材品名" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="金额" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="重量" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="尺寸(cm)" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="备注" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
-                    <TextBlock Text="操作" Grid.Column="5"  Style="{StaticResource middleTextBlock}"/>
-
-                    <Border Height="1" BorderBrush="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Top" Grid.ColumnSpan="6" BorderThickness="1"/>
+                    <TextBlock Text="耗材归类" Grid.Column="0" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="耗材品名" Grid.Column="1" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="金额" Grid.Column="2" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="重量" Grid.Column="3" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="尺寸(cm)" Grid.Column="4" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="备注" Grid.Column="5" Style="{StaticResource middleTextBlock}"/>
+                    <TextBlock Text="操作" Grid.Column="6"  Style="{StaticResource middleTextBlock}"/>
+
+                    <Border Height="1" BorderBrush="{StaticResource Border.Brush}" Grid.Row="1" VerticalAlignment="Top" Grid.ColumnSpan="7" BorderThickness="1"/>
                     <Border Width="1" HorizontalAlignment="Left" Background="{StaticResource Border.Brush}"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="1"/>
@@ -89,6 +91,7 @@
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                     <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
+                    <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
                 </Grid>
                 <!--ItemsSource="{Binding OrderList}"-->
                 <ListBox x:Name="listbox_order"  Margin="10 0 5 0"
@@ -104,6 +107,7 @@
                             <Grid Width="{Binding ActualWidth,ElementName=listbox_order,Converter={StaticResource widthConverter},ConverterParameter=-0}"
                               MinHeight="60">
                                 <Grid.ColumnDefinitions>
+                                    <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="250"/>
                                     <ColumnDefinition Width="100"/>
                                     <ColumnDefinition Width="100"/>
@@ -111,9 +115,10 @@
                                     <ColumnDefinition Width="*"/>
                                     <ColumnDefinition Width="170"/>
                                 </Grid.ColumnDefinitions>
+
                                 <Grid Grid.Column="0">
                                     <TextBlock 
-                                               Text="{Binding Name}" 
+                                               Text="{Binding ConsumableType}" 
                                                TextWrapping="Wrap"
                                                VerticalAlignment="Center" HorizontalAlignment="Center"
                                                />
@@ -121,7 +126,7 @@
                                 </Grid>
                                 <Grid Grid.Column="1">
                                     <TextBlock 
-                                               Text="{Binding Price}" 
+                                               Text="{Binding Name}" 
                                                TextWrapping="Wrap"
                                                VerticalAlignment="Center" HorizontalAlignment="Center"
                                                />
@@ -129,12 +134,20 @@
                                 </Grid>
                                 <Grid Grid.Column="2">
                                     <TextBlock 
-                                               Text="{Binding Weigth}" 
+                                               Text="{Binding Price}" 
                                                TextWrapping="Wrap"
                                                VerticalAlignment="Center" HorizontalAlignment="Center"
                                                />
+
                                 </Grid>
                                 <Grid Grid.Column="3">
+                                    <TextBlock 
+                                               Text="{Binding Weigth}" 
+                                               TextWrapping="Wrap"
+                                               VerticalAlignment="Center" HorizontalAlignment="Center"
+                                               />
+                                </Grid>
+                                <Grid Grid.Column="4">
                                     <TextBlock  VerticalAlignment="Center" HorizontalAlignment="Center" 
                                                TextWrapping="Wrap"
                                                >
@@ -146,14 +159,14 @@
                                     </TextBlock>
                                 </Grid>
 
-                                <Grid Grid.Column="4" HorizontalAlignment="Center" VerticalAlignment="Center" >
+                                <Grid Grid.Column="5" HorizontalAlignment="Center" VerticalAlignment="Center" >
                                     <TextBlock  TextAlignment="Center"
                                                Text="{Binding Remark}" 
                                                 TextWrapping="Wrap"
                                                VerticalAlignment="Center" HorizontalAlignment="Center"
                                                />
                                 </Grid>
-                                <Grid Grid.Column="5">
+                                <Grid Grid.Column="6">
                                     <StackPanel Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
                                         <c:BButton Background="Transparent" Foreground="Blue" Content="编辑" Command="{Binding EditConsumableCommand}" CommandParameter="" Margin="0 0 10 0"/>
                                         <c:BButton Background="Transparent" Foreground="Blue" Content="删除" Command="{Binding DeletedConsumableCommand}"
@@ -169,7 +182,8 @@
                                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="4"/>
                                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="5"/>
                                 <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="6"/>
-                                <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="6"/>
+                                <Border Width="1" HorizontalAlignment="Right" Background="{StaticResource Border.Brush}" Grid.Column="7"/>
+                                <Border Height="1" VerticalAlignment="Bottom" Background="{StaticResource Border.Brush}"  Grid.ColumnSpan="7"/>
                             </Grid>
 
                         </DataTemplate>

BBWY.Client/Views/PackTask/EditConsumable.xaml

@@ -5,8 +5,9 @@
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:BBWY.Client.Views.PackTask"
         mc:Ignorable="d"
-        Title="TipsWindow" Height="350" Width="640"
-        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"      
+        Title="TipsWindow" Height="400" Width="640"
+        xmlns:c="clr-namespace:BBWY.Controls;assembly=BBWY.Controls"   
+       xmlns:hc="https://handyorg.github.io/handycontrol"
         xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
         xmlns:ctr="clr-namespace:BBWY.Client.Converters"
         xmlns:cmodel="clr-namespace:BBWY.Client.Models"
@@ -29,24 +30,49 @@
                 Background="{StaticResource Border.Background}">
             <TextBlock Text="添加耗材"  HorizontalAlignment="Center" VerticalAlignment="Center"/>
         </Border>
-        <Grid Grid.Row="1">
+        <StackPanel Grid.Row="1" Orientation="Vertical">
             <TextBlock Text="{Binding Id,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" Visibility="Hidden"/>
-            <TextBlock Text="耗材品名:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="33,33,0,0"/>
-            <c:BTextBox Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="180" VerticalAlignment="Top" Margin="93,30,0,0"/>
-            <TextBlock Text="金额:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="321,33,0,0"/>
-            <c:BTextBox Text="{Binding Price ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="228" VerticalAlignment="Top" Margin="353,30,0,0"/>
-            <TextBlock Text="重量:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="57,73,0,0"/>
-            <c:BTextBox Text="{Binding Weigth,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="180" VerticalAlignment="Top" Margin="93,70,0,0"/>
-            <TextBlock Text="尺寸:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="321,73,0,0"/>
-            <c:BTextBox WaterRemark="长"  Text="{Binding Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" Margin="353,70,0,0"/>
-            <c:BTextBox WaterRemark="宽" Text="{Binding Width,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" Margin="417,70,0,0"/>
-            <c:BTextBox WaterRemark="高" Text="{Binding Heigth,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" Margin="481,70,0,0"/>
-            <Label Content="cm" Width="38" Height="25" Background="{StaticResource Border.Background}" HorizontalAlignment="Left" VerticalAlignment="Top" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Margin="545,70,0,0"/>
-
-            <TextBlock Text="备注:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="57,113,0,0"/>
-            <TextBox  Text="{Binding Remark,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"   HorizontalAlignment="Left"  VerticalAlignment="Top" AcceptsReturn="True"  TextWrapping="Wrap" Height="115" Width="487"  Margin="93,110,0,0"/>
-
-        </Grid>
+            <StackPanel Orientation="Horizontal" Margin="0 20 0 0">
+                <StackPanel.Resources>
+                    <ResourceDictionary>
+                        <ResourceDictionary.MergedDictionaries>
+                            <ResourceDictionary  Source="pack://application:,,,/HandyControl;component/Themes/SkinDefault.xaml"/>
+                            <ResourceDictionary Source="pack://application:,,,/HandyControl;component/Themes/Theme.xaml"/>
+                        </ResourceDictionary.MergedDictionaries>
+                    </ResourceDictionary>
+                </StackPanel.Resources>
+                <TextBlock Text="所属分类:" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30 0 5 0" />
+
+                <Border CornerRadius="0" BorderThickness="1" BorderBrush="{StaticResource Border.Brush}">
+                    <ComboBox BorderThickness="0" Width="88"  VerticalContentAlignment="Center"  ItemsSource="{Binding ConsumableTypeList}" Text="{Binding ConsumableType}"   >
+
+                    </ComboBox>
+                </Border>
+
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Margin="0 10 0 10">
+                <TextBlock Text="耗材品名:" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30 0 5 0"/>
+                <c:BTextBox Text="{Binding Name,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="180" VerticalAlignment="Top"/>
+                <TextBlock Text="金额:" HorizontalAlignment="Left" VerticalAlignment="Center"  Margin="30 0 5 0"/>
+                <c:BTextBox Text="{Binding Price ,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="228" VerticalAlignment="Top" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal">
+                <TextBlock Text="重量:" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="55 0 5 0"/>
+                <c:BTextBox Text="{Binding Weigth,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="180" VerticalAlignment="Top" />
+                <TextBlock Text="尺寸:" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="30 0 5 0"/>
+                <c:BTextBox WaterRemark="长"  Text="{Binding Length,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}" HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" />
+                <c:BTextBox WaterRemark="宽" BorderThickness="0 1 0 1" Text="{Binding Width,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" />
+                <c:BTextBox WaterRemark="高" Text="{Binding Heigth,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  HorizontalAlignment="Left" Height="25" Width="64" VerticalAlignment="Top" />
+                <Label Content="cm" Width="38" Height="25" Background="{StaticResource Border.Background}" HorizontalAlignment="Left" VerticalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" />
+            </StackPanel>
+            <StackPanel Orientation="Horizontal" Margin="0 10 0 0">
+                <TextBlock Text="备注:" HorizontalAlignment="Left" VerticalAlignment="Top" Margin="55,5,5,0"/>
+                <TextBox  Text="{Binding Remark,Mode=TwoWay,UpdateSourceTrigger=PropertyChanged}"  VerticalAlignment="Top" AcceptsReturn="True"  TextWrapping="Wrap" Height="115" Width="471"  />
+
+            </StackPanel>
+
+
+        </StackPanel>
 
 
         <Border BorderThickness="0 1 0 0" Grid.Row="2" Height="1" VerticalAlignment="Top" BorderBrush="{StaticResource Border.Brush}"/>

BBWY.Client/Views/PackTask/PublishTaskWindow.xaml

@@ -158,7 +158,7 @@
 
                 </StackPanel>
                 <Grid Grid.Row="1">
-                    <TextBlock Text="打包配置" FontWeight="Bold" Margin="19 23 0 0" />
+                    <TextBlock Text="打包配置" FontWeight="Bold" Margin="19 23 "  HorizontalAlignment="Left" VerticalAlignment="Top"/>
                     <Grid Height="70"   Margin="20 54 20 0">
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition Width="77"/>
@@ -242,7 +242,7 @@
                             </ComboBox>
                         </Grid>
                         <Grid Grid.Row="1" Grid.Column="6" >
-                            <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedBarCodeList}"   Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
+                            <ComboBox VerticalContentAlignment="Center" BorderThickness="0" Margin="1" ItemsSource="{Binding IsNeedCerList}"   Text="{Binding IsNeedCertificateModel,Mode=TwoWay}">
 
                             </ComboBox>
                         </Grid>