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 | 281 +++++++++++++++++++++++--------------------------------- 1 files changed, 116 insertions(+), 165 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 b2bc517..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,176 +1,127 @@ +锘縰sing Magicodes.ExporterAndImporter.Core; +using SqlSugar; using System; using System.Collections.Generic; using System.Linq; -using SqlSugar; +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="MaterielID" ,IsPrimaryKey = true,IsIdentity = true) ] - public int MaterielID { get; set; } - - /// <summary> - /// 澶� 娉�:鐗╂枡缂栫爜 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="MaterielCode" ) ] - public string? MaterielCode { get; set; } - - /// <summary> - /// 澶� 娉�:鎵�灞炲簱鍖� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="WareAreaCode" ) ] - public string? WareAreaCode { get; set; } - - /// <summary> - /// 澶� 娉�:鐗╂枡鍚嶇О - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="MaterielName" ) ] - public string? MaterielName { get; set; } - - /// <summary> - /// 澶� 娉�:鍖呰瑙勬牸 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Packspes" ) ] - public string? Packspes { get; set; } - - /// <summary> - /// 澶� 娉�:鐗╂枡鎻忚堪 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="MaterielDesc" ) ] - public string? MaterielDesc { get; set; } - - /// <summary> - /// 澶� 娉�:鐗╂枡灞炴�� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Attribute" ) ] - public string? Attribute { get; set; } - - /// <summary> - /// 澶� 娉�:璁¢噸鍗曚綅 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Unit" ) ] - public string? Unit { get; set; } - - /// <summary> - /// 澶� 娉�:褰撳墠鐘舵�侊紙0锛岀鐢� 1锛屽惎鐢級 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Status" ) ] - public int? Status { get; set; } - - /// <summary> - /// 澶� 娉�:鏈�灏忓寘瑁呮暟 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="MinpackQty" ) ] - public decimal? MinpackQty { get; set; } - - /// <summary> - /// 澶� 娉�:鐢熶骇鍟� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Mfacturer" ) ] - public string? Mfacturer { get; set; } - - /// <summary> - /// 澶� 娉�:渚涘簲鍟� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Supplier" ) ] - public string? Supplier { get; set; } - - /// <summary> - /// 澶� 娉�:鍑�閲� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Netweight" ) ] - public decimal? Netweight { get; set; } - - /// <summary> - /// 澶� 娉�:姣涢噸 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Grossweight" ) ] - public decimal? Grossweight { get; set; } - - /// <summary> - /// 澶� 娉�:鏈夋晥鏈� - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Validity" ) ] - public int? Validity { get; set; } - - /// <summary> - /// 澶� 娉�:瀹夊叏搴撳瓨 - /// 榛樿鍊�: - ///</summary> - [SugarColumn(ColumnName="Safety" ) ] - public decimal? Safety { 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; } - + /// 涓婚敭 + /// </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, ColumnDescription = "鍖哄煙涓婚敭")] + public int AreaId { get; set; } + + /// <summary> + /// 鐗╂枡缂栧彿 + /// </summary> + [ImporterHeader(Name = "鐗╂枡缂栧彿")] + [ExporterHeader(DisplayName = "鐗╂枡缂栧彿")] + [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鐗╂枡缂栧彿")] + public string MaterielCode { get; set; } + + /// <summary> + /// 鐗╂枡鍚嶇О + /// </summary> + [ImporterHeader(Name = "鐗╂枡鍚嶇О")] + [ExporterHeader(DisplayName = "鐗╂枡鍚嶇О")] + [SugarColumn(IsNullable = false, Length = 200, ColumnDescription = "鐗╂枡鍚嶇О")] + public string MaterielName { get; set; } + + /// <summary> + /// 鐗╂枡鎻忚堪 + /// </summary> + [ImporterHeader(Name = "鐗╂枡鎻忚堪")] + [ExporterHeader(DisplayName = "鐗╂枡鎻忚堪")] + [SugarColumn(IsNullable = true, Length = 500, ColumnDescription = "鐗╂枡鎻忚堪")] + public string MaterielDes { get; set; } + + /// <summary> + /// 瀹瑰櫒绫诲瀷 + /// </summary> + [ImporterHeader(Name = "瀹瑰櫒绫诲瀷")] + [ExporterHeader(DisplayName = "瀹瑰櫒绫诲瀷")] + [SugarColumn(IsNullable = false, ColumnDescription = "瀹瑰櫒绫诲瀷", DefaultValue = "0")] + public int CotainerType { get; set; } + + /// <summary> + /// 鍖呰瑙勬牸 + /// </summary> + [ImporterHeader(Name = "鍖呰瑙勬牸")] + [ExporterHeader(DisplayName = "鍖呰瑙勬牸")] + [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "鍖呰瑙勬牸")] + public string Packspes { get; set; } + + /// <summary> + /// 鐗╂枡灞炴�� + /// </summary> + [ImporterHeader(Name = "鐗╂枡灞炴��")] + [ExporterHeader(DisplayName = "鐗╂枡灞炴��")] + [SugarColumn(IsNullable = false, ColumnDescription = "鐗╂枡灞炴��", DefaultValue = "0")] + public int Attribute { get; set; } + + /// <summary> + /// 璁¢噺鍗曚綅 + /// </summary> + [ImporterHeader(Name = "璁¢噺鍗曚綅")] + [ExporterHeader(DisplayName = "璁¢噺鍗曚綅")] + [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁¢噺鍗曚綅", DefaultValue = "0")] + public string Unit { get; set; } + + /// <summary> + /// 鏈夋晥鏈� + /// </summary> + [ImporterHeader(Name = "鏈夋晥鏈�")] + [ExporterHeader(DisplayName = "鏈夋晥鏈�")] + [SugarColumn(IsNullable = false, ColumnDescription = "鏈夋晥鏈�", DefaultValue = "-1")] + public int Validity { get; set; } + + /// <summary> + /// 瀹夊叏搴撳瓨 + /// </summary> + [ImporterHeader(Name = "瀹夊叏搴撳瓨")] + [ExporterHeader(DisplayName = "瀹夊叏搴撳瓨")] + [SugarColumn(IsNullable = false, DecimalDigits = 2, ColumnDescription = "瀹夊叏搴撳瓨", DefaultValue = "-1")] + public decimal SafetyStock { get; set; } + + /// <summary> + /// 鏄惁鍏佽娣锋壒 + /// </summary> + [ImporterHeader(Name = "鏄惁鍏佽娣锋壒")] + [ExporterHeader(DisplayName = "鏄惁鍏佽娣锋壒")] + [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋壒")] + public bool IsMixBatch { get; set; } + + /// <summary> + /// 鏄惁鍏佽娣锋枡 + /// </summary> + [ImporterHeader(Name = "鏄惁鍏佽娣锋枡")] + [ExporterHeader(DisplayName = "鏄惁鍏佽娣锋枡")] + [SugarColumn(IsNullable = false, ColumnDescription = "鏄惁鍏佽娣锋枡")] + public bool IsMixMateriel { get; set; } + + /// <summary> + /// 澶囨敞 + /// </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