From 7ca9651f81d7b84f054194d3d46fdbd1d9c8b922 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期三, 09 七月 2025 22:55:27 +0800
Subject: [PATCH] 增加质检出入库逻辑
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs | 138 ++++++++++------------------------------------
1 files changed, 30 insertions(+), 108 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
index 7a70179..5ce6efe 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
@@ -1,118 +1,40 @@
-锘縰sing System;
+锘縰sing SqlSugar;
+using System;
using System.Collections.Generic;
using System.Linq;
-using Magicodes.ExporterAndImporter.Core;
-using SqlSugar;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEA_Core.Attributes;
using WIDESEA_Core.DB.Models;
+
namespace WIDESEA_Model.Models
{
- /// <summary>
- /// 鍏ュ簱鍗曚富琛�
- ///</summary>
- [SugarTable("Dt_InboundOrder")]
+ [SugarTable(nameof(Dt_InboundOrder), "鍏ュ簱鍗�")]
public class Dt_InboundOrder : BaseEntity
{
-
-
- /// <summary>
- /// 澶� 娉�:鍏ュ簱鍗旾D
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="OrderId" ,IsPrimaryKey = true,IsIdentity = true) ]
- public int OrderId { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundNo" ) ]
- public string? InboundNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:涓婃父鍗曟嵁缂栧彿
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundUpperNo" ) ]
- public string? InboundUpperNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鎵规鍙�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="BatchNo" ) ]
- public string? BatchNo { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鏃ユ湡
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundDate" ) ]
- public DateTime? InboundDate { get; set; }
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
- /// <summary>
- /// 澶� 娉�:涓婃父鍗曟嵁绫诲瀷 100 鐢熶骇鍏ュ簱鍗�;200 鐢熶骇閫�鏂欏崟;300 閲囪喘鍏ュ簱鍗�;400 璋冩嫧鍏ュ簱鍗�;500 閿�鍞��璐у崟;600 绌虹洏鍏ュ簱鍗�;700 鍏朵粬鍏ュ簱鍗�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundType" ) ]
- public int? InboundType { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鍗曟嵁鐘舵�侊紙0锛屾湭寮�濮� 1锛岀粍鐩樹腑 2锛屽畬鎴愮粍鐩� 3锛屽叆搴撲腑 4锛屽凡鍏ュ簱 锛�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="InboundState" ) ]
- public int? InboundState { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Remark" ) ]
- public string? Remark { get; set; }
-
-
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare1" ) ]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare2" ) ]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare3" ) ]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare4" ) ]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName="Spare5" ) ]
- public string? Spare5 { get; set; }
+ [CodeRule(WIDESEA_Core.Enums.RuleCode.InboundOrderRule)]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
+ public string OrderNo { get; set; }
- /// <summary>
- /// 鍏ュ簱鍗曟槑缁�
- /// </summary>
- [SugarColumn(ColumnName = "Dt_InboundOrderDetailList")]
- [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail.OrderId))]
- public List<Dt_InboundOrderDetail> Dt_InboundOrderDetailList { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "涓婃父鍗曟嵁缂栧彿")]
+ public string UpperOrderNo { get; set; }
+
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁绫诲瀷")]
+ public int OrderType { get; set; }
+
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍗曟嵁鐘舵��")]
+ public int OrderStatus { get; set; }
+
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍒涘缓鏂瑰紡")]
+ public int CreateType { get; set; }
+
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
+
+ [Navigate(NavigateType.OneToMany, nameof(Dt_InboundOrderDetail.OrderId), nameof(Id))]
+ public List<Dt_InboundOrderDetail> Details { get; set; }
}
-
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3