change -修改扫描入库界面，收料通知单和已入库数量都显示，在入库时入库数量不能大于这两个之和。

src/Khd.Core.Domain/Models/MesPurchaseReceiveBill.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Linq;
-namespace Models
+namespace Khd.Core.Domain.Models
 {
     /// <summary>
     /// 采购收料通知单;从ERP同步过来的信息，需要与物料信息关联，需要确认接口同步过来的信息内容
@@ -38,21 +38,21 @@ namespace Models
         /// 默认值:
         ///</summary>
         [Column("bill_no")]
-        public string? Bill_no  { get; set;  } 
+        public string Bill_no { get; set; }
 
         /// <summary>
         /// 备  注:采购订单编号;对应FOrderBillNo
         /// 默认值:
         ///</summary>
         [Column("po_no")]
-        public string? Po_no  { get; set;  } 
+        public string Po_no { get; set; }
 
         /// <summary>
         /// 备  注:单据状态;FDocumentStatus
         /// 默认值:
         ///</summary>
         [Column("document_status")]
-        public string? Document_status  { get; set;  } 
+        public string Document_status { get; set; }
 
         /// <summary>
         /// 备  注:ERP物料ID;FMaterialId
@@ -73,21 +73,21 @@ namespace Models
         /// 默认值:
         ///</summary>
         [Column("material_name")]
-        public string? Material_name  { get; set;  } 
+        public string Material_name { get; set; }
 
         /// <summary>
         /// 备  注:源单内码;对应FDetailEntity_Link_FSBillId
         /// 默认值:
         ///</summary>
         [Column("fs_bill_id")]
-        public string? Fs_bill_id  { get; set;  } 
+        public string Fs_bill_id { get; set; }
 
         /// <summary>
         /// 备  注:源单分录内码;对应FDetailEntity_Link_FSId
         /// 默认值:
         ///</summary>
         [Column("fs_id")]
-        public string? Fs_id  { get; set;  } 
+        public string Fs_id { get; set; }
 
         /// <summary>
         /// 备  注:实到数量;对应FActlandQty
@@ -129,7 +129,7 @@ namespace Models
         /// 默认值:
         ///</summary>
         [Column("tond_base")]
-        public string? Tond_base  { get; set;  } 
+        public string Tond_base { get; set; }
 
         /// <summary>
         /// 备  注:单价;FPRICE
@@ -150,14 +150,14 @@ namespace Models
         /// 默认值:
         ///</summary>
         [Column("remark")]
-        public string? Remark  { get; set;  } 
+        public string Remark { get; set; }
 
         /// <summary>
         /// 备  注:创建人
         /// 默认值:
         ///</summary>
         [Column("create_by")]
-        public string? Create_by  { get; set;  } 
+        public string Create_by { get; set; }
 
         /// <summary>
         /// 备  注:创建时间
@@ -171,7 +171,7 @@ namespace Models
         /// 默认值:
         ///</summary>
         [Column("update_by")]
-        public string? Update_by  { get; set;  } 
+        public string Update_by { get; set; }
 
         /// <summary>
         /// 备  注:更新时间

src/Khd.Core.EntityFramework/DefaultDbContext.cs

@@ -2,7 +2,6 @@
 using Khd.Core.Domain.Dto.agv;
 using Khd.Core.Domain.Models;
 using Microsoft.EntityFrameworkCore;
-using Models;
 
 namespace Khd.Core.EntityFramework
 {

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

@@ -2154,8 +2154,10 @@
                                                     <TextBlock Text="扫描条码号:" Grid.Row="2" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
                                                     <TextBlock Text="物料名称:" Grid.Row="3" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
                                                     <TextBlock Text="物料规格:" Grid.Row="4" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
-                                                    <TextBlock Text="收料通知单数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
+                                                    <TextBlock Text="收料单数量/已入库数量:" Grid.Row="5" Grid.Column="0" Grid.ColumnSpan="3" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
-                                                    <TextBlock x:Name="orderNumText" Grid.Column="2"  Grid.Row="5"  FontSize="60" Grid.ColumnSpan="3" Width="400" Height="100"   Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/>
+                                                    <TextBlock x:Name="orderNumText" Grid.Column="3"  Grid.Row="5"  FontSize="60" Grid.ColumnSpan="1" Width="260" Height="100"   Foreground="White" HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0,30,0,0"/>
+                                                    <TextBlock Text="/" Grid.Column="4"  Grid.Row="5"  FontSize="75" Grid.ColumnSpan="1" Width="50" Height="100"   Foreground="White" HorizontalAlignment="Center" VerticalAlignment="Center" Margin="0,10,0,0"/>
+                                                    <TextBlock x:Name="stockNumText" Grid.Column="5"  Grid.Row="5"  FontSize="60" Grid.ColumnSpan="1" Width="260" Height="100"   Foreground="White" HorizontalAlignment="Left" VerticalAlignment="Center" Margin="0,30,0,0"/>
                                                     <TextBlock Text="入库数量:" Grid.Row="6" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />
                                                     <TextBlock Text="单位:" Grid.Row="6" Grid.Column="3" Grid.ColumnSpan="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" Width="172" />
                                                     <TextBlock Text="备注信息:" Grid.Row="7" Grid.Column="0" Grid.ColumnSpan="2" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="75" />

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

@@ -2263,7 +2263,8 @@ namespace Khd.Core.Wpf.Form
                     }
                     decimal amount = decimal.Parse(txtInScan.Text);
                     decimal orderAmount = decimal.Parse(orderNumText.Text);
-                    if (amount > orderAmount)
+                    decimal stockAmount = decimal.Parse(stockNumText.Text);
+                    if (amount + stockAmount > orderAmount)//输入数量与库存数之和不能大于收料通知单数量
                     {
                         HandyControl.Controls.MessageBox.Error("入库数量不能超过收料通知单数量");
                         return;
@@ -2702,6 +2703,12 @@ namespace Khd.Core.Wpf.Form
                                 {
                                     orderNumText.Text = "无收料通知单";
                                 }
+                                //查找现有库存
+                                var rawStock = dbContext.WmsRawStock.FirstOrDefault(x => x.materialId == material.materialId);
+                                if (rawStock != null)
+                                {
+                                    stockNumText.Text = rawStock.totalAmount.ToString();
+                                }
 
                                 //显示单位信息
                                 var mesBaseUnitInfo = dbContext.MesBaseUnitInfo.FirstOrDefault(t => t.ErpId == mesBaseMaterialInfo.MaterialUnitId);