From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码,ERP接口,MES接口优化,WMS业务优化等
---
项目代码/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs | 32 +++++++++++---------------------
1 files changed, 11 insertions(+), 21 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
index 52c9f66..8b39be4 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServices/WIDESEA_Model/Models/Inbound/Dt_PurchaseOrder.cs"
@@ -10,9 +10,9 @@
namespace WIDESEA_Model.Models
{
/// <summary>
- /// 閲囪喘鍗�
+ /// ERP浜屾湡閲囪喘鍗�
/// </summary>
- [SugarTable(nameof(Dt_PurchaseOrder), "閲囪喘鍗�"), ModelValidate]
+ [SugarTable(nameof(Dt_PurchaseOrder), "ERP浜屾湡閲囪喘鍗�"), ModelValidate]
public class Dt_PurchaseOrder : BaseEntity
{
/// <summary>
@@ -22,23 +22,20 @@
public int Id { get; set; }
/// <summary>
+ /// 浠撳簱缂栧彿
+ /// </summary>
+ [SugarColumn(IsNullable = false , ColumnDescription = "浠撳簱缂栧彿")]
+ public int WarehouseId { get; set; }
+
+ /// <summary>
/// 閲囪喘鍗曞彿
/// </summary>
- [PropertyValidate("閲囪喘鍗曞彿", NotNullAndEmpty = true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "閲囪喘鍗曞彿")]
public string PurchaseOrderNo { get; set; }
/// <summary>
- /// 鍗曟嵁绫诲瀷(S:鏍囧噯鍏ュ簱銆乂:瀵勫敭琛ョ粰鍏ュ簱)
- /// </summary>
- [PropertyValidate("鍗曟嵁绫诲瀷", NotNullAndEmpty = true, Check = new[] { "S", "V" })]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁绫诲瀷")]
- public string PurchaseOrderType { get; set; }
-
- /// <summary>
/// 渚涘簲鍟嗙紪鍙�
/// </summary>
- [PropertyValidate("渚涘簲鍟嗙紪鍙�", NotNullAndEmpty = true)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "渚涘簲鍟嗙紪鍙�")]
public string SupplierCode { get; set; }
@@ -47,7 +44,7 @@
/// </summary>
[PropertyValidate("閲囪喘鏁伴噺", MinValue = 0, IsContainMinValue = false)]
[SugarColumn(IsNullable = false, ColumnDescription = "閲囪喘鏁伴噺")]
- public float OrderQuantity { get; set; }
+ public decimal OrderQuantity { get; set; }
/// <summary>
/// 閲囪喘鍗曠姸鎬�
@@ -56,22 +53,15 @@
public int PurchaseOrderStatus { get; set; }
/// <summary>
- /// 涓嬪崟鏃ユ湡
- /// </summary>
- [PropertyValidate("涓嬪崟鏃ユ湡", NotNullAndEmpty = true)]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "涓嬪崟鏃ユ湡")]
- public string OrderDate { get; set; }
-
- /// <summary>
/// 澶囨敞
/// </summary>
[SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
/// <summary>
- /// 鐗╂枡鍒楄〃
+ /// 閲囪喘鍗曟槑缁�
/// </summary>
- [PropertyValidate("鐗╂枡鍒楄〃", NotNullAndEmpty = true), Navigate(NavigateType.OneToMany, nameof(Dt_PurchaseOrderDetail.PurchaseOrderId), nameof(Id))]
+ [Navigate(NavigateType.OneToMany, nameof(Dt_PurchaseOrderDetail.PurchaseOrderId), nameof(Id))]
public List<Dt_PurchaseOrderDetail> Details { get; set; }
}
}
--
Gitblit v1.9.3