From 387731cab892804912e68cb91e6fb804411c4756 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 27 十月 2025 23:32:16 +0800
Subject: [PATCH] 优化与ERP出库单逻辑，增加打印程序
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs | 114 +++++++++++---------------------------------------------
1 files changed, 23 insertions(+), 91 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs"
index fd68d02..4d1a0c8 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtStockInfo.cs"
@@ -1,7 +1,9 @@
锘縰sing Magicodes.ExporterAndImporter.Core;
+using Masuit.Tools.Core.Validator;
using SqlSugar;
using System;
using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
@@ -15,120 +17,50 @@
/// <summary>
/// 涓婚敭
/// </summary>
- [ImporterHeader(Name = "涓婚敭")]
- [ExporterHeader(DisplayName = "涓婚敭")]
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
- /// 鎵樼洏缂栧彿
+ /// 鎵樼洏缂栫爜
/// </summary>
- [ImporterHeader(Name = "鎵樼洏缂栧彿")]
- [ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
public string PalletCode { get; set; }
/// <summary>
- /// 璐т綅缂栧彿
+ /// 璐т綅缂栫爜
/// </summary>
- [ImporterHeader(Name = "璐т綅ID")]
- [ExporterHeader(DisplayName = "璐т綅ID")]
- [SugarColumn(IsNullable = true, ColumnDescription = "璐т綅ID")]
- public int LocationId { get; set; }
-
- /// <summary>
- /// 璐т綅缂栧彿
- /// </summary>
- [ImporterHeader(Name = "璐т綅缂栧彿")]
- [ExporterHeader(DisplayName = "璐т綅缂栧彿")]
- [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璐т綅缂栧彿")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "璐т綅缂栫爜")]
public string LocationCode { get; set; }
/// <summary>
- /// 鏄惁婊＄洏
+ /// 鏄惁鏁村嚭
/// </summary>
- [ImporterHeader(Name = "鏄惁瀹炵洏")]
- [ExporterHeader(DisplayName = "鏄惁瀹炵洏")]
- [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁婊＄洏", DefaultValue = "0")]
- public bool IsFull { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鏄惁鏁村嚭")]
+ public bool IsFullExit { get; set; } = true;
/// <summary>
- /// 澶囨敞 (闈欏埗\闄堝寲鏃堕棿)
+ /// 鐘舵��
/// </summary>
- [ImporterHeader(Name = "鐢佃姱鏁伴噺")]
- [ExporterHeader(DisplayName = "鐢佃姱鏁伴噺")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐢佃姱鏁伴噺")]
- public string Remark { get; set; }
-
- /// <summary>
- /// 鍏宠仈宸ュ簭杩斿洖鏃堕棿锛堟敞娑瞈闈欑疆鏃堕暱锛�
- /// </summary>
- [ImporterHeader(Name = "宸ュ簭杩斿洖鏃堕棿")]
- [ExporterHeader(DisplayName = "宸ュ簭杩斿洖鏃堕棿")]
- public string LinedProcessFeedbackTime { get; set; }
-
- /// <summary>
- /// 鐗瑰緛鍙傛暟杩斿洖(闈欑疆鏃堕暱)
- /// </summary>
- [ImporterHeader(Name = "闈欑疆鏃堕暱")]
- [ExporterHeader(DisplayName = "闈欑疆鏃堕暱")]
- public string SpecialParameterDuration { get; set; }
-
- /// <summary>
- /// 鐢熶骇浜х嚎
- /// </summary>
- [ImporterHeader(Name = "鐢熶骇浜х嚎")]
- [ExporterHeader(DisplayName = "鐢熶骇浜х嚎")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鐢熶骇浜х嚎")]
- public string ProductionLine { get; set; }
-
- /// <summary>
- /// 鍖哄煙缂栫爜
- /// </summary>
- [ImporterHeader(Name = "鍖哄煙缂栫爜")]
- [ExporterHeader(DisplayName = "鍖哄煙缂栫爜")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鍖哄煙缂栫爜")]
- public string AreaCode { get; set; }
-
- /// <summary>
- /// 搴斿嚭搴撴椂闂�
- /// </summary>
- [ImporterHeader(Name = "搴斿嚭搴撴椂闂�")]
- [ExporterHeader(DisplayName = "搴斿嚭搴撴椂闂�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "搴斿嚭搴撴椂闂�")]
- public DateTime? OutboundTime { get; set; }
-
- /// <summary>
- /// 鍙傛暟淇℃伅
- /// </summary>
- [ImporterHeader(Name = "鍙傛暟淇℃伅")]
- [ExporterHeader(DisplayName = "鍙傛暟淇℃伅")]
- [SugarColumn(IsNullable = true, ColumnDescription = "鍙傛暟淇℃伅")]
- public string ParameterInfos { get; set; }
-
- /// <summary>
- /// 搴撳瓨鐘舵��
- /// </summary>
- [ImporterHeader(Name = "鍒涘缓鑰�")]
- [ExporterHeader(DisplayName = "鍒涘缓鑰�")]
- [SugarColumn(IsNullable = true, ColumnDescription = "搴撳瓨鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "鐘舵��")]
public int StockStatus { get; set; }
/// <summary>
- /// 褰撳墠宸ュ簭
+ /// 鍗曟嵁缂栧彿
/// </summary>
- [ImporterHeader(Name = "褰撳墠宸ュ簭")]
- [ExporterHeader(DisplayName = "褰撳墠宸ュ簭")]
- [SugarColumn(IsNullable = true, ColumnDescription = "褰撳墠宸ュ簭")]
- public string ProcessCode { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁缂栧彿")]
+ public string OrderNo { get; set; }
/// <summary>
- /// 涓嬩竴宸ュ簭
+ /// 鍗曟嵁绫诲瀷
/// </summary>
- [ImporterHeader(Name = "涓嬩竴宸ュ簭")]
- [ExporterHeader(DisplayName = "涓嬩竴宸ュ簭")]
- [SugarColumn(IsNullable = true, ColumnDescription = "涓嬩竴宸ュ簭")]
- public string NextProcessCode { get; set; }
+ [SugarColumn(IsNullable = true, ColumnDescription = "鍗曟嵁绫诲瀷")]
+ public string OrderType { get; set; }
+
+ /// <summary>
+ /// 澶囨敞
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
/// <summary>
/// 搴撳瓨鏄庣粏
@@ -141,7 +73,7 @@
/// 璐т綅鏁版嵁
/// </summary>
[SugarColumn(ColumnName = "LocationInfo")]
- [Navigate(NavigateType.OneToOne, nameof(LocationId), nameof(DtLocationInfo.Id))]
+ [Navigate(NavigateType.OneToOne, nameof(LocationCode), nameof(DtLocationInfo.LocationCode))]
public DtLocationInfo? LocationInfo { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3