From b8055e2fb3c84d32f01c2f6dc4d8bde4536c6f04 Mon Sep 17 00:00:00 2001
From: payne <bzrlw2012@163.com>
Date: 周三, 24 4月 2024 17:26:13 +0800
Subject: [PATCH] 修改
---
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs | 12
iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs | 66 --
使用文档/PDManer文件/原材料库标准化.pdma.json | 507 +++++++++++++------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/Dto/WmsPlaceInput.cs | 118 ----
iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue | 2
iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx | 0
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/WmsMaterialService.cs | 709 +++++++++++++-------------
iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsPlace/WmsPlaceService.cs | 93 ---
8 files changed, 714 insertions(+), 793 deletions(-)
diff --git a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
index 3377cf6..e1d757a 100644
--- a/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
+++ b/iWare_RawMaterialWarehouse_Web/src/views/main/WmsBase/WmsMaterial/tabForm.vue
@@ -242,7 +242,7 @@
var param = {
MaterialInput: values,
ControlRuleld: ControlRuleld, //鎺у埗灞炴��
- SubstituteGoodLis: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
+ SubstituteGoodList: this.$refs.addFormWmsSubstituteGoodRef.list, //鏇夸唬鍝�
BaseCustomerList: this.$refs.addFormBaseCustomer.list, //瀹㈡埛妗ｆ闆嗗悎
ContainerPackagingList: this.$refs.addFormContainerPackagingRef.list //鍖呰鍏崇郴
}
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
index 229c095..7245cc1 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Application/Service/WmsBase/WmsMaterial/Dto/WmsMaterialInput.cs
@@ -50,11 +50,13 @@
/// </summary>
public virtual string ABCClassName { get; set; }
+
/// <summary>
/// ABC鍒嗙被
/// </summary>
- public virtual int? ABCClass { get; set; }
-
+ public virtual Admin.NET.Core.ABCClassEnum? ABCClass { get; set; }
+
+
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
@@ -181,12 +183,12 @@
/// ABC鍒嗙被鍚嶇О
/// </summary>
public virtual string ABCClassName { get; set; }
-
+
/// <summary>
/// ABC鍒嗙被
/// </summary>
- public virtual int? ABCClass { get; set; }
-
+ public virtual Admin.NET.Core.ABCClassEnum? ABCClass { get; set; }
+
/// <summary>
/// 鐗╂枡瑙勬牸
/// </summary>
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 7ac1c0d..db9d7b2 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
@@ -45,9 +45,8 @@
_wmsMaterialCustomerRep = wmsMaterialCustomerRep;
_wmsSubstituteGoodRep = wmsSubstituteGoodRep;
}
-
/// <summary>
- /// 鍒嗛〉鏌ヨ鐗╂枡淇℃伅琛�
+ /// 鍒嗛〉鏌ヨ鐗╂枡淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -55,7 +54,7 @@
public async Task<PageResult<WmsMaterialOutput>> Page([FromQuery] WmsMaterialSearch input)
{
var wmsMaterials = await _wmsMaterialRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(input.MaterialName), u => EF.Functions.Like(u.MaterialName, $"%{input.MaterialName.Trim()}%"))
+ .Where(!string.IsNullOrEmpty(input.MaterialName), u => u.MaterialName == input.MaterialName)
.Where(!string.IsNullOrEmpty(input.MaterialCode), u => u.MaterialCode == input.MaterialCode)
.Where(!string.IsNullOrEmpty(input.ErpCode), u => u.ErpCode == input.ErpCode)
.Where(!string.IsNullOrEmpty(input.MaterialTypeName), u => u.MaterialTypeName == input.MaterialTypeName)
@@ -63,7 +62,7 @@
.Where(input.MaterialType != null, u => u.MaterialType == input.MaterialType)
.Where(!string.IsNullOrEmpty(input.MaterialGroup), u => u.MaterialGroup == input.MaterialGroup)
.Where(!string.IsNullOrEmpty(input.ABCClassName), u => u.ABCClassName == input.ABCClassName)
- //.Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
+ .Where(input.ABCClass != null, u => u.ABCClass == input.ABCClass)
.Where(!string.IsNullOrEmpty(input.MaterialSpec), u => u.MaterialSpec == input.MaterialSpec)
.Where(!string.IsNullOrEmpty(input.InPlaceCode), u => u.InPlaceCode == input.InPlaceCode)
.Where(!string.IsNullOrEmpty(input.MaterialUnit), u => u.MaterialUnit == input.MaterialUnit)
@@ -76,8 +75,8 @@
.Where(input.ControlRuleId != null, u => u.ControlRuleId == input.ControlRuleId)
.Where(input.IsDisabled != null, u => u.IsDisabled == input.IsDisabled)
.Where(!string.IsNullOrEmpty(input.MaterialDesc), u => u.MaterialDesc == input.MaterialDesc)
- .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(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<WmsMaterialSearch>(input))
@@ -87,10 +86,10 @@
}
/// <summary>
- /// 涓嶅垎椤垫煡璇㈢墿鏂欎俊鎭〃鍒楄〃
+ /// 涓嶅垎椤垫煡璇㈢墿鏂欎俊鎭垪琛�
/// </summary>
- /// <param name="input">鐗╂枡淇℃伅琛ㄦ煡璇㈠弬鏁�</param>
- /// <returns>(鐗╂枡淇℃伅琛�)瀹炰緥鍒楄〃</returns>
+ /// <param name="input">鐗╂枡淇℃伅鏌ヨ鍙傛暟</param>
+ /// <returns>(鐗╂枡淇℃伅)瀹炰緥鍒楄〃</returns>
[HttpGet("WmsMaterial/listNonPage")]
public async Task<List<WmsMaterialOutput>> ListNonPageAsync([FromQuery] WmsMaterialSearchNonPage input)
{
@@ -120,7 +119,7 @@
var pCreatedUserName = input.CreatedUserName?.Trim() ?? "";
var pUpdatedUserName = input.UpdatedUserName?.Trim() ?? "";
var wmsMaterials = await _wmsMaterialRep.DetachedEntities
- .Where(!string.IsNullOrEmpty(pMaterialName), u => EF.Functions.Like(u.MaterialName, $"%{pMaterialName}%"))
+ .Where(!string.IsNullOrEmpty(pMaterialName), u => u.MaterialName == pMaterialName)
.Where(!string.IsNullOrEmpty(pMaterialCode), u => u.MaterialCode == pMaterialCode)
.Where(!string.IsNullOrEmpty(pErpCode), u => u.ErpCode == pErpCode)
.Where(!string.IsNullOrEmpty(pMaterialTypeName), u => u.MaterialTypeName == pMaterialTypeName)
@@ -128,7 +127,7 @@
.Where(pMaterialType != null, u => u.MaterialType == pMaterialType)
.Where(!string.IsNullOrEmpty(pMaterialGroup), u => u.MaterialGroup == pMaterialGroup)
.Where(!string.IsNullOrEmpty(pABCClassName), u => u.ABCClassName == pABCClassName)
- //.Where(pABCClass != null, u => u.ABCClass == pABCClass)
+ .Where(pABCClass != null, u => u.ABCClass == pABCClass)
.Where(!string.IsNullOrEmpty(pMaterialSpec), u => u.MaterialSpec == pMaterialSpec)
.Where(!string.IsNullOrEmpty(pInPlaceCode), u => u.InPlaceCode == pInPlaceCode)
.Where(!string.IsNullOrEmpty(pMaterialUnit), u => u.MaterialUnit == pMaterialUnit)
@@ -141,8 +140,8 @@
.Where(pControlRuleId != null, u => u.ControlRuleId == pControlRuleId)
.Where(pIsDisabled != null, u => u.IsDisabled == pIsDisabled)
.Where(!string.IsNullOrEmpty(pMaterialDesc), u => u.MaterialDesc == pMaterialDesc)
- .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(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))
@@ -151,8 +150,8 @@
return wmsMaterials;
}
- /// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅琛�
+ /// <summary>
+ /// 鑾峰彇鐗╂枡淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -163,7 +162,7 @@
}
/// <summary>
- /// 鑾峰彇鐗╂枡淇℃伅琛ㄥ垪琛�
+ /// 鑾峰彇鐗╂枡淇℃伅鍒楄〃
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -228,13 +227,18 @@
await _wmsMaterialRep.InsertAsync(wmsMaterial);
- await _wmsMaterialCustomerRep.InsertAsync(materialCustomerList);
- await _wmsSubstituteGoodRep.InsertAsync(substituteGoodList);
-
+ if (materialCustomerList?.Count > 0)
+ {
+ await _wmsMaterialCustomerRep.InsertAsync(materialCustomerList);
+ }
+ if (substituteGoodList?.Count > 0)
+ {
+ await _wmsSubstituteGoodRep.InsertAsync(substituteGoodList);
+ }
}
/// <summary>
- /// 鍒犻櫎鐗╂枡淇℃伅琛�
+ /// 鍒犻櫎鐗╂枡淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -243,11 +247,11 @@
{
var wmsMaterial = await _wmsMaterialRep.FirstOrDefaultAsync(u => u.Id == input.Id);
await _wmsMaterialRep.DeleteAsync(wmsMaterial);
-
+
}
/// <summary>
- /// 鏇存柊鐗╂枡淇℃伅琛�
+ /// 鏇存柊鐗╂枡淇℃伅
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
@@ -259,12 +263,12 @@
var wmsMaterial = input.Adapt<WmsMaterial>();
//楠岃瘉
- await CheckExisit(wmsMaterial,true);
+ await CheckExisit(wmsMaterial, true);
wmsMaterial.UpdatedUserId = SysHelper.GetUserId();
wmsMaterial.UpdatedUserName = SysHelper.GetUserName();
wmsMaterial.UpdatedTime = SysHelper.GetNowTime();
- await _wmsMaterialRep.UpdateAsync(wmsMaterial,ignoreNullValues:true);
+ await _wmsMaterialRep.UpdateAsync(wmsMaterial, ignoreNullValues: true);
}
#endregion
@@ -272,23 +276,23 @@
#region 瀵煎叆
/// <summary>
- /// Excel妯℃澘瀵煎叆鐗╂枡淇℃伅琛ㄥ姛鑳�
+ /// Excel妯℃澘瀵煎叆鐗╂枡淇℃伅鍔熻兘
/// </summary>
/// <param name="file">Excel妯℃澘鏂囦欢</param>
/// <returns>瀵煎叆鐨勮褰曟暟</returns>
[HttpPost("WmsMaterial/importExcel")]
public async Task<int> ImportExcelAsync(IFormFile file)
- {
+ {
int _HeadStartLine = 2;//绗�1琛屾槸璇存槑,绗�2琛屾槸鍒楀悕
int _DataStartLine = 3;//绗�3琛屽紑濮嬫槸鏁版嵁
DataTable importDataTable = ExcelUtil.ImportExcelToDataTable(file, _HeadStartLine, _DataStartLine);
- var addList =await CommonImport(importDataTable, _DataStartLine);
+ var addList = await CommonImport(importDataTable, _DataStartLine);
lock (_lock)
{
_wmsMaterialRep.InsertAsync(addList);
-
+
}
await Task.CompletedTask;
return addList.Count;
@@ -309,277 +313,278 @@
{
index++;
- //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
- var addItem = new WmsMaterial()
- {
- CreatedTime = SysHelper.GetNowTime(),
- CreatedUserId = SysHelper.GetUserId(),
- CreatedUserName = SysHelper.GetUserName(),
- UpdatedTime = SysHelper.GetNowTime(),
- UpdatedUserId = SysHelper.GetUserId(),
- UpdatedUserName = SysHelper.GetUserName()
- };
- #region 瀹氫箟鍙橀噺
- var _MaterialName = "";//鐗╂枡鍚嶇О
- var _MaterialCode = "";//鐗╂枡缂栧彿
- var _ErpCode = "";//ERP缂栧彿
- var _MaterialTypeName = "";//鐗╂枡绫诲瀷鍚嶇О
- var _MaterialTypeDescr = "";//鐗╂枡绫诲瀷鎻忚堪
- var _MaterialType = "";//鐗╂枡绫诲瀷
- var _MaterialGroup = "";//鐗╂枡缁�
- var _ABCClassName = "";//ABC鍒嗙被鍚嶇О
- var _ABCClass = "";//ABC鍒嗙被
- var _MaterialSpec = "";//鐗╂枡瑙勬牸
- var _InPlaceCode = "";//榛樿鍏ュ簱搴撲綅
- var _MaterialUnit = "";//搴撳瓨鍗曚綅
- var _POUnit = "";//閲囪喘鍗曚綅
- var _Color = "";//棰滆壊
- var _Weight = "";//閲嶉噺
- var _SNP = "";//鏍囧寘鏁伴噺
- var _TranslateRate = "";//鎹㈢畻鐜�
- var _BatchRuleId = "";//鎵规灞炴�ц鍒�
- var _ControlRuleId = "";//鎺у埗灞炴�ц鍒�
- var _IsDisabled = "";//鏄惁绂佺敤
- var _MaterialDesc = "";//鎻忚堪
- var _Id = "";//Id涓婚敭
- #endregion
-
-
- #region 鍙栧��
- _MaterialName = row["鐗╂枡鍚嶇О"]?.ToString() ;
- _MaterialCode = row["鐗╂枡缂栧彿"]?.ToString() ;
- _ErpCode = row["ERP缂栧彿"]?.ToString() ;
- _MaterialTypeName = row["鐗╂枡绫诲瀷鍚嶇О"]?.ToString() ;
- _MaterialTypeDescr = row["鐗╂枡绫诲瀷鎻忚堪"]?.ToString() ;
- _MaterialType = row["鐗╂枡绫诲瀷"]?.ToString() ;
- _MaterialGroup = row["鐗╂枡缁�"]?.ToString() ;
- _ABCClassName = row["ABC鍒嗙被鍚嶇О"]?.ToString() ;
- _ABCClass = row["ABC鍒嗙被"]?.ToString() ;
- _MaterialSpec = row["鐗╂枡瑙勬牸"]?.ToString() ;
- _InPlaceCode = row["榛樿鍏ュ簱搴撲綅"]?.ToString() ;
- _MaterialUnit = row["搴撳瓨鍗曚綅"]?.ToString() ;
- _POUnit = row["閲囪喘鍗曚綅"]?.ToString() ;
- _Color = row["棰滆壊"]?.ToString() ;
- _Weight = row["閲嶉噺"]?.ToString() ;
- _SNP = row["鏍囧寘鏁伴噺"]?.ToString() ;
- _TranslateRate = row["鎹㈢畻鐜�"]?.ToString() ;
- _BatchRuleId = row["鎵规灞炴�ц鍒�"]?.ToString() ;
- _ControlRuleId = row["鎺у埗灞炴�ц鍒�"]?.ToString() ;
- _IsDisabled = row["鏄惁绂佺敤"]?.ToString() ;
- _MaterialDesc = row["鎻忚堪"]?.ToString() ;
- _Id = row["Id涓婚敭"]?.ToString() ;
- #endregion
-
-
- #region 楠岃瘉
-
- if (string.IsNullOrEmpty(_MaterialName))
- {
- throw Oops.Oh($"绗瑊index}琛孾鐗╂枡鍚嶇О]{_MaterialName}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MaterialName))
- {
- addItem.MaterialName = (string)_MaterialName;
- }
-
- if (string.IsNullOrEmpty(_MaterialCode))
- {
- throw Oops.Oh($"绗瑊index}琛孾鐗╂枡缂栧彿]{_MaterialCode}涓嶈兘涓虹┖锛�");
- }
-
- if(!string.IsNullOrEmpty(_MaterialCode))
- {
- addItem.MaterialCode = (string)_MaterialCode;
- }
- if(!string.IsNullOrEmpty(_ErpCode))
- {
- addItem.ErpCode = (string)_ErpCode;
- }
- if(!string.IsNullOrEmpty(_MaterialTypeName))
- {
- addItem.MaterialTypeName = (string)_MaterialTypeName;
- }
- if(!string.IsNullOrEmpty(_MaterialTypeDescr))
- {
- addItem.MaterialTypeDescr = (string)_MaterialTypeDescr;
- }
- if(!string.IsNullOrEmpty(_MaterialType))
- {
- if (!int.TryParse(_MaterialType, out int outMaterialType)&&!string.IsNullOrEmpty(_MaterialType))
- {
- throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}鍊间笉姝ｇ‘锛�");
- }
- if (outMaterialType <= 0&&!string.IsNullOrEmpty(_MaterialType))
- {
- throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.MaterialType = outMaterialType;
- }
-
- }
- if(!string.IsNullOrEmpty(_MaterialGroup))
- {
- addItem.MaterialGroup = (string)_MaterialGroup;
- }
- if(!string.IsNullOrEmpty(_ABCClassName))
- {
- addItem.ABCClassName = (string)_ABCClassName;
- }
- if(!string.IsNullOrEmpty(_ABCClass))
- {
- if (!int.TryParse(_ABCClass, out int outABCClass)&&!string.IsNullOrEmpty(_ABCClass))
- {
- throw Oops.Oh($"绗瑊index}琛孾ABC鍒嗙被]{_ABCClass}鍊间笉姝ｇ‘锛�");
- }
- if (outABCClass <= 0&&!string.IsNullOrEmpty(_ABCClass))
- {
- throw Oops.Oh($"绗瑊index}琛孾ABC鍒嗙被]{_ABCClass}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- // addItem.ABCClass = outABCClass;
- }
-
- }
- if(!string.IsNullOrEmpty(_MaterialSpec))
- {
- addItem.MaterialSpec = (string)_MaterialSpec;
- }
- if(!string.IsNullOrEmpty(_InPlaceCode))
- {
- addItem.InPlaceCode = (string)_InPlaceCode;
- }
- if(!string.IsNullOrEmpty(_MaterialUnit))
- {
- addItem.MaterialUnit = (string)_MaterialUnit;
- }
- if(!string.IsNullOrEmpty(_POUnit))
- {
- addItem.POUnit = (string)_POUnit;
- }
- if(!string.IsNullOrEmpty(_Color))
- {
- addItem.Color = (string)_Color;
- }
- if(!string.IsNullOrEmpty(_Weight))
- {
- addItem.Weight = (string)_Weight;
- }
- if(!string.IsNullOrEmpty(_SNP))
- {
- if (!decimal.TryParse(_SNP, out decimal outSNP)&&!string.IsNullOrEmpty(_SNP))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉姝ｇ‘锛�");
- }
- if (outSNP <= 0&&!string.IsNullOrEmpty(_SNP))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.SNP = outSNP;
- }
-
- }
- if(!string.IsNullOrEmpty(_TranslateRate))
- {
- if (!decimal.TryParse(_TranslateRate, out decimal outTranslateRate)&&!string.IsNullOrEmpty(_TranslateRate))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉姝ｇ‘锛�");
- }
- if (outTranslateRate <= 0&&!string.IsNullOrEmpty(_TranslateRate))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.TranslateRate = outTranslateRate;
- }
-
- }
- if(!string.IsNullOrEmpty(_BatchRuleId))
- {
- if (!long.TryParse(_BatchRuleId, out long outBatchRuleId)&&!string.IsNullOrEmpty(_BatchRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉姝ｇ‘锛�");
- }
- if (outBatchRuleId <= 0&&!string.IsNullOrEmpty(_BatchRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.BatchRuleId = outBatchRuleId;
- }
-
- }
- if(!string.IsNullOrEmpty(_ControlRuleId))
- {
- if (!long.TryParse(_ControlRuleId, out long outControlRuleId)&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉姝ｇ‘锛�");
- }
- if (outControlRuleId <= 0&&!string.IsNullOrEmpty(_ControlRuleId))
- {
- throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.ControlRuleId = outControlRuleId;
- }
-
- }
- if(!string.IsNullOrEmpty(_IsDisabled))
- {
- if(!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
- addItem.IsDisabled = outIsDisabled;
- }
- }
-
- if(!string.IsNullOrEmpty(_MaterialDesc))
- {
- addItem.MaterialDesc = (string)_MaterialDesc;
- }
- if(!string.IsNullOrEmpty(_Id))
- {
- if (!long.TryParse(_Id, out long outId)&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉姝ｇ‘锛�");
- }
- if (outId <= 0&&!string.IsNullOrEmpty(_Id))
- {
- throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
- }
- else
- {
- addItem.Id = outId;
- }
-
- }
- #endregion
-
+ //瀵煎叆妯＄増瀹氬埗鍖栦唬鐮侊紙鏇挎崲妯＄増浣跨敤锛�
-
+ var addItem = new WmsMaterial()
+ {
+ CreatedTime = SysHelper.GetNowTime(),
+ CreatedUserId = SysHelper.GetUserId(),
+ CreatedUserName = SysHelper.GetUserName(),
+ UpdatedTime = SysHelper.GetNowTime(),
+ UpdatedUserId = SysHelper.GetUserId(),
+ UpdatedUserName = SysHelper.GetUserName()
+ };
+ #region 瀹氫箟鍙橀噺
+ var _MaterialName = "";//鐗╂枡鍚嶇О
+ var _MaterialCode = "";//鐗╂枡缂栧彿
+ var _ErpCode = "";//ERP缂栧彿
+ var _MaterialTypeName = "";//鐗╂枡绫诲瀷鍚嶇О
+ var _MaterialTypeDescr = "";//鐗╂枡绫诲瀷鎻忚堪
+ var _MaterialType = "";//鐗╂枡绫诲瀷
+ var _MaterialGroup = "";//鐗╂枡缁�
+ var _ABCClassName = "";//ABC鍒嗙被鍚嶇О
+ var _ABCClass = "";//ABC鍒嗙被
+ var _MaterialSpec = "";//鐗╂枡瑙勬牸
+ var _InPlaceCode = "";//榛樿鍏ュ簱搴撲綅
+ var _MaterialUnit = "";//搴撳瓨鍗曚綅
+ var _POUnit = "";//閲囪喘鍗曚綅
+ var _Color = "";//棰滆壊
+ var _Weight = "";//閲嶉噺
+ var _SNP = "";//鏍囧寘鏁伴噺
+ var _TranslateRate = "";//鎹㈢畻鐜�
+ var _BatchRuleId = "";//鎵规灞炴�ц鍒�
+ var _ControlRuleId = "";//鎺у埗灞炴�ц鍒�
+ var _IsDisabled = "";//鏄惁绂佺敤
+ var _MaterialDesc = "";//鎻忚堪
+ var _Id = "";//Id涓婚敭
+ #endregion
+
+
+ #region 鍙栧��
+ _MaterialName = row["鐗╂枡鍚嶇О"]?.ToString();
+ _MaterialCode = row["鐗╂枡缂栧彿"]?.ToString();
+ _ErpCode = row["ERP缂栧彿"]?.ToString();
+ _MaterialTypeName = row["鐗╂枡绫诲瀷鍚嶇О"]?.ToString();
+ _MaterialTypeDescr = row["鐗╂枡绫诲瀷鎻忚堪"]?.ToString();
+ _MaterialType = row["鐗╂枡绫诲瀷"]?.ToString();
+ _MaterialGroup = row["鐗╂枡缁�"]?.ToString();
+ _ABCClassName = row["ABC鍒嗙被鍚嶇О"]?.ToString();
+ _ABCClass = row["ABC鍒嗙被"]?.ToString();
+ _MaterialSpec = row["鐗╂枡瑙勬牸"]?.ToString();
+ _InPlaceCode = row["榛樿鍏ュ簱搴撲綅"]?.ToString();
+ _MaterialUnit = row["搴撳瓨鍗曚綅"]?.ToString();
+ _POUnit = row["閲囪喘鍗曚綅"]?.ToString();
+ _Color = row["棰滆壊"]?.ToString();
+ _Weight = row["閲嶉噺"]?.ToString();
+ _SNP = row["鏍囧寘鏁伴噺"]?.ToString();
+ _TranslateRate = row["鎹㈢畻鐜�"]?.ToString();
+ _BatchRuleId = row["鎵规灞炴�ц鍒�"]?.ToString();
+ _ControlRuleId = row["鎺у埗灞炴�ц鍒�"]?.ToString();
+ _IsDisabled = row["鏄惁绂佺敤"]?.ToString();
+ _MaterialDesc = row["鎻忚堪"]?.ToString();
+ _Id = row["Id涓婚敭"]?.ToString();
+ #endregion
+
+
+ #region 楠岃瘉
+
+ if (string.IsNullOrEmpty(_MaterialName))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡鍚嶇О]{_MaterialName}涓嶈兘涓虹┖锛�");
+ }
+
+ if (!string.IsNullOrEmpty(_MaterialName))
+ {
+ addItem.MaterialName = (string)_MaterialName;
+ }
+
+ if (string.IsNullOrEmpty(_MaterialCode))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡缂栧彿]{_MaterialCode}涓嶈兘涓虹┖锛�");
+ }
+
+ if (!string.IsNullOrEmpty(_MaterialCode))
+ {
+ addItem.MaterialCode = (string)_MaterialCode;
+ }
+ if (!string.IsNullOrEmpty(_ErpCode))
+ {
+ addItem.ErpCode = (string)_ErpCode;
+ }
+ if (!string.IsNullOrEmpty(_MaterialTypeName))
+ {
+ addItem.MaterialTypeName = (string)_MaterialTypeName;
+ }
+ if (!string.IsNullOrEmpty(_MaterialTypeDescr))
+ {
+ addItem.MaterialTypeDescr = (string)_MaterialTypeDescr;
+ }
+
+ if (string.IsNullOrEmpty(_MaterialType))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}涓嶈兘涓虹┖锛�");
+ }
+
+ if (!string.IsNullOrEmpty(_MaterialType))
+ {
+ System.Int32 enumMaterialType = default(System.Int32);
+
+ if (!Enum.TryParse<System.Int32>(_MaterialType, out enumMaterialType) && !string.IsNullOrEmpty(_MaterialType))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鐗╂枡绫诲瀷]{_MaterialType}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ addItem.MaterialType = enumMaterialType;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_MaterialGroup))
+ {
+ addItem.MaterialGroup = (string)_MaterialGroup;
+ }
+ if (!string.IsNullOrEmpty(_ABCClassName))
+ {
+ addItem.ABCClassName = (string)_ABCClassName;
+ }
+ if (!string.IsNullOrEmpty(_ABCClass))
+ {
+ Admin.NET.Core.ABCClassEnum enumABCClass = default(Admin.NET.Core.ABCClassEnum);
+
+ if (!Enum.TryParse < Admin.NET.Core.ABCClassEnum > (_ABCClass, out enumABCClass)&& !string.IsNullOrEmpty(_ABCClass))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾ABC鍒嗙被]{_ABCClass}鍊间笉姝ｇ‘锛�");
+ } else
+ {
+ addItem.ABCClass = enumABCClass;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_MaterialSpec))
+ {
+ addItem.MaterialSpec = (string)_MaterialSpec;
+ }
+ if (!string.IsNullOrEmpty(_InPlaceCode))
+ {
+ addItem.InPlaceCode = (string)_InPlaceCode;
+ }
+ if (!string.IsNullOrEmpty(_MaterialUnit))
+ {
+ addItem.MaterialUnit = (string)_MaterialUnit;
+ }
+ if (!string.IsNullOrEmpty(_POUnit))
+ {
+ addItem.POUnit = (string)_POUnit;
+ }
+ if (!string.IsNullOrEmpty(_Color))
+ {
+ addItem.Color = (string)_Color;
+ }
+ if (!string.IsNullOrEmpty(_Weight))
+ {
+ addItem.Weight = (string)_Weight;
+ }
+ if (!string.IsNullOrEmpty(_SNP))
+ {
+ if (!decimal.TryParse(_SNP, out decimal outSNP) && !string.IsNullOrEmpty(_SNP))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉姝ｇ‘锛�");
+ }
+ if (outSNP <= 0 && !string.IsNullOrEmpty(_SNP))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏍囧寘鏁伴噺]{_SNP}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.SNP = outSNP;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_TranslateRate))
+ {
+ if (!decimal.TryParse(_TranslateRate, out decimal outTranslateRate) && !string.IsNullOrEmpty(_TranslateRate))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉姝ｇ‘锛�");
+ }
+ if (outTranslateRate <= 0 && !string.IsNullOrEmpty(_TranslateRate))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎹㈢畻鐜嘳{_TranslateRate}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.TranslateRate = outTranslateRate;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_BatchRuleId))
+ {
+ if (!long.TryParse(_BatchRuleId, out long outBatchRuleId) && !string.IsNullOrEmpty(_BatchRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉姝ｇ‘锛�");
+ }
+ if (outBatchRuleId <= 0 && !string.IsNullOrEmpty(_BatchRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎵规灞炴�ц鍒橾{_BatchRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.BatchRuleId = outBatchRuleId;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_ControlRuleId))
+ {
+ if (!long.TryParse(_ControlRuleId, out long outControlRuleId) && !string.IsNullOrEmpty(_ControlRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉姝ｇ‘锛�");
+ }
+ if (outControlRuleId <= 0 && !string.IsNullOrEmpty(_ControlRuleId))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鎺у埗灞炴�ц鍒橾{_ControlRuleId}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.ControlRuleId = outControlRuleId;
+ }
+
+ }
+ if (!string.IsNullOrEmpty(_IsDisabled))
+ {
+ if (!_IsDisabled.Equals("鏄�") && !_IsDisabled.Equals("鍚�"))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾鏄惁绂佺敤]{_IsDisabled}鍊间笉姝ｇ‘锛�");
+ }
+ else
+ {
+ bool outIsDisabled = _IsDisabled.Equals("鏄�") ? true : false;
+ addItem.IsDisabled = outIsDisabled;
+ }
+ }
+
+ if (!string.IsNullOrEmpty(_MaterialDesc))
+ {
+ addItem.MaterialDesc = (string)_MaterialDesc;
+ }
+ if (!string.IsNullOrEmpty(_Id))
+ {
+ if (!long.TryParse(_Id, out long outId) && !string.IsNullOrEmpty(_Id))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉姝ｇ‘锛�");
+ }
+ if (outId <= 0 && !string.IsNullOrEmpty(_Id))
+ {
+ throw Oops.Oh($"绗瑊index}琛孾Id涓婚敭]{_Id}鍊间笉鑳藉皬浜庣瓑浜�0锛�");
+ }
+ else
+ {
+ addItem.Id = outId;
+ }
+
+ }
+ #endregion
+
+
+
details.Add(addItem);
}
- //楠岄噸
- await CheckExisitForImport(details);
-
+ //楠岄噸
+ await CheckExisitForImport(details);
+
return details;
}
/// <summary>
- /// 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅琛ㄧ殑Excel瀵煎叆妯℃澘
+ /// 鏍规嵁鐗堟湰涓嬭浇鐗╂枡淇℃伅鐨凟xcel瀵煎叆妯℃澘
/// </summary>
/// <param name="version">妯℃澘鐗堟湰</param>
/// <returns>涓嬭浇鐨勬ā鏉挎枃浠�</returns>
@@ -587,7 +592,7 @@
public IActionResult DownloadExcelTemplate([FromQuery] string version)
{
string _path = TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増璺緞 + $"\\WmsMaterial{TemplateConst.EXCEL_TEMPLATEFILE_瀵煎叆妯＄増鍚嶇О鍚庣紑}.xlsx";
- var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鐗╂枡淇℃伅琛�).xlsx", Encoding.GetEncoding("UTF-8"));
+ var fileName = HttpUtility.UrlEncode($"瀵煎叆妯℃澘(鐗╂枡淇℃伅).xlsx", Encoding.GetEncoding("UTF-8"));
return new FileStreamResult(new FileStream(_path, FileMode.Open), "application/octet-stream") { FileDownloadName = fileName };
}
@@ -601,80 +606,80 @@
/// <param name="input"></param>
/// <param name="isEdit"></param>
/// <returns></returns>
- private async Task CheckExisit( WmsMaterial input,bool isEdit=false)
+ private async Task CheckExisit(WmsMaterial input, bool isEdit = false)
{
-
-
- bool isExist = false;
- if (!isEdit)//鏂板
- {
- //鏁版嵁鏄惁瀛樺湪閲嶅
- isExist = await _wmsMaterialRep.AnyAsync(u =>
- u.MaterialCode.Equals(input.MaterialCode)
- ,false);
- }
- else//缂栬緫
- {
-
-
- //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
- isExist = await _wmsMaterialRep.AnyAsync(u =>
- u.Id != input.Id
- &&u.MaterialCode.Equals(input.MaterialCode)
- ,false);
- }
-
-
+
+ bool isExist = false;
+ if (!isEdit)//鏂板
+ {
+ //鏁版嵁鏄惁瀛樺湪閲嶅
+ isExist = await _wmsMaterialRep.AnyAsync(u =>
+ u.MaterialCode.Equals(input.MaterialCode)
+ , false);
+ }
+ else//缂栬緫
+ {
+
+
+
+ //褰撳墠缂栬緫鏁版嵁浠ュ鏄惁瀛樺湪閲嶅
+ isExist = await _wmsMaterialRep.AnyAsync(u =>
+ u.Id != input.Id
+ && u.MaterialCode.Equals(input.MaterialCode)
+ , false);
+ }
+
+
if (isExist) throw Oops.Oh(ErrorCode.E0001);
- }
-
+ }
+
/// <summary>
/// 鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁鏄惁宸插瓨鍦�-瀵煎叆鏃堕獙璇�
/// </summary>
/// <param name="inputs"></param>
/// <returns></returns>
private async Task CheckExisitForImport(List<WmsMaterial> inputs)
- {
+ {
//鏍规嵁鑱斿悎涓婚敭楠岃瘉琛ㄦ牸涓腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- if (inputs?.Count <= 0)
- {
- throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
- }
- //鏁版嵁鏄惁閲嶅
- var existExcelItem = inputs.GroupBy(g => new {
- g.MaterialCode
- })
- .Where(g => g.Count() > 1)
- .Select(s => new {
- s.Key.MaterialCode
- }).FirstOrDefault();
- if (existExcelItem != null)
- {
- var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
- var item= existExcelItem.Adapt<WmsMaterial>();
- throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
- }
-
+ if (inputs?.Count <= 0)
+ {
+ throw Oops.Oh($"瀵煎叆鏁版嵁涓嶈兘涓虹┖");
+ }
+ //鏁版嵁鏄惁閲嶅
+ var existExcelItem = inputs.GroupBy(g => new {
+ g.MaterialCode
+ })
+ .Where(g => g.Count() > 1)
+ .Select(s => new {
+ s.Key.MaterialCode
+ }).FirstOrDefault();
+ if (existExcelItem != null)
+ {
+ var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
+ var item = existExcelItem.Adapt<WmsMaterial>();
+ throw Oops.Oh($"瀵煎叆鐨勮〃鏍间腑,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
+ }
- //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
- var existDBItem = await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(w=>
- inputs.Select(s=>""
- +s.MaterialCode
- )
- .Contains(""
- +w.MaterialCode
- ));
- if (existDBItem != null)
- {
- var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
- var item= existExcelItem.Adapt<WmsMaterial>();
- throw Oops.Oh($"绯荤粺涓�,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
- }
+
+ //鏍规嵁鑱斿悎涓婚敭楠岃瘉鏁版嵁搴撲腑鏄惁宸插瓨鍦ㄧ浉鍚屾暟鎹�
+ var existDBItem = await _wmsMaterialRep.DetachedEntities.FirstOrDefaultAsync(w =>
+ inputs.Select(s => ""
+ + s.MaterialCode
+ )
+ .Contains(""
+ + w.MaterialCode
+ ));
+ if (existDBItem != null)
+ {
+ var wmsMaterial = existExcelItem.Adapt<WmsMaterial>();
+ var item = existExcelItem.Adapt<WmsMaterial>();
+ throw Oops.Oh($"绯荤粺涓�,鐗╂枡缂栧彿[{item.MaterialCode}]宸插瓨鍦�");
+ }
}
#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 27de6bc..4176170 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
@@ -45,45 +45,7 @@
/// </summary>
public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { get; set; }
+
/// <summary>
/// 鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -252,45 +214,7 @@
/// </summary>
public virtual Admin.NET.Core.PlaceStatusEnum? PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { get; set; }
+
/// <summary>
/// 鏄惁婵�娲讳笌浠诲姟璋冨害
@@ -459,45 +383,7 @@
[Required(ErrorMessage = "搴撲綅灞炴�т笉鑳戒负绌�")]
public virtual Admin.NET.Core.PlaceStatusEnum PlaceStatus { get; set; }
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- public virtual bool? IsSrmPlace { get; set; }
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- public virtual string SrmPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- public virtual bool? IsRgvPlace { get; set; }
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- public virtual string RgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- public virtual bool? IsAgvPlace { get; set; }
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- public virtual string AgvPlaceNo { get; set; }
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- public virtual bool? IsTransPlace { get; set; }
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- public virtual string TransPlaceNo { 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 05f14e0..ea3153d 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
@@ -56,14 +56,6 @@
.Where(input.PlaceType != null, u => u.PlaceType == input.PlaceType)
.Where(!string.IsNullOrEmpty(input.PlaceTypeName), u => u.PlaceTypeName == input.PlaceTypeName)
.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)
- .Where(input.IsRgvPlace != null, u => u.IsRgvPlace == input.IsRgvPlace)
- .Where(!string.IsNullOrEmpty(input.RgvPlaceNo), u => u.RgvPlaceNo == input.RgvPlaceNo)
- .Where(input.IsAgvPlace != null, u => u.IsAgvPlace == input.IsAgvPlace)
- .Where(!string.IsNullOrEmpty(input.AgvPlaceNo), u => u.AgvPlaceNo == input.AgvPlaceNo)
- .Where(input.IsTransPlace != null, u => u.IsTransPlace == input.IsTransPlace)
- .Where(!string.IsNullOrEmpty(input.TransPlaceNo), u => u.TransPlaceNo == input.TransPlaceNo)
.Where(input.IsActivateWCS != null, u => u.IsActivateWCS == input.IsActivateWCS)
.Where(!string.IsNullOrEmpty(input.Environment), u => u.Environment == input.Environment)
.Where(!string.IsNullOrEmpty(input.AreaCode), u => u.AreaCode == input.AreaCode)
@@ -109,14 +101,6 @@
var pPlaceType = input.PlaceType;
var pPlaceTypeName = input.PlaceTypeName?.Trim() ?? "";
var pPlaceStatus = input.PlaceStatus;
- var pIsSrmPlace = input.IsSrmPlace;
- var pSrmPlaceNo = input.SrmPlaceNo?.Trim() ?? "";
- var pIsRgvPlace = input.IsRgvPlace;
- var pRgvPlaceNo = input.RgvPlaceNo?.Trim() ?? "";
- var pIsAgvPlace = input.IsAgvPlace;
- var pAgvPlaceNo = input.AgvPlaceNo?.Trim() ?? "";
- var pIsTransPlace = input.IsTransPlace;
- var pTransPlaceNo = input.TransPlaceNo?.Trim() ?? "";
var pIsActivateWCS = input.IsActivateWCS;
var pEnvironment = input.Environment?.Trim() ?? "";
var pAreaCode = input.AreaCode?.Trim() ?? "";
@@ -149,14 +133,6 @@
.Where(pPlaceType != null, u => u.PlaceType == pPlaceType)
.Where(!string.IsNullOrEmpty(pPlaceTypeName), u => u.PlaceTypeName == pPlaceTypeName)
.Where(pPlaceStatus != null, u => u.PlaceStatus == pPlaceStatus)
- .Where(pIsSrmPlace != null, u => u.IsSrmPlace == pIsSrmPlace)
- .Where(!string.IsNullOrEmpty(pSrmPlaceNo), u => u.SrmPlaceNo == pSrmPlaceNo)
- .Where(pIsRgvPlace != null, u => u.IsRgvPlace == pIsRgvPlace)
- .Where(!string.IsNullOrEmpty(pRgvPlaceNo), u => u.RgvPlaceNo == pRgvPlaceNo)
- .Where(pIsAgvPlace != null, u => u.IsAgvPlace == pIsAgvPlace)
- .Where(!string.IsNullOrEmpty(pAgvPlaceNo), u => u.AgvPlaceNo == pAgvPlaceNo)
- .Where(pIsTransPlace != null, u => u.IsTransPlace == pIsTransPlace)
- .Where(!string.IsNullOrEmpty(pTransPlaceNo), u => u.TransPlaceNo == pTransPlaceNo)
.Where(pIsActivateWCS != null, u => u.IsActivateWCS == pIsActivateWCS)
.Where(!string.IsNullOrEmpty(pEnvironment), u => u.Environment == pEnvironment)
.Where(!string.IsNullOrEmpty(pAreaCode), u => u.AreaCode == pAreaCode)
@@ -472,74 +448,7 @@
}
}
- if(!string.IsNullOrEmpty(_IsSrmPlace))
- {
- if(!_IsSrmPlace.Equals("鏄�") && !_IsSrmPlace.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁鍫嗗灈鏈哄簱浣峕{_IsSrmPlace}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsSrmPlace = _IsSrmPlace.Equals("鏄�") ? true : false;
- addItem.IsSrmPlace = outIsSrmPlace;
- }
- }
-
- if(!string.IsNullOrEmpty(_SrmPlaceNo))
- {
- addItem.SrmPlaceNo = (string)_SrmPlaceNo;
- }
- if(!string.IsNullOrEmpty(_IsRgvPlace))
- {
- if(!_IsRgvPlace.Equals("鏄�") && !_IsRgvPlace.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁RGV搴撲綅]{_IsRgvPlace}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsRgvPlace = _IsRgvPlace.Equals("鏄�") ? true : false;
- addItem.IsRgvPlace = outIsRgvPlace;
- }
- }
-
- if(!string.IsNullOrEmpty(_RgvPlaceNo))
- {
- addItem.RgvPlaceNo = (string)_RgvPlaceNo;
- }
- if(!string.IsNullOrEmpty(_IsAgvPlace))
- {
- if(!_IsAgvPlace.Equals("鏄�") && !_IsAgvPlace.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁AGV搴撲綅]{_IsAgvPlace}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsAgvPlace = _IsAgvPlace.Equals("鏄�") ? true : false;
- addItem.IsAgvPlace = outIsAgvPlace;
- }
- }
-
- if(!string.IsNullOrEmpty(_AgvPlaceNo))
- {
- addItem.AgvPlaceNo = (string)_AgvPlaceNo;
- }
- if(!string.IsNullOrEmpty(_IsTransPlace))
- {
- if(!_IsTransPlace.Equals("鏄�") && !_IsTransPlace.Equals("鍚�"))
- {
- throw Oops.Oh($"绗瑊index}琛孾鏄惁杈撻�佺嚎搴撲綅]{_IsTransPlace}鍊间笉姝ｇ‘锛�");
- }
- else
- {
- bool outIsTransPlace = _IsTransPlace.Equals("鏄�") ? true : false;
- addItem.IsTransPlace = outIsTransPlace;
- }
- }
-
- if(!string.IsNullOrEmpty(_TransPlaceNo))
- {
- addItem.TransPlaceNo = (string)_TransPlaceNo;
- }
+
if(!string.IsNullOrEmpty(_IsActivateWCS))
{
if(!_IsActivateWCS.Equals("鏄�") && !_IsActivateWCS.Equals("鍚�"))
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 d1066d6..e22aa7f 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Core/Entity/WmsBase/WmsPlace.cs
@@ -4,7 +4,7 @@
/*
* @author : 鍒樻枃濂�
- * @date : 2024/4/23涓嬪崍6:30:44
+ * @date : 2024/4/24涓嬪崍4:54:43
* @desc : 搴撲綅琛�
*/
namespace Admin.NET.Core
@@ -77,70 +77,6 @@
[Required]
public PlaceStatusEnum PlaceStatus { get; set; }
-
-
- /// <summary>
- /// 鏄惁鍫嗗灈鏈哄簱浣�
- /// </summary>
- [Comment("鏄惁鍫嗗灈鏈哄簱浣�")]
-
- public bool? IsSrmPlace { get; set; }
-
-
- /// <summary>
- /// 鍫嗗灈鏈哄簱浣嶅彿
- /// </summary>
- [Comment("鍫嗗灈鏈哄簱浣嶅彿")]
- [MaxLength(50)]
- public string SrmPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁RGV搴撲綅
- /// </summary>
- [Comment("鏄惁RGV搴撲綅")]
-
- public bool? IsRgvPlace { get; set; }
-
-
- /// <summary>
- /// RGV搴撲綅鍙�
- /// </summary>
- [Comment("RGV搴撲綅鍙�")]
- [MaxLength(50)]
- public string RgvPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁AGV搴撲綅
- /// </summary>
- [Comment("鏄惁AGV搴撲綅")]
-
- public bool? IsAgvPlace { get; set; }
-
-
- /// <summary>
- /// AGV搴撲綅鍙�
- /// </summary>
- [Comment("AGV搴撲綅鍙�")]
- [MaxLength(50)]
- public string AgvPlaceNo { get; set; }
-
-
- /// <summary>
- /// 鏄惁杈撻�佺嚎搴撲綅
- /// </summary>
- [Comment("鏄惁杈撻�佺嚎搴撲綅")]
-
- public bool? IsTransPlace { get; set; }
-
-
- /// <summary>
- /// 杈撻�佺嚎搴撲綅鍙�
- /// </summary>
- [Comment("杈撻�佺嚎搴撲綅鍙�")]
- [MaxLength(50)]
- public string TransPlaceNo { get; set; }
/// <summary>
diff --git a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
index 0a407ec..3b153c7 100644
--- a/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
+++ b/iWare_RawMaterialWarehouse_Wms/Admin.NET.Web.Entry/wwwroot/ExcelTemplateFile/WmsMaterialImport.xlsx
Binary files differ
diff --git "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json" "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
index d200acb..2a4ee6c 100755
--- "a/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
+++ "b/\344\275\277\347\224\250\346\226\207\346\241\243/PDManer\346\226\207\344\273\266/\345\216\237\346\235\220\346\226\231\345\272\223\346\240\207\345\207\206\345\214\226.pdma.json"
@@ -4,7 +4,7 @@
"avatar": "",
"version": "4.1.3",
"createdTime": "2024-4-12 12:56:29",
- "updatedTime": "2024-4-24 15:31:08",
+ "updatedTime": "2024-4-24 16:53:19",
"dbConns": [],
"profile": {
"default": {
@@ -103,7 +103,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓鑰匢d",
+ "defName": "鍒涘缓浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -121,7 +121,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼鑰匢d",
+ "defName": "淇敼浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -21734,7 +21734,7 @@
},
{
"defKey": "ErpCode",
- "defName": "ERP浠ｇ爜",
+ "defName": "ERP搴撳瓨鍦�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -21965,7 +21965,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓鑰匢d",
+ "defName": "鍒涘缓浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -21993,7 +21993,7 @@
},
{
"defKey": "CreatedUserName",
- "defName": "鍒涘缓鑰呭悕绉�",
+ "defName": "鍒涘缓浜�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -22021,7 +22021,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼鑰匢d",
+ "defName": "淇敼浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -22049,7 +22049,7 @@
},
{
"defKey": "UpdatedUserName",
- "defName": "淇敼鑰呭悕绉�",
+ "defName": "淇敼浜�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -32872,153 +32872,6 @@
"uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
},
{
- "defKey": "IsSrmPlace",
- "defName": "鏄惁鍫嗗灈鏈哄簱浣�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "335D3433-78A5-4213-A410-95E1EFF532D6"
- },
- {
- "defKey": "SrmPlaceNo",
- "defName": "鍫嗗灈鏈哄簱浣嶅彿",
- "comment": "",
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "attr1": "",
- "attr2": "",
- "attr3": "",
- "attr4": "",
- "attr5": "",
- "attr6": "",
- "attr7": "",
- "attr8": "",
- "attr9": "",
- "id": "BC41E431-8E6A-4253-83F4-E589578322AA",
- "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD",
- "extProps": {},
- "uiHint": "642D2E0A-8846-4549-BE56-8C0473F26EDE"
- },
- {
- "defKey": "IsRgvPlace",
- "defName": "鏄惁RGV搴撲綅",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "B18994CA-EB0C-4402-BB8E-749C080166F4"
- },
- {
- "defKey": "RgvPlaceNo",
- "defName": "RGV搴撲綅鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "3146288B-6B5D-447C-9339-7DB5D90E56FD"
- },
- {
- "defKey": "IsAgvPlace",
- "defName": "鏄惁AGV搴撲綅",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "3BCB2418-C037-45BE-90B7-23F37696721B"
- },
- {
- "defKey": "AgvPlaceNo",
- "defName": "AGV搴撲綅鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "B07702F7-3F57-4A8E-B5EA-8A70FD6463E3"
- },
- {
- "defKey": "IsTransPlace",
- "defName": "鏄惁杈撻�佺嚎搴撲綅",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": true,
- "refDict": "",
- "extProps": {},
- "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
- "id": "4FD2149A-C5A6-45C0-A72B-0476A5967CF7"
- },
- {
- "defKey": "TransPlaceNo",
- "defName": "杈撻�佺嚎搴撲綅鍙�",
- "comment": "",
- "type": "",
- "len": "",
- "scale": "",
- "primaryKey": false,
- "notNull": false,
- "autoIncrement": false,
- "defaultValue": "",
- "hideInGraph": false,
- "refDict": "",
- "extProps": {},
- "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
- "id": "755769AB-B19A-4E22-8BA3-2E44E4AC7D86"
- },
- {
"defKey": "IsActivateWCS",
"defName": "鏄惁婵�娲讳笌浠诲姟璋冨害",
"comment": "",
@@ -33565,7 +33418,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓鑰匢d",
+ "defName": "鍒涘缓浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -33593,7 +33446,7 @@
},
{
"defKey": "CreatedUserName",
- "defName": "鍒涘缓鑰呭悕绉�",
+ "defName": "鍒涘缓浜�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -33621,7 +33474,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼鑰匢d",
+ "defName": "淇敼浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -33649,7 +33502,7 @@
},
{
"defKey": "UpdatedUserName",
- "defName": "淇敼鑰呭悕绉�",
+ "defName": "淇敼浜�",
"comment": "",
"domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
"type": "",
@@ -42388,7 +42241,7 @@
},
{
"defKey": "CreatedUserId",
- "defName": "鍒涘缓鑰匢d",
+ "defName": "鍒涘缓浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -42406,7 +42259,7 @@
},
{
"defKey": "UpdatedUserId",
- "defName": "淇敼鑰匢d",
+ "defName": "淇敼浜篒d",
"comment": "",
"domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
"type": "",
@@ -48540,6 +48393,335 @@
],
"correlations": [],
"indexes": []
+ },
+ {
+ "id": "A9C5E453-7EE0-447F-97B1-AF52177E7E2E",
+ "env": {
+ "base": {
+ "nameSpace": "",
+ "codeRoot": ""
+ }
+ },
+ "defKey": "wms_equipment_place",
+ "defName": "璁惧搴撲綅鍏宠仈淇℃伅",
+ "comment": "",
+ "properties": {
+ "partitioned by": "(date string)",
+ "row format delimited": "",
+ "fields terminated by ','": "",
+ "collection items terminated by '-'": "",
+ "map keys terminated by ':'": "",
+ "store as textfile;": ""
+ },
+ "nameTemplate": "{defKey}[{defName}]",
+ "headers": [
+ {
+ "refKey": "hideInGraph",
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "defName",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "primaryKey",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "notNull",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "autoIncrement",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "domain",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "type",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "len",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "scale",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "comment",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "refDict",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "defaultValue",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "isStandard",
+ "freeze": false,
+ "hideInGraph": false
+ },
+ {
+ "refKey": "uiHint",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "extProps",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr1",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr2",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr3",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr4",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr5",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr6",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr7",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr8",
+ "freeze": false,
+ "hideInGraph": true
+ },
+ {
+ "refKey": "attr9",
+ "freeze": false,
+ "hideInGraph": true
+ }
+ ],
+ "fields": [
+ {
+ "defKey": "Id",
+ "defName": "Id涓婚敭",
+ "comment": "",
+ "type": "",
+ "len": 32,
+ "scale": "",
+ "primaryKey": true,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "domain": "16120F75-6AA7-4483-868D-F07F511BB081",
+ "refDict": "",
+ "uiHint": "",
+ "id": "FD6CFC18-8FF1-4AC9-9591-8D83EE7EC6C7",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "EquipmentNo",
+ "defName": "璁惧鍙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "4B7A4560-9A82-4E0D-913C-4397ACC815A0"
+ },
+ {
+ "defKey": "PlaceNo",
+ "defName": "搴撲綅鍙�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "CC93D3DD-2AF1-4A4E-AC83-894197701520"
+ },
+ {
+ "defKey": "CreatedUserName",
+ "defName": "鍒涘缓浜�",
+ "comment": "",
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "3F8A210A-A76C-4D93-8328-6CC79B7875EF",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "CreatedTime",
+ "defName": "鍒涘缓鏃堕棿",
+ "comment": "",
+ "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "7796D18C-32E1-4472-9811-E2983F1E3ECB",
+ "baseType": "1D764C4A-6F9F-421E-B11A-6F3E23B51811"
+ },
+ {
+ "defKey": "UpdatedUserName",
+ "defName": "淇敼浜�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "94107640-E002-4AB3-A2DC-B66F98D9645F",
+ "id": "9FCCB6EB-3536-4ACF-92EA-EE685B1E4869",
+ "baseType": "F8A4AFB0-F3B7-4E32-A5F2-D4D8D3F4BACD"
+ },
+ {
+ "defKey": "UpdatedTime",
+ "defName": "淇敼鏃堕棿",
+ "comment": "",
+ "domain": "E9456E44-8231-4BC0-B2CD-5FF4AEC6DE97",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "89D9334C-753F-494A-ACC8-38F38C58C907",
+ "baseType": "FC9790A7-36B8-4A48-8F9A-BC1042BCFE64"
+ },
+ {
+ "defKey": "CreatedUserId",
+ "defName": "鍒涘缓浜篒d",
+ "comment": "",
+ "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "1924CB76-82B6-4697-BA4D-4A22505420F4",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "UpdatedUserId",
+ "defName": "淇敼浜篒d",
+ "comment": "",
+ "domain": "717941D9-8B3F-435A-9F8E-8D13B7404D5B",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": false,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": true,
+ "refDict": "",
+ "uiHint": "",
+ "id": "1EC5776B-1E12-4656-941E-93D9202636F8",
+ "baseType": "89D69E81-EA34-42EE-9FA2-93B8BD27E098"
+ },
+ {
+ "defKey": "IsDeleted",
+ "defName": "杞垹闄ゆ爣璁�",
+ "comment": "",
+ "type": "",
+ "len": "",
+ "scale": "",
+ "primaryKey": false,
+ "notNull": true,
+ "autoIncrement": false,
+ "defaultValue": "",
+ "hideInGraph": false,
+ "refDict": "",
+ "extProps": {},
+ "domain": "6F7C1C5C-D159-41E6-BF9D-54DEEFA79AFF",
+ "id": "D689DF98-A794-4AF4-8C2C-DB63E7306698",
+ "baseType": "7ECAE23D-9FDB-4015-93BC-459D56A1ACA1"
+ }
+ ],
+ "correlations": [],
+ "indexes": []
}
],
"views": [
@@ -49090,7 +49272,8 @@
"5BA66776-30F0-4C71-92A3-0A6CB6985823",
"30A9CA8E-93F6-4AFB-A388-CA0C01F74222",
"AD6794A1-3C5C-4DA3-86A9-222FBBFD109D",
- "041BF159-8998-4542-84A3-5E07D1616AF1"
+ "041BF159-8998-4542-84A3-5E07D1616AF1",
+ "A9C5E453-7EE0-447F-97B1-AF52177E7E2E"
],
"refViews": [],
"refDiagrams": [],
--
Gitblit v1.9.3