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/Basic/Dt_MaterielInfo.cs | 225 +++++++++++++++++++++++---------------------------------
1 files changed, 93 insertions(+), 132 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
index 72e3024..2edaab7 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Basic/Dt_MaterielInfo.cs"
@@ -1,166 +1,127 @@
-锘縰sing SqlSugar;
+锘縰sing Magicodes.ExporterAndImporter.Core;
+using SqlSugar;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
{
- /// <summary>
- /// 鐗╂枡琛�
- ///</summary>
- [SugarTable("Dt_MaterielInfo", "鐗╂枡琛�")]
+ [SugarTable(nameof(Dt_MaterielInfo), "鐗╂枡淇℃伅")]
public class Dt_MaterielInfo : BaseEntity
{
/// <summary>
- /// 澶� 娉�:涓婚敭ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "ID", IsPrimaryKey = true, ColumnDescription = "涓婚敭ID", IsIdentity = true)]
- public int ID { get; set; }
+ /// 涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "涓婚敭")]
+ [ExporterHeader(DisplayName = "涓婚敭")]
+ [SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
+ public int Id { get; set; }
/// <summary>
- /// 澶� 娉�:鐗╂枡ID
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielID", ColumnDescription = "鐗╂枡ID")]
- public string? MaterielID { get; set; }
+ /// 鍖哄煙涓婚敭
+ /// </summary>
+ [ImporterHeader(Name = "鍖哄煙涓婚敭")]
+ [ExporterHeader(DisplayName = "鍖哄煙涓婚敭")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鍖哄煙涓婚敭")]
+ public int AreaId { get; set; }
/// <summary>
- /// 澶� 娉�:鎵�灞炲簱鍖�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "AreaID", ColumnDescription = "鎵�灞炲簱鍖�")]
- public string? AreaID { get; set; }
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡缂栧彿")]
+ [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")]
+ [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")]
+ public string MaterielCode { get; set; }
/// <summary>
- /// 澶� 娉�:鐗╂枡鍚嶇О
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielName", ColumnDescription = "鐗╂枡鍚嶇О")]
- public string? MaterielName { get; set; }
+ /// 鐗╂枡鍚嶇О
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鍚嶇О")]
+ [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")]
+ [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")]
+ public string MaterielName { get; set; }
/// <summary>
- /// 澶� 娉�:鍖呰瑙勬牸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Packspes", ColumnDescription = "鍖呰瑙勬牸")]
- public string? Packspes { get; set; }
+ /// 鐗╂枡鎻忚堪
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡鎻忚堪")]
+ [ExporterHeader(DisplayName = "鐗╂枡鎻忚堪")]
+ [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐗╂枡鎻忚堪")]
+ public string MaterielDes { get; set; }
/// <summary>
- /// 澶� 娉�:鐗╂枡鎻忚堪
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MaterielDesc", ColumnDescription = "鐗╂枡鎻忚堪")]
- public string? MaterielDesc { get; set; }
+ /// 瀹瑰櫒绫诲瀷
+ /// </summary>
+ [ImporterHeader(Name = "瀹瑰櫒绫诲瀷")]
+ [ExporterHeader(DisplayName = "瀹瑰櫒绫诲瀷")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "瀹瑰櫒绫诲瀷", DefaultValue = "0")]
+ public int CotainerType { get; set; }
/// <summary>
- /// 澶� 娉�:鐗╂枡灞炴��
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Attribute", ColumnDescription = "鐗╂枡灞炴��")]
- public string? Attribute { get; set; }
+ /// 鍖呰瑙勬牸
+ /// </summary>
+ [ImporterHeader(Name = "鍖呰瑙勬牸")]
+ [ExporterHeader(DisplayName = "鍖呰瑙勬牸")]
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍖呰瑙勬牸")]
+ public string Packspes { get; set; }
/// <summary>
- /// 澶� 娉�:璁￠噸鍗曚綅
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Unit", ColumnDescription = "璁￠噸鍗曚綅")]
- public string? Unit { get; set; }
+ /// 鐗╂枡灞炴��
+ /// </summary>
+ [ImporterHeader(Name = "鐗╂枡灞炴��")]
+ [ExporterHeader(DisplayName = "鐗╂枡灞炴��")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴��", DefaultValue = "0")]
+ public int Attribute { get; set; }
/// <summary>
- /// 澶� 娉�:褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Status", ColumnDescription = "褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級")]
- public int? Status { get; set; }
+ /// 璁￠噺鍗曚綅
+ /// </summary>
+ [ImporterHeader(Name = "璁￠噺鍗曚綅")]
+ [ExporterHeader(DisplayName = "璁￠噺鍗曚綅")]
+ [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁￠噺鍗曚綅", DefaultValue = "0")]
+ public string Unit { get; set; }
/// <summary>
- /// 澶� 娉�:鏈�灏忓寘瑁呮暟
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "MinpackQty", ColumnDescription = "鏈�灏忓寘瑁呮暟")]
- public decimal? MinpackQty { get; set; }
+ /// 鏈夋晥鏈�
+ /// </summary>
+ [ImporterHeader(Name = "鏈夋晥鏈�")]
+ [ExporterHeader(DisplayName = "鏈夋晥鏈�")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏈夋晥鏈�", DefaultValue = "-1")]
+ public int Validity { get; set; }
/// <summary>
- /// 澶� 娉�:鐢熶骇鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Mfacturer", ColumnDescription = "鐢熶骇鍟�")]
- public string? Mfacturer { get; set; }
+ /// 瀹夊叏搴撳瓨
+ /// </summary>
+ [ImporterHeader(Name = "瀹夊叏搴撳瓨")]
+ [ExporterHeader(DisplayName = "瀹夊叏搴撳瓨")]
+ [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "瀹夊叏搴撳瓨", DefaultValue = "-1")]
+ public decimal SafetyStock { get; set; }
/// <summary>
- /// 澶� 娉�:渚涘簲鍟�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Supplier", ColumnDescription = "渚涘簲鍟�")]
- public string? Supplier { get; set; }
+ /// 鏄惁鍏佽娣锋壒
+ /// </summary>
+ [ImporterHeader(Name = "鏄惁鍏佽娣锋壒")]
+ [ExporterHeader(DisplayName = "鏄惁鍏佽娣锋壒")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋壒")]
+ public bool IsMixBatch { get; set; }
/// <summary>
- /// 澶� 娉�:鍑�閲�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "NetWeight", ColumnDescription = "鍑�閲�")]
- public decimal? NetWeight { get; set; }
+ /// 鏄惁鍏佽娣锋枡
+ /// </summary>
+ [ImporterHeader(Name = "鏄惁鍏佽娣锋枡")]
+ [ExporterHeader(DisplayName = "鏄惁鍏佽娣锋枡")]
+ [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋枡")]
+ public bool IsMixMateriel { get; set; }
/// <summary>
- /// 澶� 娉�:姣涢噸
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "GrossWeight", ColumnDescription = "姣涢噸")]
- public decimal? GrossWeight { get; set; }
-
- /// <summary>
- /// 澶� 娉�:鏈夋晥鏈�
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Validity", ColumnDescription = "鏈夋晥鏈�")]
- public int? Validity { get; set; }
-
- /// <summary>
- /// 澶� 娉�:瀹夊叏搴撳瓨
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Safety", ColumnDescription = "瀹夊叏搴撳瓨")]
- public decimal? Safety { get; set; }
-
- /// <summary>
- /// 澶� 娉�:澶囨敞
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(ColumnName = "Remark", ColumnDescription = "澶囨敞")]
- public string? Remark { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare1", ColumnDescription = "")]
- public string? Spare1 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare2", ColumnDescription = "")]
- public string? Spare2 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare3", ColumnDescription = "")]
- public string? Spare3 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare4", ColumnDescription = "")]
- public string? Spare4 { get; set; }
-
- /// <summary>
- /// 澶� 娉�:
- /// 榛樿鍊�:
- ///</summary>
- [SugarColumn(IsNullable = true, ColumnName = "Spare5", ColumnDescription = "")]
- public string? Spare5 { get; set; }
+ /// 澶囨敞
+ /// </summary>
+ [ImporterHeader(Name = "澶囨敞")]
+ [ExporterHeader(DisplayName = "澶囨敞")]
+ [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "澶囨敞")]
+ public string Remark { get; set; }
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3