From 56827df8730c172c6c654fb78fed073ef8d694cb Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 23 十月 2025 19:22:39 +0800
Subject: [PATCH] 优化入库单处理
---
新建文件夹/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs | 78 ++++++++++++---------------------------
1 files changed, 24 insertions(+), 54 deletions(-)
diff --git "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs" "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
index 6d02591..40c9644 100644
--- "a/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
+++ "b/\346\226\260\345\273\272\346\226\207\344\273\266\345\244\271/WIDESEA_WMSServer/WIDESEA_Model/Models/SquareCabin/Dt_CabinOrder_Hty.cs"
@@ -1,4 +1,5 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -10,63 +11,32 @@
{
[SugarTable("Dt_CabinOrder_Hty", "鍏ュ簱鍗曡〃鍘嗗彶琛�")]
- public class Dt_CabinOrder_Hty : BaseEntity
+ public class Dt_CabinOrder_Hty : Dt_CabinOrder,IBaseHistoryEntity
{
-
- [SugarColumn(ColumnName = "HistoryId", IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "鍘嗗彶璁板綍涓婚敭")]
- public int HistoryId { get; set; }
-
-
- [SugarColumn(ColumnName = "Id", ColumnDescription = "鍘熶富閿�")]
- public int Id { get; set; }
-
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍏ュ簱鍗曞彿")]
- public string Order_no { get; set; }
-
-
- [SugarColumn(IsNullable = true, Length = 3, ColumnDescription = "鍏ュ簱绫诲瀷锛�1姝e父/3閫�璐�")]
- public string Order_type { get; set; }
-
-
-
- [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "渚涘簲鍟嗕唬鐮�")]
- public string Supplier_no { get; set; }
-
-
- [SugarColumn(IsNullable = true, Length = 100, ColumnDescription = "渚涘簲鍟嗗悕绉�")]
- public string Supplier_name { get; set; }
-
-
- //搴撴埧鍙�
- [SugarColumn(ColumnName = "Warehouse_no", IsNullable = true, ColumnDescription = "搴撴埧鍙�001")]
- public string Warehouse_no { get; set; }
-
- [SugarColumn(IsNullable = true, ColumnDescription = "鍏ュ簱璁拌处鏃堕棿")]
- public DateTime? Account_tiem { get; set; }
+ [Navigate(NavigateType.OneToMany, nameof(Dt_CabinOrderDetail_Hty.OrderId))]
+ public new List<Dt_CabinOrderDetail_Hty> Details { get; set; }
+ /// <summary>
+ /// 鍘熻〃涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "鍘熻〃涓婚敭")]
+ [ExporterHeader(DisplayName = "鍘熻〃涓婚敭")]
+ [SugarColumn(IsNullable = false, DefaultValue = "0", ColumnDescription = "鍘熻〃涓婚敭")]
+ public int SourceId { get; set; }
/// <summary>
- /// 涓嬫父鐘舵�� 鏂板缓锛屽紑濮嬶紝宸插畬鎴�
- /// 涓嬫父涓嬪彂锛堟柊寤猴級
- /// 璇︽儏寮�濮嬶紙寮�濮嬶級
- /// 璇︽儏鍏ㄩ儴瀹屾垚锛堝凡瀹屾垚锛屼笂浼犵粰涓婃父绯荤粺锛岀Щ鍏ュ巻鍙茶〃鍒犻櫎淇℃伅锛�
+ /// 鎿嶄綔绫诲瀷
/// </summary>
- [SugarColumn(ColumnName = "OdrderStatus", IsNullable = true, Length = 50, ColumnDescription = "琛ㄥご鐘舵��")]
- public string OdrderStatus { get; set; }
+ [ImporterHeader(Name = "鎿嶄綔绫诲瀷")]
+ [ExporterHeader(DisplayName = "鎿嶄綔绫诲瀷")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎿嶄綔绫诲瀷")]
+ public string OperateType { get; set; }
- //涓嬮潰鏄惁闇�瑕佽繖浜涘瓧娈碉紵
- //浼樺厛绾� priority
- //[SugarColumn(ColumnName ="Priority",IsNullable =true,ColumnDescription ="浼樺厛绾�")]
- //public int Priority { get; set; }
-
-
-
- //鏄惁鍙栨秷 Iscancel
- //[SugarColumn(ColumnName = "Iscancel", IsNullable = true, ColumnDescription = "鏄惁鍙栨秷(1鏄�0鍚�)")]
- //public int Iscancel { get; set; }
-
- [Navigate(NavigateType.OneToMany, nameof(Dt_CabinOrderDetail.OrderId))]
- public List<Dt_CabinOrderDetail> Details { get; set; }
-
-
+ /// <summary>
+ /// 绉诲叆鍘嗗彶鏃堕棿
+ /// </summary>
+ [ImporterHeader(Name = "绉诲叆鍘嗗彶鏃堕棿")]
+ [ExporterHeader(DisplayName = "绉诲叆鍘嗗彶鏃堕棿")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "绉诲叆鍘嗗彶鏃堕棿")]
+ public DateTime InsertTime { get; set; }
}
}
--
Gitblit v1.9.3