20240726

src/Khd.Core.Wcs/Wcs/CreateTaskByRecord.cs

@@ -2157,6 +2157,8 @@ namespace Khd.Core.Wcs.Wcs
                                                     dbContext.Add(wcsTask);
                                                     dbContext.Update(item);
                                                     dbContext.Update(stock);
+                                                    WcsTaskLog wcsTaskLog1 = CoreMapper.Map<WcsTaskLog>(wcsTask);
+                                                    dbContext.Add(wcsTaskLog1);
                                                     dbContext.SaveChanges();
                                                 }
 

src/Khd.Core.Wpf/Form/FormBoardT.xaml

@@ -1983,29 +1983,40 @@
                                                                 <DataGridTextColumn
                                                                     Header="物料批次"
                                                                     Binding="{Binding materialBatch}"
+                                                                    ElementStyle="{StaticResource dgCell}"
                                                                     Width="5*"
                                                                     />
                                                                 <DataGridTextColumn
                                                                     Header="销售订单"
                                                                     Binding="{Binding saleOrderId}"
+                                                                    ElementStyle="{StaticResource dgCell}"
                                                                     Width="*"
                                                                     />
                                                                 <DataGridTextColumn
                                                                      Header="箱体携带数量"
                                                                      Binding="{Binding thisOutAmount}"
+                                                                     ElementStyle="{StaticResource dgCell}"
                                                                      Width="2*"
                                                                      />
                                                                 <DataGridTextColumn
                                                                     Header="申请数量"
                                                                     Binding="{Binding outstockAmount}"
+                                                                    ElementStyle="{StaticResource dgCell}"
                                                                     Width="2*"
                                                                     />
                                                                
                                                                 <DataGridTextColumn
                                                                     Header="已出数量"
                                                                     Binding="{Binding realOutstockAmount}"
+                                                                    ElementStyle="{StaticResource dgCell}"
                                                                     Width="2*"
                                                                     />
+                                                                <DataGridTextColumn
+                                                                    Header="是否出完"
+                                                                    Binding="{Binding isSendOver}"
+                                                                    Width="2*"
+                                                                    ElementStyle="{StaticResource dgCell}"
+                                                                    />
                                                             </DataGrid.Columns>
                                                             <DataGrid.CellStyle>
                                                                 <Style TargetType="{x:Type DataGridCell}">
@@ -2420,8 +2431,7 @@
                                         </StackPanel>
                                     </StackPanel>
                                 </TabItem>
-                                <TabItem 
+                                <TabItem x:Name="AgvManager" Header="Agv信息" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="100"  Margin="5" >
-                                    x:Name="AgvManager" Header="Agv信息" Style="{StaticResource DefaultItem}"  FontSize="25" HorizontalContentAlignment="Center" VerticalContentAlignment="Center" Background="#213269"  Foreground="White" Width="160" Height="100"  Margin="5" >
                                     <DataGrid 
                                         x:Name="AgvDataGrid"
                                         AlternationCount="2"

src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs

@@ -319,7 +319,8 @@ namespace Khd.Core.Wpf.Form
                                               saleOrderId = b.saleOrderId,
                                               outstockAmount = a.outstockAmount,
                                               realOutstockAmount = a.realOutstockAmount,
-                            thisOutAmount=b.thisOutAmount
+                                              thisOutAmount = b.thisOutAmount,
+                                              isSendOver = outstockAmount <= (realOutstockAmount + thisOutAmount) ? "已出完" : "未出完"
                                           };
                         Dispatcher.Invoke(() =>
                         {