需求单No.1432591、【仓库客户端】的‘白条发货’点击‘配货完成’ 提示调整；2、【仓库客户端】的‘白条发货’‘鲜品发货’的左边的客户显示调整。‘白条发货’‘白条收货’‘鲜品配货’‘鲜品发货’界面中‘存货’显示调整，

B3DealerClient/BL/CarcassSaleOutBL.cs

@@ -29,7 +29,7 @@ namespace B3DealerClient.BL
       if (list.Count == 0)
         return;
       var query = new DQueryDom(new JoinAlias(typeof(CarcassSaleOut_Record)));
-      query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("DetailID"), list.Select(x => DQExpression.Value(x.ID)).ToArray()));
+      query.Where.Conditions.Add(DQCondition.InList(DQExpression.Field("DetailID"), list.Select(x => DQExpression.Value(x.DetailID)).ToArray()));
       query.Columns.Add(DQSelectColumn.Field("DetailID"));
       query.Columns.Add(DQSelectColumn.Sum("NetWeight"));
       query.Columns.Add(DQSelectColumn.Sum("SecondNumber"));

B3DealerClient/Windows/CarcassInStoreWindow_/CarcassInStoreWindow.xaml

@@ -185,7 +185,7 @@
           </DataGrid.RowStyle>
           <DataGrid.Columns>
             <DataGridTextColumn Binding="{Binding PayBill_ID}" Header="单号" Width="0.6*"/>
-            <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货" Width="1.0*"/>
+            <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货" Width="1.5*"/>
             <DataGridTextColumn Binding="{Binding Number, StringFormat=\{0:0.######\}}" Header="重量" Width="0.6*"/>
             <DataGridTextColumn Binding="{Binding SecondNumber, StringFormat=\{0:0.######\}}" Header="件数" Width="0.6*"/>
             <DataGridTextColumn Binding="{Binding AlreadyNumber ,StringFormat=\{0:0.######\}}" Header="已入库重量" Width="0.8*"/>

B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml

@@ -69,7 +69,7 @@
           <DataTemplate>
             <Button>
               <Button.Content>
-                <TextBlock Text="{Binding Name}"/>
+								<TextBlock Text="{Binding Name}" TextWrapping="Wrap"/>
               </Button.Content>
             </Button>
           </DataTemplate>
@@ -153,7 +153,7 @@
         </DataGrid.RowStyle>
         <DataGrid.Columns>
           <DataGridTextColumn Binding="{Binding ID}" Header="单号" Width="0.6*"/>
-          <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货名称" Width="1.0*"/>
+          <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货名称" Width="1.5*"/>
           <DataGridTextColumn Binding="{Binding LoadTime ,StringFormat=\{0:yyyy-MM-dd\}}" Header="出库时间" Width="0.8*"/>
           <DataGridTextColumn Binding="{Binding Number, StringFormat=\{0:0.######\}}" Header="主数量" Width="0.6*"/>
           <DataGridTextColumn Binding="{Binding SecondNumber, StringFormat=\{0:0.######\}}" Header="辅数量" Width="0.6*"/>

B3DealerClient/Windows/CarcassSaleOutWindow_/CarcassSaleOutWindow.xaml.cs

@@ -288,20 +288,25 @@ namespace B3DealerClient.Windows.CarcassSaleOutWindow_
 
       var targets = context.DmoList.Where(x => x.ID == context.Dmo.ID);
       var needConfirm = targets.Any(x => (x.AlreadyNumber ?? 0) == 0 || (x.SecondNumber ?? 0) == 0);
+			bool isShow = false;
       if (needConfirm)
       {
         var confirm = MessageBox.Show("存在未配货的明细，确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
         if (confirm != MessageBoxResult.OK)
           return;
+				isShow = true;
       }
-      var r = MessageBox.Show("确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
-      if (r != MessageBoxResult.OK)
-        return;
+			if (!isShow)
+			{
+				var r = MessageBox.Show("确认配货完成？", "配货完成确认", MessageBoxButton.OKCancel, MessageBoxImage.Question);
+				if (r != MessageBoxResult.OK)
+					return;
+			}
       CarcassSaleOutBL.FinishAssign(context.Dmo.ID);
       foreach (var item in targets)
         item.AssignFinished = true;
       context.Dmo = context.Dmo;
-      MessageBox.Show("配货完成");
+      //MessageBox.Show("配货完成");
     }
 
 		private void weightUnit_Click(object sender, RoutedEventArgs e)

B3DealerClient/Windows/FreshInStoreWindow_/FreshInStoreWindow.xaml

@@ -162,7 +162,7 @@
           </DataGrid.RowStyle>
           <DataGrid.Columns>
             <DataGridTextColumn Binding="{Binding PayBill_ID}" Header="单号" Width="0.6*"/>
-            <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货" Width="1.0*"/>
+            <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货" Width="1.5*"/>
             <DataGridTextColumn Binding="{Binding Number, StringFormat=\{0:0.######\}}" Header="重量" Width="0.6*"/>
             <DataGridTextColumn Binding="{Binding SecondNumber, StringFormat=\{0:0.######\}}" Header="件数" Width="0.6*"/>
             <DataGridTextColumn Binding="{Binding AlreadyNumber ,StringFormat=\{0:0.######\}}" Header="已入库重量" Width="0.8*"/>

B3DealerClient/Windows/FreshSaleOutWindow_/FreshSaleOutWindow.xaml

@@ -67,7 +67,7 @@
           <DataTemplate>
             <Button>
               <Button.Content>
-                <TextBlock Text="{Binding Name}"/>
+								<TextBlock Text="{Binding Name}" TextWrapping="Wrap"/>
               </Button.Content>
             </Button>
           </DataTemplate>
@@ -144,7 +144,7 @@
         </DataGrid.RowStyle>
         <DataGrid.Columns>
           <DataGridTextColumn Binding="{Binding ID}" Header="单号" Width="0.6*"/>
-          <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货名称" Width="1.0*"/>
+          <DataGridTextColumn Binding="{Binding Goods_Name}" Header="存货名称" Width="1.5*"/>
           <DataGridTextColumn Binding="{Binding LoadTime ,StringFormat=\{0:yyyy-MM-dd\}}" Header="出库时间" Width="0.8*"/>
           <DataGridTextColumn Binding="{Binding Number, StringFormat=\{0:0.######\}}" Header="主数量" Width="0.6*"/>
           <DataGridTextColumn Binding="{Binding SecondNumber, StringFormat=\{0:0.######\}}" Header="辅数量" Width="0.6*"/>