diff --git a/src/Khd.Core.Domain/Models/MesPurchaseReceiveBill.cs b/src/Khd.Core.Domain/Models/MesPurchaseReceiveBill.cs
index 049dd3e..67c592c 100644
--- a/src/Khd.Core.Domain/Models/MesPurchaseReceiveBill.cs
+++ b/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
{
///
/// 采购收料通知单;从ERP同步过来的信息，需要与物料信息关联，需要确认接口同步过来的信息内容
@@ -16,177 +16,177 @@ namespace Models
/// 默认值:
///
[Key]
- [Column("receive_bill_id") ]
- public long Receive_bill_id { get; set; }
-
+ [Column("receive_bill_id")]
+ public long Receive_bill_id { get; set; }
+
///
/// 备 注:ERP的主键信息;对应FID
/// 默认值:
///
- [Column("erp_id" ) ]
- public long? Erp_id { get; set; }
-
+ [Column("erp_id")]
+ public long? Erp_id { get; set; }
+
///
/// 备 注:对应金蝶ERP收料单明细的ID;对应FDetailEntity_FEntryID
/// 默认值:
///
- [Column("fentry_id" ) ]
- public long? Fentry_id { get; set; }
-
+ [Column("fentry_id")]
+ public long? Fentry_id { get; set; }
+
///
/// 备 注:收料单据号;对应FBillNo
/// 默认值:
///
- [Column("bill_no") ]
- public string? Bill_no { get; set; }
-
+ [Column("bill_no")]
+ public string Bill_no { get; set; }
+
///
/// 备 注:采购订单编号;对应FOrderBillNo
/// 默认值:
///
- [Column("po_no") ]
- public string? Po_no { get; set; }
-
+ [Column("po_no")]
+ public string Po_no { get; set; }
+
///
/// 备 注:单据状态;FDocumentStatus
/// 默认值:
///
- [Column("document_status") ]
- public string? Document_status { get; set; }
-
+ [Column("document_status")]
+ public string Document_status { get; set; }
+
///
/// 备 注:ERP物料ID;FMaterialId
/// 默认值:
///
- [Column("material_id") ]
- public long? Material_id { get; set; }
-
+ [Column("material_id")]
+ public long? Material_id { get; set; }
+
///
/// 备 注:物料编码;对应FMaterialId.FNumber
/// 默认值:
///
- [Column("material_code") ]
- public string Material_code { get; set; } = null!;
-
+ [Column("material_code")]
+ public string Material_code { get; set; } = null!;
+
///
/// 备 注:物料名称;对应FMaterialId.FName
/// 默认值:
///
- [Column("material_name") ]
- public string? Material_name { get; set; }
-
+ [Column("material_name")]
+ public string Material_name { get; set; }
+
///
/// 备 注:源单内码;对应FDetailEntity_Link_FSBillId
/// 默认值:
///
- [Column("fs_bill_id") ]
- public string? Fs_bill_id { get; set; }
-
+ [Column("fs_bill_id")]
+ public string Fs_bill_id { get; set; }
+
///
/// 备 注:源单分录内码;对应FDetailEntity_Link_FSId
/// 默认值:
///
- [Column("fs_id") ]
- public string? Fs_id { get; set; }
-
+ [Column("fs_id")]
+ public string Fs_id { get; set; }
+
///
/// 备 注:实到数量;对应FActlandQty
/// 默认值:
///
- [Column("act_land_amount") ]
- public decimal? Act_land_amount { get; set; }
-
+ [Column("act_land_amount")]
+ public decimal? Act_land_amount { get; set; }
+
///
/// 备 注:交货数量;对应FActReceiveQty
/// 默认值:
///
- [Column("act_receive_amount") ]
- public decimal? Act_receive_amount { get; set; }
-
+ [Column("act_receive_amount")]
+ public decimal? Act_receive_amount { get; set; }
+
///
/// 备 注:审核日期;对应FApproveDate
/// 默认值:
///
- [Column("approve_date") ]
- public DateTime? Approve_date { get; set; }
-
+ [Column("approve_date")]
+ public DateTime? Approve_date { get; set; }
+
///
/// 备 注:ERP最后修改日期;对应FModifyDate
/// 默认值:
///
- [Column("erp_modify_date") ]
- public DateTime? Erp_modify_date { get; set; }
-
+ [Column("erp_modify_date")]
+ public DateTime? Erp_modify_date { get; set; }
+
///
/// 备 注:采购组织;FPurchaseOrgId
/// 默认值:
///
- [Column("purchase_org_id") ]
- public long? Purchase_org_id { get; set; }
-
+ [Column("purchase_org_id")]
+ public long? Purchase_org_id { get; set; }
+
///
/// 备 注:京源项目;F_TOND_Base
/// 默认值:
///
- [Column("tond_base") ]
- public string? Tond_base { get; set; }
-
+ [Column("tond_base")]
+ public string Tond_base { get; set; }
+
///
/// 备 注:单价;FPRICE
/// 默认值:
///
- [Column("price") ]
- public decimal? Price { get; set; }
-
+ [Column("price")]
+ public decimal? Price { get; set; }
+
///
/// 备 注:供应商ID;FSupplierId
/// 默认值:
///
- [Column("supplier_id") ]
- public long? Supplier_id { get; set; }
-
+ [Column("supplier_id")]
+ public long? Supplier_id { get; set; }
+
///
/// 备 注:备注
/// 默认值:
///
- [Column("remark") ]
- public string? Remark { get; set; }
-
+ [Column("remark")]
+ public string Remark { get; set; }
+
///
/// 备 注:创建人
/// 默认值:
///
- [Column("create_by") ]
- public string? Create_by { get; set; }
-
+ [Column("create_by")]
+ public string Create_by { get; set; }
+
///
/// 备 注:创建时间
/// 默认值:
///
- [Column("create_time") ]
- public DateTime? Create_time { get; set; }
-
+ [Column("create_time")]
+ public DateTime? Create_time { get; set; }
+
///
/// 备 注:更新人
/// 默认值:
///
- [Column("update_by") ]
- public string? Update_by { get; set; }
-
+ [Column("update_by")]
+ public string Update_by { get; set; }
+
///
/// 备 注:更新时间
/// 默认值:
///
- [Column("update_time") ]
- public DateTime? Update_time { get; set; }
-
+ [Column("update_time")]
+ public DateTime? Update_time { get; set; }
+
///
/// 备 注:预计到货日期
/// 默认值:
///
- [Column("pre_delivery_date") ]
- public DateTime? Pre_delivery_date { get; set; }
+ [Column("pre_delivery_date")]
+ public DateTime? Pre_delivery_date { get; set; }
}
-
+
}
\ No newline at end of file
diff --git a/src/Khd.Core.EntityFramework/DefaultDbContext.cs b/src/Khd.Core.EntityFramework/DefaultDbContext.cs
index cb19adf..4429913 100644
--- a/src/Khd.Core.EntityFramework/DefaultDbContext.cs
+++ b/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
{
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
index 59665b6..903d646 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml
+++ b/src/Khd.Core.Wpf/Form/FormBoardT.xaml
@@ -2154,8 +2154,10 @@
-
-
+
+
+
+
diff --git a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs b/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
index e7de880..71ad3c4 100644
--- a/src/Khd.Core.Wpf/Form/FormBoardT.xaml.cs
+++ b/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);