payne
2024-04-24 f78f5686e934249f87bc07cb7bef3c3dbcd950c6
修改
已添加1个文件
已修改13个文件
347 ■■■■■ 文件已修改
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs 24 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs 116 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs 31 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs 63 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
@@ -27,18 +27,23 @@
        private readonly IRepository<SysDictData, MasterDbContextLocator> _sysDictDataRep;
        private readonly ISysExcelTemplateService _sysExcelTemplateService;
        private readonly static object _lock = new();
        private readonly IRepository<WmsMaterialCustomer, MasterDbContextLocator> _wmsMaterialCustomerRep;
        private readonly IRepository<WmsSubstituteGood, MasterDbContextLocator> _wmsSubstituteGoodRep;
        public WmsMaterialService(
            IRepository<WmsMaterial,MasterDbContextLocator> wmsMaterialRep
            ,IRepository<SysDictType, MasterDbContextLocator> sysDictTypeRep
            ,IRepository<SysDictData, MasterDbContextLocator> sysDictDataRep
            ,ISysExcelTemplateService sysExcelTemplateService
            , IRepository<WmsMaterialCustomer, MasterDbContextLocator> wmsMaterialCustomerRep
            , IRepository<WmsSubstituteGood, MasterDbContextLocator> wmsSubstituteGoodRep
        )
        {
            _wmsMaterialRep = wmsMaterialRep;
         _sysDictTypeRep = sysDictTypeRep;
         _sysDictDataRep = sysDictDataRep;
         _sysExcelTemplateService = sysExcelTemplateService;
            _wmsMaterialCustomerRep = wmsMaterialCustomerRep;
            _wmsSubstituteGoodRep = wmsSubstituteGoodRep;
        }
        /// <summary>
@@ -177,14 +182,16 @@
        /// <param name="input"></param>
        /// <returns></returns>
        [HttpPost("WmsMaterial/add")]
        [UnitOfWork]
        public async Task Add(AddWmsMaterialInfoInput input)
        {
            //物料信息
            var wmsMaterial = input.MaterialInput.Adapt<WmsMaterial>();
            //控制规则信息
            var controlRuleld = input.ControlRuleld;
            wmsMaterial.ControlRuleId = controlRuleld;
            //客户档案信息
            var baseCustomerList = input.BaseCustomerList.Adapt<List<BaseCustomer>>();
            //物料客户关联关系
@@ -208,18 +215,22 @@
                    UpdatedUserName = CurrentUserInfo.Name
                    
                });
            }
            //验证
            await CheckExisit(wmsMaterial);
            //替代品信息
            var substituteGoodList = input.SubstituteGoodList.Adapt<List<WmsSubstituteGood>>();
            //验证
            await CheckExisit(wmsMaterial);
            wmsMaterial.CreatedUserId = wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
            wmsMaterial.CreatedUserName = wmsMaterial.UpdatedUserName = SysHelper.GetUserName();
            wmsMaterial.CreatedTime = wmsMaterial.UpdatedTime = SysHelper.GetNowTime();
            await _wmsMaterialRep.InsertAsync(wmsMaterial);
            await _wmsMaterialCustomerRep.InsertAsync(materialCustomerList);
            await _wmsSubstituteGoodRep.InsertAsync(substituteGoodList);
        }
        /// <summary>
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs
@@ -14,6 +14,7 @@
        Task<List<WmsMaterialCustomerOutput>> ListNonPageAsync([FromQuery] WmsMaterialCustomerSearchNonPage input);
        
        Task Add(AddWmsMaterialCustomerInput input);
        Task AddRange(List<AddWmsMaterialCustomerInput> inputs);
        Task Update(UpdateWmsMaterialCustomerInput input);
        Task Delete(DeleteWmsMaterialCustomerInput input);
        Task<int> ImportExcelAsync(IFormFile file);
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs
@@ -147,6 +147,28 @@
        }
        /// <summary>
        /// æ‰¹é‡å¢žåŠ ç‰©æ–™å®¢æˆ·å…³è”ä¿¡æ¯
        /// </summary>
        /// <param name="input"></param>
        /// <returns></returns>
        /// <exception cref="NotImplementedException"></exception>
        [HttpPost("WmsMaterialCustomer/addRange")]
        public async Task AddRange(List<AddWmsMaterialCustomerInput> inputs)
        {
            var wmsMaterialCustomerList = inputs.Adapt<List<WmsMaterialCustomer>>();
            //验证
           // await CheckExisit(wmsMaterialCustomer);
            foreach (var item in wmsMaterialCustomerList)
            {
                item.CreatedUserId  = SysHelper.GetUserId();
                item.CreatedUserName = SysHelper.GetUserName();
                item.CreatedTime  = SysHelper.GetNowTime();
            }
            await _wmsMaterialCustomerRep.InsertAsync(wmsMaterialCustomerList);
        }
        /// <summary>
        /// åˆ é™¤ç‰©æ–™å®¢æˆ·å…³è”信息
        /// </summary>
        /// <param name="input"></param>
@@ -407,6 +429,8 @@
        }
        #endregion
    }
}
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
@@ -28,7 +28,7 @@
        /// <summary>
        /// åº“位类型
        /// </summary>
        public virtual int? PlaceType { get; set; }
        public virtual Admin.NET.Core.PlaceTypeEnum? PlaceType { get; set; }
        
        /// <summary>
        /// åº“位类型名称
@@ -43,7 +43,7 @@
        /// <summary>
        /// åº“位属性
        /// </summary>
        public virtual int? PlaceStatus { get; set; }
        public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å †åž›æœºåº“位
@@ -235,7 +235,7 @@
        /// <summary>
        /// åº“位类型
        /// </summary>
        public virtual int? PlaceType { get; set; }
        public virtual Admin.NET.Core.PlaceTypeEnum? PlaceType { get; set; }
        
        /// <summary>
        /// åº“位类型名称
@@ -250,7 +250,7 @@
        /// <summary>
        /// åº“位属性
        /// </summary>
        public virtual int? PlaceStatus { get; set; }
        public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å †åž›æœºåº“位
@@ -445,7 +445,7 @@
        /// åº“位类型
        /// </summary>
        [Required(ErrorMessage = "库位类型不能为空")]
        public virtual int PlaceType { get; set; }
        public virtual Admin.NET.Core.PlaceTypeEnum PlaceType { get; set; }
        
        /// <summary>
        /// åº“位类型名称
@@ -453,14 +453,10 @@
        public virtual string PlaceTypeName { get; set; }
        
        /// <summary>
        /// å­˜æ”¾å•位
        /// </summary>
        public virtual string StockUnit { get; set; }
        /// <summary>
        /// åº“位属性
        /// </summary>
        public virtual int? PlaceStatus { get; set; }
        [Required(ErrorMessage = "库位属性不能为空")]
        public virtual Admin.NET.Core.PlaceStatusEnum PlaceStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å †åž›æœºåº“位
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs
@@ -26,7 +26,7 @@
        /// <summary>
        /// åº“位类型
        /// </summary>
        public int PlaceType { get; set; }
        public Admin.NET.Core.PlaceTypeEnum PlaceType { get; set; }
        
        /// <summary>
        /// åº“位类型名称
@@ -41,7 +41,7 @@
        /// <summary>
        /// åº“位属性
        /// </summary>
        public int? PlaceStatus { get; set; }
        public Admin.NET.Core.PlaceStatusEnum PlaceStatus { get; set; }
        
        /// <summary>
        /// æ˜¯å¦å †åž›æœºåº“位
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
@@ -55,7 +55,6 @@
                                     .Where(!string.IsNullOrEmpty(input.PlaceAlias), u => u.PlaceAlias == input.PlaceAlias)
                                     .Where(input.PlaceType != null, u => u.PlaceType == input.PlaceType)
                                     .Where(!string.IsNullOrEmpty(input.PlaceTypeName), u => u.PlaceTypeName == input.PlaceTypeName)
                                     .Where(!string.IsNullOrEmpty(input.StockUnit), u => u.StockUnit == input.StockUnit)
                                     .Where(input.PlaceStatus != null, u => u.PlaceStatus == input.PlaceStatus)
                                     .Where(input.IsSrmPlace != null, u => u.IsSrmPlace == input.IsSrmPlace)
                                     .Where(!string.IsNullOrEmpty(input.SrmPlaceNo), u => u.SrmPlaceNo == input.SrmPlaceNo)
@@ -88,8 +87,6 @@
                                     .Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
                                     .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
                                     .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                                     .Where(!string.IsNullOrEmpty(input.CreatedUserName), u => u.CreatedUserName == input.CreatedUserName)
                                     .Where(!string.IsNullOrEmpty(input.UpdatedUserName), u => u.UpdatedUserName == input.UpdatedUserName)
                                     .OrderBy(PageInputOrder.OrderBuilder<WmsPlaceSearch>(input))
                                     .ProjectToType<WmsPlaceOutput>()
                                     .ToADPagedListAsync(input.PageNo, input.PageSize);
@@ -109,7 +106,6 @@
            var pPlaceAlias = input.PlaceAlias?.Trim() ?? "";
            var pPlaceType = input.PlaceType;
            var pPlaceTypeName = input.PlaceTypeName?.Trim() ?? "";
            var pStockUnit = input.StockUnit?.Trim() ?? "";
            var pPlaceStatus = input.PlaceStatus;
            var pIsSrmPlace = input.IsSrmPlace;
            var pSrmPlaceNo = input.SrmPlaceNo?.Trim() ?? "";
@@ -142,15 +138,12 @@
            var pIsDisabled = input.IsDisabled;
            var pCreatedTime = input.CreatedTime;
            var pUpdatedTime = input.UpdatedTime;
            var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
            var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
            var wmsPlaces = await _wmsPlaceRep.DetachedEntities
                .Where(!string.IsNullOrEmpty(pPlaceCode), u => u.PlaceCode == pPlaceCode)
                .Where(!string.IsNullOrEmpty(pPlaceName), u => u.PlaceName == pPlaceName)
                .Where(!string.IsNullOrEmpty(pPlaceAlias), u => u.PlaceAlias == pPlaceAlias)
                .Where(pPlaceType != null, u => u.PlaceType == pPlaceType)
                .Where(!string.IsNullOrEmpty(pPlaceTypeName), u => u.PlaceTypeName == pPlaceTypeName)
                .Where(!string.IsNullOrEmpty(pStockUnit), u => u.StockUnit == pStockUnit)
                .Where(pPlaceStatus != null, u => u.PlaceStatus == pPlaceStatus)
                .Where(pIsSrmPlace != null, u => u.IsSrmPlace == pIsSrmPlace)
                .Where(!string.IsNullOrEmpty(pSrmPlaceNo), u => u.SrmPlaceNo == pSrmPlaceNo)
@@ -183,8 +176,6 @@
                .Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
           .Where(input.CreatedTime!=null, u => u.CreatedTime>=  Convert.ToDateTime(input.CreatedTime[0]) && u.CreatedTime<= Convert.ToDateTime(input.CreatedTime[1]))
           .Where(input.UpdatedTime!=null, u => u.UpdatedTime>=  Convert.ToDateTime(input.UpdatedTime[0]) && u.UpdatedTime<= Convert.ToDateTime(input.UpdatedTime[1]))
                .Where(!string.IsNullOrEmpty(pCreatedUserName), u => u.CreatedUserName == pCreatedUserName)
                .Where(!string.IsNullOrEmpty(pUpdatedUserName), u => u.UpdatedUserName == pUpdatedUserName)
            .OrderBy(PageInputOrder.OrderNonPageBuilder(input))
            .ProjectToType<WmsPlaceOutput>()
            .ToListAsync();
@@ -326,7 +317,6 @@
                           var _PlaceAlias = "";//库位别名
                           var _PlaceType = "";//库位类型
                           var _PlaceTypeName = "";//库位类型名称
                           var _StockUnit = "";//存放单位
                           var _PlaceStatus = "";//库位属性
                           var _IsSrmPlace = "";//是否堆垛机库位
                           var _SrmPlaceNo = "";//堆垛机库位号
@@ -367,7 +357,6 @@
                           _PlaceAlias = row["库位别名"]?.ToString() ;
                           _PlaceType = row["库位类型"]?.ToString() ;
                           _PlaceTypeName = row["库位类型名称"]?.ToString() ;
                           _StockUnit = row["存放单位"]?.ToString() ;
                           _PlaceStatus = row["库位属性"]?.ToString() ;
                           _IsSrmPlace = row["是否堆垛机库位"]?.ToString() ;
                           _SrmPlaceNo = row["堆垛机库位号"]?.ToString() ;
@@ -435,44 +424,42 @@
                          
                          if(!string.IsNullOrEmpty(_PlaceType))
                          {
                              if (!int.TryParse(_PlaceType, out int outPlaceType)&&!string.IsNullOrEmpty(_PlaceType))
                          Admin.NET.Core.PlaceTypeEnum  enumPlaceType = default(Admin.NET.Core.PlaceTypeEnum);
                             if(!Enum.TryParse<Admin.NET.Core.PlaceTypeEnum>(_PlaceType, out enumPlaceType)&&!string.IsNullOrEmpty(_PlaceType))
                              {
                                 throw Oops.Oh($"第{index}行[库位类型]{_PlaceType}值不正确!");
                              }
                              if (outPlaceType <= 0&&!string.IsNullOrEmpty(_PlaceType))
                              {
                                 throw Oops.Oh($"第{index}行[库位类型]{_PlaceType}值不能小于等于0!");
                                throw Oops.Oh($"第{index}行[库位类型]{_PlaceType}值不正确!");
                              }
                              else
                              {
                                 addItem.PlaceType = outPlaceType;
                                 addItem.PlaceType = enumPlaceType;
                              }
                          
                          }
                           }
                          if(!string.IsNullOrEmpty(_PlaceTypeName))
                          {
                                addItem.PlaceTypeName = (string)_PlaceTypeName;
                           }
                          if(!string.IsNullOrEmpty(_StockUnit))
                          if (string.IsNullOrEmpty(_PlaceStatus))
                          {
                                addItem.StockUnit = (string)_StockUnit;
                           }
                            throw Oops.Oh($"第{index}行[库位属性]{_PlaceStatus}不能为空!");
                          }
                          if(!string.IsNullOrEmpty(_PlaceStatus))
                          {
                              if (!int.TryParse(_PlaceStatus, out int outPlaceStatus)&&!string.IsNullOrEmpty(_PlaceStatus))
                          Admin.NET.Core.PlaceStatusEnum  enumPlaceStatus = default(Admin.NET.Core.PlaceStatusEnum);
                             if(!Enum.TryParse<Admin.NET.Core.PlaceStatusEnum>(_PlaceStatus, out enumPlaceStatus)&&!string.IsNullOrEmpty(_PlaceStatus))
                              {
                                 throw Oops.Oh($"第{index}行[库位属性]{_PlaceStatus}值不正确!");
                              }
                              if (outPlaceStatus <= 0&&!string.IsNullOrEmpty(_PlaceStatus))
                              {
                                 throw Oops.Oh($"第{index}行[库位属性]{_PlaceStatus}值不能小于等于0!");
                                throw Oops.Oh($"第{index}行[库位属性]{_PlaceStatus}值不正确!");
                              }
                              else
                              {
                                 addItem.PlaceStatus = outPlaceStatus;
                                 addItem.PlaceStatus = enumPlaceStatus;
                              }
                          
                          }
                           }
                          if(!string.IsNullOrEmpty(_IsSrmPlace))
                          {
                            if(!_IsSrmPlace.Equals("是") && !_IsSrmPlace.Equals("否"))
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs
@@ -155,7 +155,7 @@
        /// <summary>
        /// åº“位状态
        /// </summary>
        public PlaceStatus PlaceStatus { get; set; }
        public PlaceStatusEnum PlaceStatus { get; set; }
        /// <summary>
        /// æ˜¯å¦é”å®š
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs
@@ -1,66 +1,66 @@
using Furion.DatabaseAccessor;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Metadata.Builders;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
//using Furion.DatabaseAccessor;
//using Microsoft.EntityFrameworkCore;
//using Microsoft.EntityFrameworkCore.Metadata.Builders;
//using System.ComponentModel.DataAnnotations;
//using System.ComponentModel.DataAnnotations.Schema;
namespace Admin.NET.Core
{
    /// <summary>
    /// å·¥ä½è¡¨
    /// </summary>
    [Table("les_station")]
    [Comment("工位表")]
    public class LesStation : DEntityBase
    {
        /// <summary>
        /// äº§çº¿Id
        /// </summary>
        [Comment("产线Id")]
        public long ProductionlineId { get; set; }
//namespace Admin.NET.Core
//{
//    /// <summary>
//    /// å·¥ä½è¡¨
//    /// </summary>
//    [Table("les_station")]
//    [Comment("工位表")]
//    public class LesStation : DEntityBase
//    {
//        /// <summary>
//        /// äº§çº¿Id
//        /// </summary>
//        [Comment("产线Id")]
//        public long ProductionlineId { get; set; }
        /// <summary>
        /// å·¥ä½åç§°
        /// </summary>
        [Comment("工位名称")]
        [MaxLength(50)]
        public string Name { get; set; }
//        /// <summary>
//        /// å·¥ä½åç§°
//        /// </summary>
//        [Comment("工位名称")]
//        [MaxLength(50)]
//        public string Name { get; set; }
        /// <summary>
        /// å·¥ä½ç¼–码
        /// </summary>
        [Comment("工位编码")]
        [MaxLength(50)]
        public string Code { get; set; }
//        /// <summary>
//        /// å·¥ä½ç¼–码
//        /// </summary>
//        [Comment("工位编码")]
//        [MaxLength(50)]
//        public string Code { get; set; }
        /// <summary>
        /// å·¥ä½çŠ¶æ€
        /// </summary>
        [Comment("工位状态")]
        public CommonStatus Status { get; set; } = CommonStatus.ENABLE;
//        /// <summary>
//        /// å·¥ä½çŠ¶æ€
//        /// </summary>
//        [Comment("工位状态")]
//        public CommonStatus Status { get; set; } = CommonStatus.ENABLE;
        /// <summary>
        /// è¿è¡ŒçŠ¶æ€
        /// </summary>
        [Comment("运行状态")]
        public PlaceStatus StataionStatus { get; set; } = PlaceStatus.KONGXIAN;
//        /// <summary>
//        /// è¿è¡ŒçŠ¶æ€
//        /// </summary>
//        [Comment("运行状态")]
//        public PlaceStatusEnum StataionStatus { get; set; } = PlaceStatus.KONGXIAN;
        /// <summary>
        /// åº“位编码
        /// </summary>
        [Comment("库位编码")]
        [MaxLength(50)]
        public string ContainerCode { get; set; }
//        /// <summary>
//        /// åº“位编码
//        /// </summary>
//        [Comment("库位编码")]
//        [MaxLength(50)]
//        public string ContainerCode { get; set; }
        /// <summary>
        /// åº“位规格
        /// </summary>
        [Comment("库位规格")]
        public decimal PlaceSpec { get; set; }
//        /// <summary>
//        /// åº“位规格
//        /// </summary>
//        [Comment("库位规格")]
//        public decimal PlaceSpec { get; set; }
        /// <summary>
        /// äº§çº¿è¡¨
        /// </summary>
        //public LesProductionline LesProductionline { get; set; }
    }
}
//        /// <summary>
//        /// äº§çº¿è¡¨
//        /// </summary>
//        //public LesProductionline LesProductionline { get; set; }
//    }
//}
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
@@ -50,7 +50,7 @@
        [Comment("库位类型")]
        [Required]
        public int PlaceType { get; set; }
        public PlaceTypeEnum PlaceType { get; set; }
        /// <summary>
@@ -76,7 +76,7 @@
        [Comment("库位属性")]
        [Required]
        public int PlaceStatus { get; set; }
        public PlaceStatusEnum PlaceStatus { get; set; }
        /// <summary>
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs
@@ -43,36 +43,7 @@
        ZHUANYIKU = 6
    }
    /// <summary>
    /// åº“位状态
    /// </summary>
    public enum PlaceStatus
    {
        /// <summary>
        /// ç©ºé—²
        /// </summary>
        [Description("空闲")]
        KONGXIAN = 1,
        /// <summary>
        /// å¾…å…¥
        /// </summary>
        [Description("待入")]
        DAIRU = 2,
        /// <summary>
        /// å­˜è´§
        /// </summary>
        [Description("存货")]
        CUNHUO = 3,
        /// <summary>
        /// å¾…出
        /// </summary>
        [Description("待出")]
        DAICHU = 4,
    }
    /// <summary>
    /// åº“位高度属性
    /// </summary>
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,63 @@
using System.ComponentModel;
namespace Admin.NET.Core
{
    /// <summary>
    /// åº“位类型
    /// </summary>
    public enum PlaceTypeEnum
    {
        /// <summary>
        /// æ”¶è´§åº“位
        /// </summary>
        [Description("收货库位")]
        æ”¶è´§åº“位 = 1,
        /// <summary>
        /// åŸºç¡€åº“位
        /// </summary>
        [Description("基础库位")]
        åŸºç¡€åº“位 = 2,
        /// <summary>
        /// ç»„合库位
        /// </summary>
        [Description("组合库位")]
        ç»„合库位 = 3,
    }
    /// <summary>
    /// åº“位状态
    /// </summary>
    public enum PlaceStatusEnum
    {
        /// <summary>
        /// æ­£å¸¸
        /// </summary>
        [Description("正常")]
        æ­£å¸¸ = 1,
        /// <summary>
        /// å°å­˜
        /// </summary>
        [Description("封存")]
        å°å­˜ = 2,
        /// <summary>
        /// ç¦å‡º
        /// </summary>
        [Description("禁出")]
        ç¦å‡º = 3,
        /// <summary>
        /// ç¦å…¥
        /// </summary>
        [Description("禁入")]
        ç¦å…¥ = 4,
    }
}
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
@@ -179,10 +179,10 @@
                new SysDictData{Id=355698328531013, TypeId=355698224758853, Value="普通库", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698362712133, TypeId=355698224758853, Value="公共库", Code="3", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698476777541, TypeId=355698441912389, Value="空闲", Code="1", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698510786629, TypeId=355698441912389, Value="待入", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698549424197, TypeId=355698441912389, Value="存货", Code="3", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698576941125, TypeId=355698441912389, Value="待出", Code="4", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698476777541, TypeId=355698441912389, Value="正常", Code="1", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698510786629, TypeId=355698441912389, Value="封存", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698549424197, TypeId=355698441912389, Value="禁出", Code="3", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698576941125, TypeId=355698441912389, Value="禁入", Code="4", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698694561861, TypeId=355698661130309, Value="低", Code="1", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=355698716401733, TypeId=355698661130309, Value="中", Code="2", Sort=100, Remark="", Status=0 },
@@ -255,6 +255,11 @@
                new SysDictData{Id=386523071475736,TypeId=386522984120393,Value="完成",Code="4",Sort=100,Remark="",Status=0},
                new SysDictData{Id=386523071475737,TypeId=386522984120393,Value="撤回",Code="5",Sort=100,Remark="",Status=0},
                new SysDictData{Id=539733620875333, TypeId=539731668947013, Value="收货库位", Code="1", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=539733729484869, TypeId=539731668947013, Value="基础库位", Code="2", Sort=100, Remark="", Status=0 },
                new SysDictData{Id=539733806522437, TypeId=539731668947013, Value="组合库位", Code="3", Sort=100, Remark="", Status=0 },
            };
        }
    }
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
@@ -52,8 +52,9 @@
                new SysDictType{Id=355697881423942, Name="托盘分类", Code="container_category", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=539731668947013, Name="库位类型", Code="place_type", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=355698224758853, Name="库区类型", Code="area_type", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=355698441912389, Name="库位状态", Code="place_status", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=355698441912389, Name="库位属性", Code="place_status", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=355698661130309, Name="库位高度", Code="height_level", Sort=100, Remark="", Status=0 },
                new SysDictType{Id=355698855280709, Name="物料检验", Code="material_inspection", Sort=100, Remark="", Status=0 },
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx
Binary files differ