From f78f5686e934249f87bc07cb7bef3c3dbcd950c6 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 14:24:41 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs | 31 -----
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs | 63 ++++++++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs | 24 ++++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs | 18 +-
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs | 13 +
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs | 4
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs | 1
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 21 ++
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs | 116 +++++++++---------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs | 3
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx | 0
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs | 47 ++-----
14 files changed, 203 insertions(+), 144 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
index 930edf9..95805a1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs
index e3c2a02..9c3a623 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/IWmsMaterialCustomerService.cs
+++ b/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);
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs
index 3ac8a76..c9c4d70 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterialCustomer/WmsMaterialCustomerService.cs
+++ b/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
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
index e83f6f4..5237c06 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs
+++ b/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>
/// 鏄惁鍫嗗灈鏈哄簱浣�
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs
index 594b4aa..56c7fd4 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceOutput.cs
+++ b/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>
/// 鏄惁鍫嗗灈鏈哄簱浣�
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
index 5d775ee..250bf5c 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs
+++ b/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("鍚�"))
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs
index 0c856bb..c60511d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsCount/WmsLocationView/Dto/LocationViewOutput.cs
+++ b/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>
/// 鏄惁閿佸畾
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs
index f1644c5..ea41a2a 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/Les/LesStation.cs
@@ -1,66 +1,66 @@
-锘縰sing 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; }
+// }
+//}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
index ce90057..d1066d6 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs
index ea0cecc..a8f2816 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsAreaEnum.cs
+++ b/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>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs
new file mode 100644
index 0000000..70b6b34
--- /dev/null
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Enum/Wms/WmsPlaceEnum.cs
@@ -0,0 +1,63 @@
+锘縰sing 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,
+ }
+
+
+}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
index 2e1fca1..4321e81 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictDataSeedData.cs
+++ b/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 },
+
};
}
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
index f303a60..78b676d 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/SeedData/SysDictTypeSeedData.cs
+++ b/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 },
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx
index 188e34a..23dba36 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsPlaceImport.xlsx
Binary files differ
--
Gitblit v1.9.3