From 85458565e09bda1044d19b13d0b1ffb7ab576857 Mon Sep 17 00:00:00 2001
From: hutongqing <hutongqing@hnkhzn.com>
Date: 星期五, 22 十一月 2024 16:47:40 +0800
Subject: [PATCH] 货位分配
---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs | 56 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationChangeType.cs | 16
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderStatusEnum.cs | 42 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderTypeEnum.cs | 57 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs | 11
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockChangeTypeEnum.cs | 47 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/RuleCodeEnum.cs | 27
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OperateTypeEnum.cs | 18
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs | 44 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/InTaskStatusEnum.cs | 81 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InitializationLocationDTO.cs | 16
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/OutTaskStatusEnum.cs | 51 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/SynchronizationFlagEmun.cs | 33 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisFormatTypeEnum.cs | 46 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_Hty.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderStatusEnum.cs | 45 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/CodeFormatTypeEnum.cs | 51 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ILocationInfoService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs | 51
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisRuleEnum.cs | 27
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs | 24
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs | 24
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PalletTypeEnum.cs | 15
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MatSerialNumberDTO.cs | 12
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs | 1
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OtherEnum/SequenceEnum.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs | 13
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs | 196 ++++++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs | 39 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs | 237 +++---
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs | 3
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/AnalysisRuleAttribute.cs | 7
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/EnableEnum.cs | 21
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs | 50 -
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs | 42 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json | 2
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs | 108 +++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs | 2
/dev/null | 14
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs | 8
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/EnableStatusEnum.cs | 39 +
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/10b99ab2-3ed9-4168-861d-3e713d433fdb.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderTypeEnum.cs | 63 ++
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs | 4
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisCodeEnum.cs | 27
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs | 48 +
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/CodeRuleAttribute.cs | 5
代码管理/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs | 13
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0953fb38-b0b7-412f-af85-0f46fe65641c.vsidx | 0
代码管理/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2400cefb-3970-4564-9733-19be936041f9.vsidx | 0
77 files changed, 1,472 insertions(+), 350 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0953fb38-b0b7-412f-af85-0f46fe65641c.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0953fb38-b0b7-412f-af85-0f46fe65641c.vsidx"
new file mode 100644
index 0000000..205df99
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/0953fb38-b0b7-412f-af85-0f46fe65641c.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/10b99ab2-3ed9-4168-861d-3e713d433fdb.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/10b99ab2-3ed9-4168-861d-3e713d433fdb.vsidx"
new file mode 100644
index 0000000..7c59fa1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/10b99ab2-3ed9-4168-861d-3e713d433fdb.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6de014c0-a655-432d-8c83-35558b37c1a3.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2400cefb-3970-4564-9733-19be936041f9.vsidx"
similarity index 100%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/6de014c0-a655-432d-8c83-35558b37c1a3.vsidx"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/2400cefb-3970-4564-9733-19be936041f9.vsidx"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/80eaf492-40a3-42d4-8e5b-d47619044cf1.vsidx" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/80eaf492-40a3-42d4-8e5b-d47619044cf1.vsidx"
deleted file mode 100644
index 8f3b8ae..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/.vs/WIDESEA_WMSServer/FileContentIndex/80eaf492-40a3-42d4-8e5b-d47619044cf1.vsidx"
+++ /dev/null
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
index 02e31a6..7508d1f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/LocationInfoRepository.cs"
@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.LocationEnum;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
index ce03d5f..b80d8f0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicRepository/WarehouseRepository.cs"
@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Enums;
using WIDESEA_IBasicRepository;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
index f071b2d..677a7a6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/LocationInfoService.cs"
@@ -1,9 +1,11 @@
-锘縰sing SqlSugar;
+锘縰sing OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using SqlSugar;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.LocationEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
@@ -83,10 +85,26 @@
(bool, string, object?) result = ModelValidate.ValidateModelData(initializationLocationDTO);
if (!result.Item1) return WebResponseContent.Instance.Error(result.Item2);
- int side = 1;
+ int depth = initializationLocationDTO.Depth;
List<Dt_LocationInfo> locationInfos = new List<Dt_LocationInfo>();
for (int i = 0; i < initializationLocationDTO.MaxRow; i++)
{
+ if((i + 1) % initializationLocationDTO.MaxRow == 1)
+ {
+ depth = initializationLocationDTO.Depth;
+ }
+ else if ((i + 1) % initializationLocationDTO.MaxRow == initializationLocationDTO.Depth + 1)
+ {
+ depth = 1;
+ }
+ else if ((i + 1) % initializationLocationDTO.MaxRow > 1 && (i + 1) % initializationLocationDTO.MaxRow <= initializationLocationDTO.Depth)
+ {
+ depth -= 1;
+ }
+ else
+ {
+ depth += 1;
+ }
for (int j = 0; j < initializationLocationDTO.MaxColumn; j++)
{
for (int k = 0; k < initializationLocationDTO.MaxLayer; k++)
@@ -98,36 +116,17 @@
EnableStatus = EnableStatusEnum.Normal.ObjToInt(),
Layer = k + 1,
LocationStatus = LocationStatusEnum.Free.ObjToInt(),
- LocationType = LocationTypeEnum.Cube.ObjToInt(),
- RoadwayNo = initializationLocationDTO.Roadway,
+ LocationType = LocationTypeEnum.Undefined.ObjToInt(),
+ RoadwayNo = $"R{initializationLocationDTO.Roadway.ToString()}",
Row = i + 1,
+ Depth = depth,
};
-
- if (initializationLocationDTO.IsSingleDepth)
- {
- locationInfo.Depth = 1;
- locationInfo.LocationCode = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
- locationInfo.LocationName = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
- }
- else
- {
- if (initializationLocationDTO.FirstDepthRows.Contains(i + 1))
- {
- locationInfo.Depth = 1;
- }
- else
- {
- locationInfo.Depth = 2;
- }
- locationInfo.LocationCode = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
- locationInfo.LocationName = $"R{initializationLocationDTO.Roadway.ToString().PadLeft(2, '0')}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
- }
-
+ locationInfo.LocationCode = $"{locationInfo.RoadwayNo}-{locationInfo.Row.ToString().PadLeft(3, '0')}-{locationInfo.Column.ToString().PadLeft(3, '0')}-{locationInfo.Layer.ToString().PadLeft(3, '0')}-{locationInfo.Depth.ToString().PadLeft(2, '0')}";
+ locationInfo.LocationName = $"{locationInfo.RoadwayNo}宸烽亾{locationInfo.Row.ToString().PadLeft(3, '0')}琛寋locationInfo.Column.ToString().PadLeft(3, '0')}鍒梴locationInfo.Layer.ToString().PadLeft(3, '0')}灞倇locationInfo.Depth.ToString().PadLeft(2, '0')}娣�";
locationInfos.Add(locationInfo);
}
}
}
-
BaseDal.AddData(locationInfos);
return WebResponseContent.Instance.OK();
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
index b95398a..4528779 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Base/WarehouseService.cs"
@@ -10,6 +10,7 @@
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
using WIDESEA_Core.Helper;
+using WIDESEA_Common.CommonEnum;
namespace WIDESEA_BasicService
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
index a5bfbb3..679c7cd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_BasicService/Service/LocationInfoService.cs"
@@ -16,6 +16,8 @@
using WIDESEA_IRecordService;
using WIDESEA_IBasicService;
using WIDESEA_Model.Models;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
namespace WIDESEA_BasicService
{
@@ -27,12 +29,194 @@
_basicRepository = basicRepository;
_recordService = recordService;
}
- private Dictionary<string, OrderByType> _emptyAssignOrderBy = new Dictionary<string, OrderByType>()
+
+ double weightValue = 0.5;
+
+ private readonly static object _locker = new object();
+ static List<LocationCache> locationCaches = new List<LocationCache>();
+ public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType)
{
- { nameof(Dt_LocationInfo.Depth), OrderByType.Desc },
- { nameof(Dt_LocationInfo.Layer), OrderByType.Asc },
- { nameof(Dt_LocationInfo.Column), OrderByType.Asc },
- { nameof(Dt_LocationInfo.Row), OrderByType.Asc },
- };
+ lock (_locker)
+ {
+ List<LocationCache> removeItems = locationCaches.Where(x => (DateTime.Now - x.DateTime).TotalMinutes > 5).ToList();
+ int count = removeItems.Count;
+ for (int i = 0; i < count; i++)
+ {
+ locationCaches.Remove(removeItems[i]);
+ }
+
+ List<string> lockLocationCodes = locationCaches.Select(x => x.LocationCode).ToList();
+
+ List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == roadwayNo);
+
+ //宸插畾涔夎揣浣嶇被鍨嬬殑璐т綅
+ List<Dt_LocationInfo> definedTypeLocations = locationInfos.Where(x => x.LocationType == palletType.ObjToInt()).ToList();
+
+ //鏈畾涔夌被鍨嬬殑绌鸿揣浣�
+ List<Dt_LocationInfo> undefinedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == LocationTypeEnum.Undefined.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Row).ThenBy(x => x.Column).ToList();
+
+ if (locationInfos.Count * weightValue >= definedTypeLocations.Count && undefinedTypeEmptyLocations.Count > 0)//濡傛灉宸插畾涔夌被鍨嬭揣浣嶆湭瓒呰繃姣斾緥锛屼笖鏈夋湭瀹氫箟绫诲瀷鐨勮揣浣�
+ {
+ if (palletType == PalletTypeEnum.LargePallet)
+ {
+ undefinedTypeEmptyLocations = undefinedTypeEmptyLocations.Where(x => x.Column % 2 == 1).ToList();
+ }
+ for (int i = 0; i < undefinedTypeEmptyLocations.Count; i++)
+ {
+ Dt_LocationInfo undefinedTypeEmptyLocation = undefinedTypeEmptyLocations[i];
+ Dt_LocationInfo? locationInfo = GetUsableLocation(locationInfos, undefinedTypeEmptyLocation, palletType);
+ if (locationInfo != null)
+ {
+ //UpdateLocationStatus(locationInfo.LocationCode, palletType, LocationStatusEnum.Lock);
+ locationCaches.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
+ return locationInfo;
+ }
+ }
+ }
+ else
+ {
+ List<Dt_LocationInfo> definedTypeEmptyLocations = locationInfos.Where(x => (x.EnableStatus == EnableStatusEnum.Normal.ObjToInt() || x.EnableStatus == EnableStatusEnum.OnlyIn.ObjToInt()) && x.LocationStatus == LocationStatusEnum.Free.ObjToInt() && x.LocationType == palletType.ObjToInt() && !lockLocationCodes.Contains(x.LocationCode)).OrderByDescending(x => x.Depth).ThenBy(x => x.Layer).ThenBy(x => x.Row).ThenBy(x => x.Column).ToList();
+
+ for (int i = 0; i < definedTypeEmptyLocations.Count; i++)
+ {
+ Dt_LocationInfo definedTypeEmptyLocation = definedTypeEmptyLocations[i];
+ Dt_LocationInfo? locationInfo = GetUsableLocation(locationInfos, definedTypeEmptyLocation, palletType);
+ if (locationInfo != null)
+ {
+ //UpdateLocationStatus(locationInfo.LocationCode, palletType, LocationStatusEnum.Lock);
+ locationCaches.Add(new LocationCache { LocationCode = locationInfo.LocationCode, DateTime = DateTime.Now });
+ return locationInfo;
+ }
+ }
+ }
+ return null;
+ }
+ }
+
+ public Dt_LocationInfo? GetUsableLocation(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo undefinedTypeEmptyLocation, PalletTypeEnum palletType)
+ {
+ switch (palletType)
+ {
+ case PalletTypeEnum.LargePallet:
+ {
+ Dt_LocationInfo? nearLocation = locationInfos.FirstOrDefault(x => x.Row == undefinedTypeEmptyLocation.Row && x.Layer == undefinedTypeEmptyLocation.Layer && x.Depth == undefinedTypeEmptyLocation.Depth && x.Column == undefinedTypeEmptyLocation.Column + 1);
+ if (nearLocation != null && nearLocation.LocationStatus == LocationStatusEnum.Free.ObjToInt() && DepthLocationIsEmpty(locationInfos, undefinedTypeEmptyLocation) != null)
+ {
+ Dt_LocationInfo? locationInfo = DepthLocationIsEmpty(locationInfos, undefinedTypeEmptyLocation);
+ if (locationInfo != null)
+ {
+ return locationInfo;
+ }
+ }
+ }
+ break;
+ case PalletTypeEnum.SmallPallet:
+ {
+ Dt_LocationInfo? locationInfo = DepthLocationIsEmpty(locationInfos, undefinedTypeEmptyLocation);
+ if (locationInfo != null)
+ {
+ return locationInfo;
+ }
+ }
+ break;
+ }
+ return null;
+ }
+
+ private Dt_LocationInfo? DepthLocationIsEmpty(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo undefinedTypeEmptyLocation)
+ {
+ int maxDepth = locationInfos.Max(x => x.Depth);
+ if (undefinedTypeEmptyLocation.Depth == 1 && maxDepth == 1)
+ {
+ return undefinedTypeEmptyLocation;
+ }
+ else
+ {
+ List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, undefinedTypeEmptyLocation);
+
+ List<Dt_LocationInfo> moreDepth = locations.Where(x => x.Depth > undefinedTypeEmptyLocation.Depth).ToList();
+ bool moreDepthFlag = moreDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.InStock.ObjToInt()) == null;//鏌ヨ澶т簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓烘湁璐х殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娣辫揣浣嶆湁鏈浣跨敤鐨勬儏鍐�
+
+ List<Dt_LocationInfo> littleDepth = locations.Where(x => x.Depth <= undefinedTypeEmptyLocation.Depth).ToList();
+ bool littleDepthFlag = littleDepth.FirstOrDefault(x => x.LocationStatus != LocationStatusEnum.Free.ObjToInt() && x.EnableStatus != EnableStatusEnum.OnlyIn.ObjToInt() && x.EnableStatus != EnableStatusEnum.Normal.ObjToInt()) == null; //鏌ヨ灏忎簬褰撳墠璐т綅娣卞害鐨勯泦鍚堥噷鏄惁鏈夌姸鎬佷笉涓虹┖锛屼笖绂佺敤鐘舵�佷笉涓虹鐢ㄤ互鍙婂彧鍏ョ殑璐т綅锛屽鏋滄槸true锛屽垯琛ㄧず娴呰揣浣嶈浣跨敤鎴栬�呰绂佺敤鐨勬儏鍐�
+
+ if (moreDepthFlag && littleDepthFlag)
+ {
+ return undefinedTypeEmptyLocation;
+ }
+ }
+ return null;
+ }
+
+ public void UpdateLocationStatus(string locationCode, PalletTypeEnum palletType, LocationStatusEnum locationStatus, string taskNum = "", string orderNo = "")
+ {
+ Dt_LocationInfo location = Repository.QueryFirst(x => x.LocationCode == locationCode);
+ List<Dt_LocationInfo> locationInfos = Repository.QueryData(x => x.RoadwayNo == location.RoadwayNo);
+
+ List<Dt_LocationInfo> locations = GetGroupLocations(locationInfos, location);
+ if (locationInfos.Max(x => x.Depth) < 3)
+ {
+ for (int i = 0; i < locations.Count; i++)
+ {
+ locations[i].LocationStatus = locationStatus.ObjToInt();
+ locations[i].LocationType = palletType.ObjToInt();
+ }
+
+ Dt_LocationInfo? nearLocation = locationInfos.FirstOrDefault(x => x.Row == location.Row && x.Layer == location.Layer && x.Depth == location.Depth && x.Column == location.Column + 1);
+ if (nearLocation != null)
+ {
+ List<Dt_LocationInfo> nearLocations = GetGroupLocations(locationInfos, nearLocation);
+ for (int i = 0; i < nearLocations.Count; i++)
+ {
+ nearLocations[i].LocationType = palletType.ObjToInt();
+ if (palletType == PalletTypeEnum.LargePallet)
+ {
+ nearLocations[i].LocationStatus = locationStatus.ObjToInt();
+ }
+ }
+ locations.AddRange(nearLocations);
+ }
+ }
+ else
+ {
+ for (int i = 0; i < locations.Count; i++)
+ {
+ locations[i].LocationStatus = locationStatus.ObjToInt();
+ locations[i].LocationType = palletType.ObjToInt();
+ }
+ }
+ Repository.UpdateData(locations);
+ }
+
+ private List<Dt_LocationInfo> GetGroupLocations(List<Dt_LocationInfo> locationInfos, Dt_LocationInfo location)
+ {
+ List<Dt_LocationInfo> groupLocations = new List<Dt_LocationInfo>() { location };
+ int maxDepth = locationInfos.Max(x => x.Depth);
+ for (int j = location.Depth + 1; j <= maxDepth; j++)
+ {
+ Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer);
+ if (locationInfo != null)
+ {
+ groupLocations.Add(locationInfo);
+ }
+ }
+
+ for (int j = location.Depth - 1; j >= 1; j--)
+ {
+ Dt_LocationInfo? locationInfo = locationInfos.FirstOrDefault(x => x.Depth == j && x.Column == location.Column && x.Layer == location.Layer);
+ if (locationInfo != null)
+ {
+ groupLocations.Add(locationInfo);
+ }
+ }
+ return groupLocations;
+ }
+ }
+
+ public class LocationCache
+ {
+ public string LocationCode { get; set; }
+
+ public DateTime DateTime { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTaskFeedBackModel.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTaskFeedBackModel.cs"
deleted file mode 100644
index ce6e3ec..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/AGVTaskFeedBackModel.cs"
+++ /dev/null
@@ -1,15 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Common
-{
- public class AGVTaskFeedBackModel
- {
- public string Task_id { get; set; }
-
- public string Task_status { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/EnableEnum.cs"
similarity index 62%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/EnableEnum.cs"
index 17216eb..e4d3718 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/EnableEnum.cs"
@@ -5,7 +5,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace WIDESEA_Core.Enums
+namespace WIDESEA_Common.CommonEnum
{
/// <summary>
/// 鍚鐘舵��
@@ -24,21 +24,4 @@
[Description("鍚敤")]
Enable = 1,
}
-
-
- #region 搴撳瓨鐘舵��
-
-
-
- #endregion 搴撳瓨鐘舵��
-
- public enum OperateType
- {
- 浜哄伐鍒犻櫎 = 1,
- 鑷姩鍒犻櫎 = 2,
- 浜哄伐鎭㈠ = 3,
- 鑷姩鎭㈠ = 4,
- 浜哄伐瀹屾垚 = 5,
- 鑷姩瀹屾垚 = 6,
- }
-}
\ No newline at end of file
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PalletTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PalletTypeEnum.cs"
new file mode 100644
index 0000000..f290591
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/CommonEnum/PalletTypeEnum.cs"
@@ -0,0 +1,15 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.CommonEnum
+{
+ public enum PalletTypeEnum
+ {
+ SmallPallet = 1,
+ MediumPallet = 2,
+ LargePallet = 3,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/EnableStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/EnableStatusEnum.cs"
new file mode 100644
index 0000000..c6ea2a7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/EnableStatusEnum.cs"
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.LocationEnum
+{
+ /// <summary>
+ /// 璐т綅绂佺敤鐘舵��
+ /// </summary>
+ public enum EnableStatusEnum
+ {
+ /// <summary>
+ /// 姝ｅ父
+ /// </summary>
+ [Description("姝ｅ父")]
+ Normal = 0,
+
+ /// <summary>
+ /// 鍙叆
+ /// </summary>
+ [Description("鍙叆")]
+ OnlyIn = 1,
+
+ /// <summary>
+ /// 鍙嚭
+ /// </summary>
+ [Description("鍙嚭")]
+ OnlyOut = 2,
+
+ /// <summary>
+ /// 绂佺敤
+ /// </summary>
+ [Description("绂佺敤")]
+ Disable = 3
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationChangeType.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationChangeType.cs"
new file mode 100644
index 0000000..e83ba96
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationChangeType.cs"
@@ -0,0 +1,16 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.LocationEnum
+{
+ /// <summary>
+ /// 璐т綅鐘舵�佸彉鏇寸被鍨�
+ /// </summary>
+ public enum LocationChangeType
+ {
+
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
new file mode 100644
index 0000000..e010eea
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationStatusEnum.cs"
@@ -0,0 +1,44 @@
+锘縰sing System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.LocationEnum
+{
+ /// <summary>
+ /// 璐т綅鐘舵��
+ /// </summary>
+ public enum LocationStatusEnum
+ {
+ /// <summary>
+ /// 绌洪棽
+ /// </summary>
+ [Description("绌洪棽")]
+ Free = 0,
+
+ /// <summary>
+ /// 閿佸畾
+ /// </summary>
+ [Description("閿佸畾")]
+ Lock = 1,
+
+ /// <summary>
+ /// 鏈夎揣
+ /// </summary>
+ [Description("鏈夎揣")]
+ InStock = 2,
+
+ /// <summary>
+ /// 绌烘墭閿佸畾
+ /// </summary>
+ [Description("绌烘墭閿佸畾")]
+ PalletLock = 98,
+
+ /// <summary>
+ /// 绌烘墭鐩�
+ /// </summary>
+ [Description("绌烘墭鐩�")]
+ Pallet = 99
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs"
new file mode 100644
index 0000000..209ef97
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/LocationEnum/LocationTypeEnum.cs"
@@ -0,0 +1,39 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.LocationEnum
+{
+ /// <summary>
+ /// 璐т綅绫诲瀷
+ /// </summary>
+ public enum LocationTypeEnum
+ {
+ /// <summary>
+ /// 鏈畾涔�
+ /// </summary>
+ [Description("鏈畾涔�")]
+ Undefined = 0,
+
+ /// <summary>
+ /// 灏忔墭鐩�
+ /// </summary>
+ [Description("灏忔墭鐩�")]
+ SmallPallet = 1,
+
+ /// <summary>
+ /// 涓墭鐩�
+ /// </summary>
+ [Description("涓墭鐩�")]
+ MediumPallet = 2,
+
+ /// <summary>
+ /// 澶ф墭鐩�
+ /// </summary>
+ [Description("澶ф墭鐩�")]
+ LargePallet = 3,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderStatusEnum.cs"
new file mode 100644
index 0000000..afe02e1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderStatusEnum.cs"
@@ -0,0 +1,45 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ /// <summary>
+ /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽叆搴撳畬鎴�
+ /// </summary>
+ public enum InOrderStatusEnum
+ {
+ /// <summary>
+ /// 鏈紑濮�
+ /// </summary>
+ [Description("鏈紑濮�")]
+ 鏈紑濮� = 0,
+
+ /// <summary>
+ /// 鍏ュ簱涓�
+ /// </summary>
+ [Description("鍏ュ簱涓�")]
+ 鍏ュ簱涓� = 1,
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚
+ /// </summary>
+ [Description("鍏ュ簱瀹屾垚")]
+ 鍏ュ簱瀹屾垚 = 2,
+
+ /// <summary>
+ /// 鍏抽棴
+ /// </summary>
+ [Description("鍏抽棴")]
+ 鍏抽棴 = 99,
+
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ [Description("鍙栨秷")]
+ 鍙栨秷 = 98
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderTypeEnum.cs"
new file mode 100644
index 0000000..2cbacec
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/InOrderTypeEnum.cs"
@@ -0,0 +1,57 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ /// <summary>
+ /// 鍏ュ簱鍗曠被鍨� 100 鐢熶骇鍏ュ簱鍗�;200 鐢熶骇閫�鏂欏崟;300 閲囪喘鍏ュ簱鍗�;400 璋冩嫧鍏ュ簱鍗�;500 閿�鍞��璐у崟;600 绌虹洏鍏ュ簱鍗�;700 鍏朵粬鍏ュ簱鍗�
+ /// </summary>
+ public enum InOrderTypeEnum
+ {
+ /// <summary>
+ /// 鐢熶骇鍏ュ簱鍗�
+ /// </summary>
+ [Description("鐢熶骇鍏ュ簱鍗�")]
+ Product = 100,
+
+ /// <summary>
+ /// 鐢熶骇閫�鏂欏崟
+ /// </summary>
+ [Description("鐢熶骇閫�鏂欏崟")]
+ Return = 105,
+
+ /// <summary>
+ /// 閲囪喘鍏ュ簱鍗�
+ /// </summary>
+ [Description("閲囪喘鍏ュ簱鍗�")]
+ Purchase = 110,
+
+ /// <summary>
+ /// 璋冩嫧鍏ュ簱鍗�
+ /// </summary>
+ [Description("璋冩嫧鍏ュ簱鍗�")]
+ Allocat = 115,
+
+ /// <summary>
+ /// 閿�鍞��璐у崟
+ /// </summary>
+ [Description("閿�鍞��璐у崟")]
+ SaleReturn = 120,
+
+ /// <summary>
+ /// 绌虹洏鍏ュ簱鍗�
+ /// </summary>
+ [Description("绌虹洏鍏ュ簱鍗�")]
+ EmptyDisk = 125,
+
+ /// <summary>
+ /// 鍏朵粬鍏ュ簱鍗�
+ /// </summary>
+ [Description("鍏朵粬鍏ュ簱鍗�")]
+ Other = 130
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs"
new file mode 100644
index 0000000..79c5516
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderCreateTypeEnum.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ public enum OrderCreateTypeEnum
+ {
+ /// <summary>
+ /// 绯荤粺鍐呭垱寤�
+ /// </summary>
+ [Description("绯荤粺鍐呭垱寤�")]
+ CreateInSystem,
+
+ /// <summary>
+ /// 涓婃父绯荤粺鎺ㄩ��
+ /// </summary>
+ [Description("涓婃父绯荤粺鎺ㄩ��")]
+ UpperSystemPush
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs"
new file mode 100644
index 0000000..aef15d7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OrderDetailStatusEnum.cs"
@@ -0,0 +1,48 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ public enum OrderDetailStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓
+ /// </summary>
+ [Description("鏂板缓")]
+ New = 0,
+
+ /// <summary>
+ /// 缁勭洏鍏ュ簱
+ /// </summary>
+ [Description("缁勭洏鍏ュ簱")]
+ GroupAndInbound = 10,
+
+ /// <summary>
+ /// 鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚
+ /// </summary>
+ [Description("鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚")]
+ AssignOverPartial = 60,
+
+ /// <summary>
+ /// 鍑哄簱鍒嗛厤瀹屾垚
+ /// </summary>
+ [Description("鍑哄簱鍒嗛厤瀹屾垚")]
+ AssignOver = 70,
+
+ /// <summary>
+ /// 鍑哄簱涓�
+ /// </summary>
+ [Description("鍑哄簱涓�")]
+ Outbound = 80,
+
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
+ [Description("瀹屾垚")]
+ Over = 100
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderStatusEnum.cs"
new file mode 100644
index 0000000..d63cb60
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderStatusEnum.cs"
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ public enum OutOrderStatusEnum
+ {
+ /// <summary>
+ /// 鏈紑濮�
+ /// </summary>
+ [Description("鏈紑濮�")]
+ 鏈紑濮� = 0,
+
+ /// <summary>
+ /// 鍑哄簱涓�
+ /// </summary>
+ [Description("鍑哄簱涓�")]
+ 鍑哄簱涓� = 1,
+
+ /// <summary>
+ /// 鍑哄簱瀹屾垚
+ /// </summary>
+ [Description("鍑哄簱瀹屾垚")]
+ 鍑哄簱瀹屾垚 = 2,
+
+ /// <summary>
+ /// 鍏抽棴
+ /// </summary>
+ [Description("鍏抽棴")]
+ 鍏抽棴 = 99,
+
+ /// <summary>
+ /// 鍙栨秷
+ /// </summary>
+ [Description("鍙栨秷")]
+ 鍙栨秷 = 98
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderTypeEnum.cs"
new file mode 100644
index 0000000..66b5aea
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/OutOrderTypeEnum.cs"
@@ -0,0 +1,63 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ /// <summary>
+ /// 鍑哄簱鍗曠被鍨�
+ /// </summary>
+ public enum OutOrderTypeEnum
+ {
+ /// <summary>
+ /// 鐢熶骇杩斿伐鍗�
+ /// </summary>
+ [Description("鐢熶骇杩斿伐鍗�")]
+ Rework = 200,
+
+ /// <summary>
+ /// 鐢熶骇鍙戞枡鍗�
+ /// </summary>
+ [Description("鐢熶骇鍙戞枡鍗�")]
+ Issue = 205,
+
+ /// <summary>
+ /// 閲囪喘閫�璐у崟
+ /// </summary>
+ [Description("閲囪喘閫�璐у崟")]
+ ProcureReturn = 210,
+
+ /// <summary>
+ /// 璋冩嫧鍑哄簱鍗�
+ /// </summary>
+ [Description("璋冩嫧鍑哄簱鍗�")]
+ Allocate = 215,
+
+ /// <summary>
+ /// 閿�鍞嚭搴撳崟
+ /// </summary>
+ [Description("閿�鍞嚭搴撳崟")]
+ SaleOut = 220,
+
+ /// <summary>
+ /// 绌虹洏鍑哄簱鍗�
+ /// </summary>
+ [Description("绌虹洏鍑哄簱鍗�")]
+ EmptyDisk = 225,
+
+ /// <summary>
+ /// 璐ㄦ鍑哄簱鍗�
+ /// </summary>
+ [Description("璐ㄦ鍑哄簱鍗�")]
+ Quality = 230,
+
+ /// <summary>
+ /// 鍏朵粬鍑哄簱鍗�
+ /// </summary>
+ [Description("鍏朵粬鍑哄簱鍗�")]
+ Other = 235
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/SynchronizationFlagEmun.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/SynchronizationFlagEmun.cs"
new file mode 100644
index 0000000..8ee4907
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OrderEnum/SynchronizationFlagEmun.cs"
@@ -0,0 +1,33 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.OrderEnum
+{
+ /// <summary>
+ /// 鍚屾鏍囧織 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
+ /// </summary>
+ public enum SynchronizationFlagEmun
+ {
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
+ [Description("鏈悓姝�")]
+ 鏈悓姝� = 0,
+
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
+ [Description("鍚屾鎴愬姛")]
+ 鍚屾鎴愬姛 = 1,
+
+ /// <summary>
+ /// 瀹屾垚
+ /// </summary>
+ [Description("鍚屾澶辫触")]
+ 鍚屾澶辫触 = 2
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/SequenceEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OtherEnum/SequenceEnum.cs"
similarity index 83%
rename from "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/SequenceEnum.cs"
rename to "\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OtherEnum/SequenceEnum.cs"
index 51cc259..27f4a53 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/SequenceEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/OtherEnum/SequenceEnum.cs"
@@ -4,7 +4,7 @@
using System.Text;
using System.Threading.Tasks;
-namespace WIDESEA_Core.Enums
+namespace WIDESEA_Common.OtherEnum
{
public enum SequenceEnum
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs"
new file mode 100644
index 0000000..a7f410a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/OutLockStockStatusEnum.cs"
@@ -0,0 +1,24 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.StockEnum
+{
+ public enum OutLockStockStatusEnum
+ {
+ [Description("宸插垎閰�")]
+ 宸插垎閰� = 0,
+
+ [Description("鍑哄簱涓�")]
+ 鍑哄簱涓� = 1,
+
+ [Description("鍑哄簱瀹屾垚")]
+ 鍑哄簱瀹屾垚 = 2,
+
+ [Description("鎾ら攢")]
+ 鎾ら攢 = 99
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockChangeTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockChangeTypeEnum.cs"
new file mode 100644
index 0000000..ec29ec8
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockChangeTypeEnum.cs"
@@ -0,0 +1,47 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.StockEnum
+{
+ public enum StockChangeTypeEnum
+ {
+ /// <summary>
+ /// 缁勭洏
+ /// </summary>
+ [Description("缁勭洏")]
+ MaterielGroup,
+
+ /// <summary>
+ /// 鍏ュ簱
+ /// </summary>
+ [Description("鍏ュ簱")]
+ Inbound,
+
+ /// <summary>
+ /// 鍑哄簱
+ /// </summary>
+ [Description("鍑哄簱")]
+ Outbound,
+ /// <summary>
+ /// 绉诲簱
+ /// </summary>
+ [Description("绉诲簱")]
+ Relocation,
+
+ /// <summary>
+ /// 鍏ュ簱閿佸畾
+ /// </summary>
+ [Description("閿佸畾")]
+ Lock,
+
+ /// <summary>
+ /// 搴撳瓨閿佸畾
+ /// </summary>
+ [Description("搴撳瓨閿佸畾")]
+ StockLock,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
new file mode 100644
index 0000000..d70623a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/StockEnum/StockStatusEmun.cs"
@@ -0,0 +1,42 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.StockEnum
+{
+ /// <summary>
+ /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽叆搴撴挙閿� 5锛屽凡鍏ュ簱 6锛屽凡鍑哄簱
+ /// </summary>
+ public enum StockStatusEmun
+ {
+ [Description("缁勭洏鏆傚瓨")]
+ 缁勭洏鏆傚瓨 = 1,
+
+ [Description("缁勭洏鎾ら攢")]
+ 缁勭洏鎾ら攢 = 2,
+
+ [Description("鍏ュ簱纭")]
+ 鍏ュ簱纭 = 3,
+
+ [Description("鍏ュ簱鎾ら攢")]
+ 鍏ュ簱鎾ら攢 = 4,
+
+ [Description("宸插叆搴�")]
+ 宸插叆搴� = 5,
+
+ [Description("鍏ュ簱瀹屾垚")]
+ 鍏ュ簱瀹屾垚 = 6,
+
+ [Description("鍑哄簱閿佸畾")]
+ 鍑哄簱閿佸畾 = 7,
+
+ [Description("鍑哄簱瀹屾垚")]
+ 鍑哄簱瀹屾垚 = 8,
+
+ [Description("绉诲簱閿佸畾")]
+ 绉诲簱閿佸畾 = 9,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/InTaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/InTaskStatusEnum.cs"
new file mode 100644
index 0000000..94a8dbc
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/InTaskStatusEnum.cs"
@@ -0,0 +1,81 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.TaskEnum
+{
+ /// <summary>
+ /// 鍏ュ簱浠诲姟鐘舵��
+ /// </summary>
+ public enum InTaskStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓鍏ュ簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓")]
+ InNew = 200,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄叆搴撴墽琛屼腑
+ /// </summary>
+ [Description("鍫嗗灈鏈哄叆搴撴墽琛屼腑")]
+ SC_InExecuting = 230,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄叆搴撳畬鎴�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄叆搴撳畬鎴�")]
+ SC_InFinish = 235,
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍏ュ簱浠诲姟瀹屾垚")]
+ InFinish = 290,
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟鍙栨秷
+ /// </summary>
+ [Description("鍏ュ簱浠诲姟鍙栨秷")]
+ InCancel = 298,
+
+ /// <summary>
+ /// 鍏ュ簱浠诲姟寮傚父
+ /// </summary>
+ [Description("鍏ュ簱浠诲姟寮傚父")]
+ InException = 299,
+
+ /// <summary>
+ /// 鏂板缓绉诲簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓绉诲簱浠诲姟")]
+ RelocationNew = 300,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚
+ /// </summary>
+ [Description("绉诲簱浠诲姟瀹屾垚")]
+ RelocationFinish = 310,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟鎵ц涓�
+ /// </summary>
+ [Description("绉诲簱浠诲姟鎵ц涓�")]
+ RelocationExecuting = 320,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟鍙栨秷
+ /// </summary>
+ [Description("绉诲簱浠诲姟鍙栨秷")]
+ RelocationCancel = 330,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟寮傚父
+ /// </summary>
+ [Description("绉诲簱浠诲姟寮傚父")]
+ RelocationException = 340,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/OutTaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/OutTaskStatusEnum.cs"
new file mode 100644
index 0000000..c202e7a
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/OutTaskStatusEnum.cs"
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.TaskEnum
+{
+ /// <summary>
+ /// 鍑哄簱浠诲姟鐘舵��
+ /// </summary>
+ public enum OutTaskStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓浠诲姟
+ /// </summary>
+ [Description("鏂板缓")]
+ OutNew = 100,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑
+ /// </summary>
+ [Description("鍫嗗灈鏈哄嚭搴撴墽琛屼腑")]
+ SC_OutExecuting = 130,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄嚭搴撳畬鎴�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")]
+ SC_OutFinish = 135,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍑哄簱浠诲姟瀹屾垚")]
+ OutFinish = 190,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟鍙栨秷
+ /// </summary>
+ [Description("鍑哄簱浠诲姟鍙栨秷")]
+ OutCancel = 198,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟寮傚父
+ /// </summary>
+ [Description("鍑哄簱浠诲姟寮傚父")]
+ OutException = 199
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
new file mode 100644
index 0000000..4143d5b
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskTypeEnum.cs"
@@ -0,0 +1,108 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Common.TaskEnum
+{
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public enum TaskTypeEnum
+ {
+ /// <summary>
+ /// 鍑哄簱 =100
+ /// </summary>
+ [Description("鍑哄簱")]
+ Outbound = 100,
+
+ /// <summary>
+ /// 鐩樼偣鍑哄簱
+ /// </summary>
+ [Description("鐩樼偣鍑哄簱")]
+ OutInventory = 101,
+
+ /// <summary>
+ /// 鍒嗘嫞鍑哄簱
+ /// </summary>
+ [Description("鍒嗘嫞鍑哄簱")]
+ OutPick = 102,
+
+ /// <summary>
+ /// 璐ㄦ鍑哄簱
+ /// </summary>
+ [Description("璐ㄦ鍑哄簱")]
+ OutQuality = 103,
+
+ /// <summary>
+ /// 鍑虹┖
+ /// </summary>
+ [Description("鍑虹┖")]
+ PalletOutbound = 104,
+
+ /// <summary>
+ /// 琛ョ┖
+ /// </summary>
+ [Description("琛ョ┖")]
+ PalletFillOutbound = 105,
+
+ /// <summary>
+ /// 鍏ュ簱
+ /// </summary>
+ [Description("鍏ュ簱")]
+ Inbound = 200,
+
+ /// <summary>
+ /// 鐩樼偣鍏ュ簱
+ /// </summary>
+ [Description("鐩樼偣鍏ュ簱")]
+ InInventory = 201,
+
+ /// <summary>
+ /// 鍒嗘嫞鍏ュ簱
+ /// </summary>
+ [Description("鍒嗘嫞鍏ュ簱")]
+ InPick = 202,
+
+ /// <summary>
+ /// 璐ㄦ鍏ュ簱
+ /// </summary>
+ [Description("璐ㄦ鍏ュ簱")]
+ InQuality = 203,
+
+ /// <summary>
+ /// 鍏ョ┖
+ /// </summary>
+ [Description("鍏ョ┖")]
+ PalletInbound = 204,
+
+ /// <summary>
+ /// 鍥炵┖
+ /// </summary>
+ [Description("鍥炵┖")]
+ PalletReturnInbound = 205,
+
+ /// <summary>
+ /// 绉诲簱
+ /// </summary>
+ [Description("绉诲簱")]
+ Relocation = 300,
+
+ /// <summary>
+ /// 搴撳唴绉诲簱
+ /// </summary>
+ [Description("搴撳唴绉诲簱")]
+ RelocationIn = 301,
+
+ /// <summary>
+ /// 搴撳绉诲簱
+ /// </summary>
+ [Description("搴撳绉诲簱")]
+ RelocationOut = 302,
+
+ [Description("AGV鎼繍")]
+ AGVCarry = 500,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj"
index 6b6e2fc..f14a168 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Common/WIDESEA_Common.csproj"
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+锘�<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net6.0</TargetFramework>
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
index dac84c9..2732123 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/AOP/SqlSugarAop.cs"
@@ -8,6 +8,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Const;
using WIDESEA_Core.DB;
using WIDESEA_Core.DB.Models;
@@ -86,7 +87,7 @@
}
- if (App.User?.UserId > 0)
+ //if (App.User?.UserId > 0)
{
switch (entityInfo.OperationType)
{
@@ -142,11 +143,11 @@
ruleConfig.ModifyDate = DateTime.Now;
code = ruleConfig.Format;
- code = code.Replace($"[{CodeFormat.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
- code = code.Replace($"[{CodeFormat.MM}]", now.Month.ToString().PadLeft(2, '0'));
- code = code.Replace($"[{CodeFormat.DD}]", now.Day.ToString().PadLeft(2, '0'));
- code = code.Replace($"[{CodeFormat.ST}]", ruleConfig.StartStr.ToString());
- code = code.Replace($"[{CodeFormat.NUM}]", ruleConfig.CurrentVal.ToString().PadLeft(ruleConfig.Length ?? 0, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.YYYY}]", now.Year.ToString().PadLeft(4, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.MM}]", now.Month.ToString().PadLeft(2, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.DD}]", now.Day.ToString().PadLeft(2, '0'));
+ code = code.Replace($"[{CodeFormatTypeEnum.ST}]", ruleConfig.StartStr.ToString());
+ code = code.Replace($"[{CodeFormatTypeEnum.NUM}]", ruleConfig.CurrentVal.ToString().PadLeft(ruleConfig.Length ?? 0, '0'));
}
catch (Exception ex)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/AnalysisRuleAttribute.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/AnalysisRuleAttribute.cs"
index dfea286..94cdf32 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/AnalysisRuleAttribute.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/AnalysisRuleAttribute.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Enums;
namespace WIDESEA_Core.Attributes
@@ -10,11 +11,11 @@
[AttributeUsage(AttributeTargets.Property)]
public class AnalysisItemRuleAttribute : Attribute
{
- public AnalysisFormatType AnalysisFormaType { get; set; }
+ public AnalysisFormatTypeEnum AnalysisFormaType { get; set; }
public int Length { get; set; }
- public AnalysisItemRuleAttribute(AnalysisFormatType analysisFormaType)
+ public AnalysisItemRuleAttribute(AnalysisFormatTypeEnum analysisFormaType)
{
AnalysisFormaType = analysisFormaType;
}
@@ -23,7 +24,7 @@
[AttributeUsage(AttributeTargets.Class)]
public class AnalysisRuleAttribute : Attribute
{
- public AnalysisRule AnalysisRule { get; set; } = AnalysisRule.Split;
+ public AnalysisRuleEnum AnalysisRule { get; set; } = AnalysisRuleEnum.Split;
public AnalysisRuleAttribute()
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/CodeRuleAttribute.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/CodeRuleAttribute.cs"
index 30f050a..a64eb98 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/CodeRuleAttribute.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Attributes/CodeRuleAttribute.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.Enums;
namespace WIDESEA_Core.Attributes
@@ -10,8 +11,8 @@
[AttributeUsage(AttributeTargets.Property)]
public class CodeRuleAttribute : Attribute
{
- public RuleCode RuleCode { get; set; }
- public CodeRuleAttribute(RuleCode ruleCode)
+ public RuleCodeEnum RuleCode { get; set; }
+ public CodeRuleAttribute(RuleCodeEnum ruleCode)
{
RuleCode = ruleCode;
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs"
index 2ac124b..80b1ddc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Authorization/JwtHelper.cs"
@@ -22,7 +22,7 @@
/// <returns></returns>
public static string IssueJwt(TokenModelJwt tokenModel)
{
- string exp = $"{new DateTimeOffset(DateTime.Now.AddMinutes(/*tokenModel.UserId == 1 ? 43200 : */AppSettings.app("ExpMinutes").ObjToInt())).ToUnixTimeSeconds()}";
+ string exp = $"{new DateTimeOffset(DateTime.Now.AddMinutes(/*tokenModel.UserId == 1 ? 43200 : */AppSettings.Get("ExpMinutes").ObjToInt())).ToUnixTimeSeconds()}";
List<Claim> claims = new List<Claim>
{
new Claim(JwtRegisteredClaimNames.Jti, tokenModel.UserId.ToString()),
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs"
index 5f57b15..35ded01 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/IRepository.cs"
@@ -71,9 +71,9 @@
Task<bool> DeleteDataByIdAsync(object id);
- bool DeleteAndMoveIntoHty(TEntity entity, OperateType operateType);
+ bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType);
- bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateType operateType);
+ bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType);
/// <summary>
/// 閫氳繃涓婚敭鏁版嵁鍒犻櫎澶氭潯鏁版嵁
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
index e974d51..ed69c09 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/BaseRepository/RepositoryBase.cs"
@@ -864,7 +864,7 @@
.WhereIF(whereExpression != null, whereExpression).ToListAsync();
}
- public bool DeleteAndMoveIntoHty(TEntity entity, OperateType operateType)
+ public bool DeleteAndMoveIntoHty(TEntity entity, OperateTypeEnum operateType)
{
Type type = entity.GetType();
Assembly assembly = type.Assembly;
@@ -873,7 +873,7 @@
{
object? obj = Activator.CreateInstance(htyType);
PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
- PropertyInfo? operateTypePro = htyType.GetProperty(nameof(OperateType));
+ PropertyInfo? operateTypePro = htyType.GetProperty(nameof(OperateTypeEnum));
PropertyInfo? sourceIdPro = htyType.GetProperty("SourceId");
if (obj != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
{
@@ -909,7 +909,7 @@
return DeleteData(entity);
}
- public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateType operateType)
+ public bool DeleteAndMoveIntoHty(List<TEntity> entities, OperateTypeEnum operateType)
{
Type type = typeof(TEntity);
Assembly assembly = type.Assembly;
@@ -918,7 +918,7 @@
{
object? obj2 = Activator.CreateInstance(htyType);
PropertyInfo keyPro = typeof(TEntity).GetKeyProperty();
- PropertyInfo? operateTypePro = htyType.GetProperty(nameof(OperateType));
+ PropertyInfo? operateTypePro = htyType.GetProperty(nameof(OperateTypeEnum));
PropertyInfo? sourceIdPro = htyType.GetProperty("SourceId");
if (obj2 != null && keyPro != null && operateTypePro != null && sourceIdPro != null)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisCodeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisCodeEnum.cs"
new file mode 100644
index 0000000..fb8bc35
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisCodeEnum.cs"
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.CodeConfigEnum
+{
+ /// <summary>
+ /// 瑙ｆ瀽瑙勫垯缂栧彿
+ /// </summary>
+ public enum AnalysisCodeEnum
+ {
+ /// <summary>
+ /// 鍐呯鐮�
+ /// </summary>
+ [Description("鍐呯鐮�")]
+ InnerCode,
+
+ /// <summary>
+ /// 澶栫鐮�
+ /// </summary>
+ [Description("澶栫鐮�")]
+ OutterCode
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisFormatTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisFormatTypeEnum.cs"
new file mode 100644
index 0000000..1499225
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisFormatTypeEnum.cs"
@@ -0,0 +1,46 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.CodeConfigEnum
+{
+ /// <summary>
+ /// 瑙ｆ瀽鏍煎紡绫诲瀷
+ /// </summary>
+ public enum AnalysisFormatTypeEnum
+ {
+ /// <summary>
+ /// 鐗╂枡缂栧彿
+ /// </summary>
+ [Description("鐗╂枡缂栧彿")]
+ MTC,
+ /// <summary>
+ /// 鐢熶骇鏃ユ湡
+ /// </summary>
+ [Description("鐢熶骇鏃ユ湡")]
+ MTPT,
+ /// <summary>
+ /// 鎵规鍙�
+ /// </summary>
+ [Description("鎵规鍙�")]
+ BHN,
+ /// <summary>
+ /// 鏁伴噺
+ /// </summary>
+ [Description("鏁伴噺")]
+ MTQ,
+ /// <summary>
+ /// 璁㈠崟鍙�
+ /// </summary>
+ [Description("璁㈠崟鍙�")]
+ ODN,
+ /// <summary>
+ /// 鍘熷鏁版嵁
+ /// </summary>
+ [Description("鍘熷鏁版嵁")]
+ BD,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisRuleEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisRuleEnum.cs"
new file mode 100644
index 0000000..7ee4115
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/AnalysisRuleEnum.cs"
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.CodeConfigEnum
+{
+ /// <summary>
+ /// 瑙ｆ瀽瑙勫垯
+ /// </summary>
+ public enum AnalysisRuleEnum
+ {
+ /// <summary>
+ /// 鍒嗗壊瀛楃涓插垎鍓�
+ /// </summary>
+ [Description("鍒嗗壊瀛楃涓插垎鍓�")]
+ Split,
+
+ /// <summary>
+ /// 闀垮害鍒嗗壊
+ /// </summary>
+ [Description("闀垮害鍒嗗壊")]
+ Length
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/CodeFormatTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/CodeFormatTypeEnum.cs"
new file mode 100644
index 0000000..67e6783
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/CodeFormatTypeEnum.cs"
@@ -0,0 +1,51 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.CodeConfigEnum
+{
+ /// <summary>
+ /// 缂栫爜鏍煎紡绫诲瀷
+ /// </summary>
+ public enum CodeFormatTypeEnum
+ {
+ /// <summary>
+ /// 璧峰瀛楃涓�
+ /// </summary>
+ [Description("璧峰瀛楃涓�")]
+ ST,
+
+ /// <summary>
+ /// 4浣嶆暟骞�
+ /// </summary>
+ [Description("4浣嶆暟骞�")]
+ YYYY,
+
+ /// <summary>
+ /// 2浣嶆暟鏈�
+ /// </summary>
+ [Description("2浣嶆暟鏈�")]
+ MM,
+
+ /// <summary>
+ /// 2浣嶆暟鏃�
+ /// </summary>
+ [Description("2浣嶆暟鏃�")]
+ DD,
+
+ /// <summary>
+ /// 娴佹按鍙�
+ /// </summary>
+ [Description("娴佹按鍙�")]
+ NUM,
+
+ /// <summary>
+ /// 缁撴潫瀛楃涓�
+ /// </summary>
+ [Description("缁撴潫瀛楃涓�")]
+ ED
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/RuleCodeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/RuleCodeEnum.cs"
new file mode 100644
index 0000000..d3c7857
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/CodeConfigEnum/RuleCodeEnum.cs"
@@ -0,0 +1,27 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.CodeConfigEnum
+{
+ /// <summary>
+ /// 缂栫爜瑙勫垯缂栧彿
+ /// </summary>
+ public enum RuleCodeEnum
+ {
+ /// <summary>
+ /// 鍏ュ簱鍗曞彿缂栫爜瑙勫垯缂栧彿
+ /// </summary>
+ [Description("鍏ュ簱鍗曞彿缂栫爜瑙勫垯缂栧彿")]
+ InboundOrderRule,
+
+ /// <summary>
+ /// 鍑哄簱鍗曞彿缂栫爜瑙勫垯缂栧彿
+ /// </summary>
+ [Description("鍑哄簱鍗曞彿缂栫爜瑙勫垯缂栧彿")]
+ OutboundOrderRule
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
index ed0e254..1382e3e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/DB/BaseDBConfig.cs"
@@ -42,7 +42,7 @@
SqlSugarClient sqlSugarClient = new SqlSugarClient(new ConnectionConfig
{
ConfigId = MainDb.CurrentDbConnId,
- ConnectionString = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
+ ConnectionString = AppSettings.Get(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
IsAutoCloseConnection = true,
DbType = MainDb.DbType,
AopEvents = new AopEvents
@@ -58,7 +58,7 @@
List<MutiDBOperate> listdatabaseSlaveDB = new List<MutiDBOperate>();
MutiDBOperate mainDb = new MutiDBOperate()
{
- Connection = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
+ Connection = AppSettings.Get(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
ConnId = MainDb.CurrentDbConnId,
DbType = DataBaseType.SqlServer
};
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ConfigEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ConfigEnum.cs"
deleted file mode 100644
index 6bb9560..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ConfigEnum.cs"
+++ /dev/null
@@ -1,127 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- public enum AnalysisRule
- {
- /// <summary>
- /// 鍒嗗壊瀛楃涓插垎鍓�
- /// </summary>
- [Description("鍒嗗壊瀛楃涓插垎鍓�")]
- Split,
-
- /// <summary>
- /// 闀垮害鍒嗗壊
- /// </summary>
- [Description("闀垮害鍒嗗壊")]
- Length
- }
-
- public enum AnalysisCode
- {
- /// <summary>
- /// 鍐呯鐮�
- /// </summary>
- [Description("鍐呯鐮�")]
- InnerCode,
-
- /// <summary>
- /// 澶栫鐮�
- /// </summary>
- [Description("澶栫鐮�")]
- OutterCode
- }
-
- public enum AnalysisFormatType
- {
- /// <summary>
- /// 鐗╂枡缂栧彿
- /// </summary>
- [Description("鐗╂枡缂栧彿")]
- MTC,
- /// <summary>
- /// 鐢熶骇鏃ユ湡
- /// </summary>
- [Description("鐢熶骇鏃ユ湡")]
- MTPT,
- /// <summary>
- /// 鎵规鍙�
- /// </summary>
- [Description("鎵规鍙�")]
- BHN,
- /// <summary>
- /// 鏁伴噺
- /// </summary>
- [Description("鏁伴噺")]
- MTQ,
- /// <summary>
- /// 璁㈠崟鍙�
- /// </summary>
- [Description("璁㈠崟鍙�")]
- ODN,
- /// <summary>
- /// 鍘熷鏁版嵁
- /// </summary>
- [Description("鍘熷鏁版嵁")]
- BD,
- }
-
- public enum RuleCode
- {
- /// <summary>
- /// 鍏ュ簱鍗曞彿缂栫爜瑙勫垯缂栧彿
- /// </summary>
- [Description("鍏ュ簱鍗曞彿缂栫爜瑙勫垯缂栧彿")]
- InboundOrderRule,
-
- /// <summary>
- /// 鍑哄簱鍗曞彿缂栫爜瑙勫垯缂栧彿
- /// </summary>
- [Description("鍑哄簱鍗曞彿缂栫爜瑙勫垯缂栧彿")]
- OutboundOrderRule
- }
-
- public enum CodeFormat
- {
- /// <summary>
- /// 璧峰瀛楃涓�
- /// </summary>
- [Description("璧峰瀛楃涓�")]
- ST,
-
- /// <summary>
- /// 4浣嶆暟骞�
- /// </summary>
- [Description("4浣嶆暟骞�")]
- YYYY,
-
- /// <summary>
- /// 2浣嶆暟鏈�
- /// </summary>
- [Description("2浣嶆暟鏈�")]
- MM,
-
- /// <summary>
- /// 2浣嶆暟鏃�
- /// </summary>
- [Description("2浣嶆暟鏃�")]
- DD,
-
- /// <summary>
- /// 娴佹按鍙�
- /// </summary>
- [Description("娴佹按鍙�")]
- NUM,
-
- /// <summary>
- /// 缁撴潫瀛楃涓�
- /// </summary>
- [Description("缁撴潫瀛楃涓�")]
- ED
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LocationEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LocationEnum.cs"
deleted file mode 100644
index 95629ac..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/LocationEnum.cs"
+++ /dev/null
@@ -1,92 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- /// <summary>
- /// 璐т綅鐘舵��
- /// </summary>
- public enum LocationStatusEnum
- {
- /// <summary>
- /// 绌洪棽
- /// </summary>
- [Description("绌洪棽")]
- Free = 0,
-
- /// <summary>
- /// 閿佸畾
- /// </summary>
- [Description("閿佸畾")]
- Lock = 1,
-
- /// <summary>
- /// 鏈夎揣
- /// </summary>
- [Description("鏈夎揣")]
- InStock = 2,
-
- /// <summary>
- /// 绌烘墭閿佸畾
- /// </summary>
- [Description("绌烘墭閿佸畾")]
- PalletLock = 98,
-
- /// <summary>
- /// 绌烘墭鐩�
- /// </summary>
- [Description("绌烘墭鐩�")]
- Pallet = 99
- }
-
- public enum EnableStatusEnum
- {
- /// <summary>
- /// 姝ｅ父
- /// </summary>
- [Description("姝ｅ父")]
- Normal = 0,
-
- /// <summary>
- /// 鍙叆
- /// </summary>
- [Description("鍙叆")]
- OnlyIn = 1,
-
- /// <summary>
- /// 鍙嚭
- /// </summary>
- [Description("鍙嚭")]
- OnlyOut = 2,
-
- /// <summary>
- /// 绂佺敤
- /// </summary>
- [Description("绂佺敤")]
- Disable = 3
- }
-
- public enum LocationTypeEnum
- {
- /// <summary>
- /// 绔嬪簱
- /// </summary>
- [Description("绔嬪簱璐т綅")]
- Cube = 1,
-
- /// <summary>
- /// 骞冲簱
- /// </summary>
- [Description("骞冲簱璐т綅")]
- Flat = 2
- }
-
- public enum LocationChangeType
- {
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OperateTypeEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OperateTypeEnum.cs"
new file mode 100644
index 0000000..b7402b1
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OperateTypeEnum.cs"
@@ -0,0 +1,18 @@
+锘縰sing System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace WIDESEA_Core.Enums
+{
+ public enum OperateTypeEnum
+ {
+ 浜哄伐鍒犻櫎 = 1,
+ 鑷姩鍒犻櫎 = 2,
+ 浜哄伐鎭㈠ = 3,
+ 鑷姩鎭㈠ = 4,
+ 浜哄伐瀹屾垚 = 5,
+ 鑷姩瀹屾垚 = 6,
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs"
deleted file mode 100644
index cb8d8dc..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/OrderEnum.cs"
+++ /dev/null
@@ -1,259 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- /// <summary>
- /// 鍏ュ簱鍗曠被鍨� 100 鐢熶骇鍏ュ簱鍗�;200 鐢熶骇閫�鏂欏崟;300 閲囪喘鍏ュ簱鍗�;400 璋冩嫧鍏ュ簱鍗�;500 閿�鍞��璐у崟;600 绌虹洏鍏ュ簱鍗�;700 鍏朵粬鍏ュ簱鍗�
- /// </summary>
- public enum InOrderTypeEnum
- {
- /// <summary>
- /// 鐢熶骇鍏ュ簱鍗�
- /// </summary>
- [Description("鐢熶骇鍏ュ簱鍗�")]
- Product = 100,
-
- /// <summary>
- /// 鐢熶骇閫�鏂欏崟
- /// </summary>
- [Description("鐢熶骇閫�鏂欏崟")]
- Return = 105,
-
- /// <summary>
- /// 閲囪喘鍏ュ簱鍗�
- /// </summary>
- [Description("閲囪喘鍏ュ簱鍗�")]
- Purchase = 110,
-
- /// <summary>
- /// 璋冩嫧鍏ュ簱鍗�
- /// </summary>
- [Description("璋冩嫧鍏ュ簱鍗�")]
- Allocat = 115,
-
- /// <summary>
- /// 閿�鍞��璐у崟
- /// </summary>
- [Description("閿�鍞��璐у崟")]
- SaleReturn = 120,
-
- /// <summary>
- /// 绌虹洏鍏ュ簱鍗�
- /// </summary>
- [Description("绌虹洏鍏ュ簱鍗�")]
- EmptyDisk = 125,
-
- /// <summary>
- /// 鍏朵粬鍏ュ簱鍗�
- /// </summary>
- [Description("鍏朵粬鍏ュ簱鍗�")]
- Other = 130
- }
-
- /// <summary>
- /// 鍑哄簱鍗曠被鍨�
- /// </summary>
- public enum OutOrderTypeEnum
- {
- /// <summary>
- /// 鐢熶骇杩斿伐鍗�
- /// </summary>
- [Description("鐢熶骇杩斿伐鍗�")]
- Rework = 200,
-
- /// <summary>
- /// 鐢熶骇鍙戞枡鍗�
- /// </summary>
- [Description("鐢熶骇鍙戞枡鍗�")]
- Issue = 205,
-
- /// <summary>
- /// 閲囪喘閫�璐у崟
- /// </summary>
- [Description("閲囪喘閫�璐у崟")]
- ProcureReturn = 210,
-
- /// <summary>
- /// 璋冩嫧鍑哄簱鍗�
- /// </summary>
- [Description("璋冩嫧鍑哄簱鍗�")]
- Allocate = 215,
-
- /// <summary>
- /// 閿�鍞嚭搴撳崟
- /// </summary>
- [Description("閿�鍞嚭搴撳崟")]
- SaleOut = 220,
-
- /// <summary>
- /// 绌虹洏鍑哄簱鍗�
- /// </summary>
- [Description("绌虹洏鍑哄簱鍗�")]
- EmptyDisk = 225,
-
- /// <summary>
- /// 璐ㄦ鍑哄簱鍗�
- /// </summary>
- [Description("璐ㄦ鍑哄簱鍗�")]
- Quality = 230,
-
- /// <summary>
- /// 鍏朵粬鍑哄簱鍗�
- /// </summary>
- [Description("鍏朵粬鍑哄簱鍗�")]
- Other = 235
- }
-
- public enum OrderDetailStatusEnum
- {
- /// <summary>
- /// 鏂板缓
- /// </summary>
- [Description("鏂板缓")]
- New = 0,
-
- /// <summary>
- /// 缁勭洏鍏ュ簱
- /// </summary>
- [Description("缁勭洏鍏ュ簱")]
- GroupAndInbound = 10,
-
- [Description("鍑哄簱閮ㄥ垎鍒嗛厤瀹屾垚")]
- AssignOverPartial = 60,
-
- [Description("鍑哄簱鍒嗛厤瀹屾垚")]
- AssignOver = 70,
-
- [Description("鍑哄簱涓�")]
- Outbound = 80,
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- [Description("瀹屾垚")]
- Over=100
- }
-
- #region 鍘熷鍗曟嵁鍚屾鐘舵��
-
- /// <summary>
- /// 鍚屾鏍囧織 0:鏈悓姝� 1锛氬悓姝ユ垚鍔� 2锛氬悓姝ュけ璐�
- /// </summary>
- public enum SynchronizationFlagEmun
- {
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- [Description("鏈悓姝�")]
- 鏈悓姝� = 0,
-
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- [Description("鍚屾鎴愬姛")]
- 鍚屾鎴愬姛 = 1,
-
- /// <summary>
- /// 瀹屾垚
- /// </summary>
- [Description("鍚屾澶辫触")]
- 鍚屾澶辫触 = 2
- }
-
- #endregion 鍘熷鍗曟嵁鍚屾鐘舵��
-
- #region 鍏ュ簱鍗曟嵁鐘舵��
-
- /// <summary>
- /// 鍏ュ簱鍗曟嵁鐘舵�� 0锛屾湭寮�濮� 1锛屽叆搴撲腑 2锛屽叆搴撳畬鎴�
- /// </summary>
- public enum InboundStatusEnum
- {
- /// <summary>
- /// 鏈紑濮�
- /// </summary>
- [Description("鏈紑濮�")]
- 鏈紑濮� = 0,
-
- /// <summary>
- /// 鍏ュ簱涓�
- /// </summary>
- [Description("鍏ュ簱涓�")]
- 鍏ュ簱涓� = 1,
-
- /// <summary>
- /// 鍏ュ簱瀹屾垚
- /// </summary>
- [Description("鍏ュ簱瀹屾垚")]
- 鍏ュ簱瀹屾垚 = 2,
-
- /// <summary>
- /// 鍏抽棴
- /// </summary>
- [Description("鍏抽棴")]
- 鍏抽棴 = 99,
-
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- [Description("鍙栨秷")]
- 鍙栨秷 = 98
- }
-
- #endregion 鍏ュ簱鍗曟嵁鐘舵��
-
- #region
- public enum OutboundStatusEnum
- {
- /// <summary>
- /// 鏈紑濮�
- /// </summary>
- [Description("鏈紑濮�")]
- 鏈紑濮� = 0,
-
- /// <summary>
- /// 鍑哄簱涓�
- /// </summary>
- [Description("鍑哄簱涓�")]
- 鍑哄簱涓� = 1,
-
- /// <summary>
- /// 鍑哄簱瀹屾垚
- /// </summary>
- [Description("鍑哄簱瀹屾垚")]
- 鍑哄簱瀹屾垚 = 2,
-
- /// <summary>
- /// 鍏抽棴
- /// </summary>
- [Description("鍏抽棴")]
- 鍏抽棴 = 99,
-
- /// <summary>
- /// 鍙栨秷
- /// </summary>
- [Description("鍙栨秷")]
- 鍙栨秷 = 98
- }
- #endregion
-
- public enum CreateType
- {
- /// <summary>
- /// 绯荤粺鍐呭垱寤�
- /// </summary>
- [Description("绯荤粺鍐呭垱寤�")]
- CreateInSystem,
-
- /// <summary>
- /// 涓婃父绯荤粺鎺ㄩ��
- /// </summary>
- [Description("涓婃父绯荤粺鎺ㄩ��")]
- UpperSystemPush
- }
-}
-
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/RoadwayEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/RoadwayEnum.cs"
deleted file mode 100644
index 98ba836..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/RoadwayEnum.cs"
+++ /dev/null
@@ -1,10 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/StockEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/StockEnum.cs"
deleted file mode 100644
index 3cf4eeb..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/StockEnum.cs"
+++ /dev/null
@@ -1,97 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
- public enum StockChangeType
- {
- /// <summary>
- /// 缁勭洏
- /// </summary>
- [Description("缁勭洏")]
- MaterielGroup,
-
- /// <summary>
- /// 鍏ュ簱
- /// </summary>
- [Description("鍏ュ簱")]
- Inbound,
-
- /// <summary>
- /// 鍑哄簱
- /// </summary>
- [Description("鍑哄簱")]
- Outbound,
- /// <summary>
- /// 绉诲簱
- /// </summary>
- [Description("绉诲簱")]
- Relocation,
-
- /// <summary>
- /// 鍏ュ簱閿佸畾
- /// </summary>
- [Description("閿佸畾")]
- Lock,
-
- /// <summary>
- /// 搴撳瓨閿佸畾
- /// </summary>
- [Description("搴撳瓨閿佸畾")]
- StockLock,
-
-
- }
-
- /// <summary>
- /// 搴撳瓨鐘舵�侊細 1锛岀粍鐩樻殏瀛� 2锛岀粍鐩樻挙閿� 3锛屽叆搴撶‘璁� 4锛屽叆搴撴挙閿� 5锛屽凡鍏ュ簱 6锛屽凡鍑哄簱
- /// </summary>
- public enum StockStatusEmun
- {
- [Description("缁勭洏鏆傚瓨")]
- 缁勭洏鏆傚瓨 = 1,
-
- [Description("缁勭洏鎾ら攢")]
- 缁勭洏鎾ら攢 = 2,
-
- [Description("鍏ュ簱纭")]
- 鍏ュ簱纭 = 3,
-
- [Description("鍏ュ簱鎾ら攢")]
- 鍏ュ簱鎾ら攢 = 4,
-
- [Description("宸插叆搴�")]
- 宸插叆搴� = 5,
-
- [Description("鍏ュ簱瀹屾垚")]
- 鍏ュ簱瀹屾垚 = 6,
-
- [Description("鍑哄簱閿佸畾")]
- 鍑哄簱閿佸畾 = 7,
-
- [Description("鍑哄簱瀹屾垚")]
- 鍑哄簱瀹屾垚 = 8,
-
- [Description("绉诲簱閿佸畾")]
- 绉诲簱閿佸畾 = 9,
- }
-
- public enum OutStockStatus
- {
- [Description("宸插垎閰�")]
- 宸插垎閰� = 0,
-
- [Description("鍑哄簱涓�")]
- 鍑哄簱涓� = 1,
-
- [Description("鍑哄簱瀹屾垚")]
- 鍑哄簱瀹屾垚 = 2,
-
- [Description("鎾ら攢")]
- 鎾ら攢 = 99
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs"
deleted file mode 100644
index e0bf4a7..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs"
+++ /dev/null
@@ -1,243 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace WIDESEA_Core.Enums
-{
-
- #region 浠诲姟绫诲瀷
-
- /// <summary>
- /// 浠诲姟绫诲瀷 100 鍑哄簱;鐩樼偣鍑哄簱 101; 102 鍒嗘嫞鍑哄簱;103 璐ㄦ鍑哄簱;200 鍏ュ簱;鐩樼偣鍏ュ簱 201;鍒嗘嫞鍏ュ簱 202;璐ㄦ鍏ュ簱 203;绉诲簱 300;搴撳唴绉诲簱 301;搴撳绉诲簱 302
- /// </summary>
- public enum TaskTypeEnum
- {
- /// <summary>
- /// 鍑哄簱 =100
- /// </summary>
- [Description("鍑哄簱")]
- Outbound = 100,
-
- /// <summary>
- /// 鐩樼偣鍑哄簱
- /// </summary>
- [Description("鐩樼偣鍑哄簱")]
- OutInventory = 101,
-
- /// <summary>
- /// 鍒嗘嫞鍑哄簱
- /// </summary>
- [Description("鍒嗘嫞鍑哄簱")]
- OutPick = 102,
-
- /// <summary>
- /// 璐ㄦ鍑哄簱
- /// </summary>
- [Description("璐ㄦ鍑哄簱")]
- OutQuality = 103,
-
- /// <summary>
- /// 鍑虹┖
- /// </summary>
- [Description("鍑虹┖")]
- PalletOutbound = 104,
-
- /// <summary>
- /// 琛ョ┖
- /// </summary>
- [Description("琛ョ┖")]
- PalletFillOutbound = 105,
-
- /// <summary>
- /// 鍏ュ簱
- /// </summary>
- [Description("鍏ュ簱")]
- Inbound = 200,
-
- /// <summary>
- /// 鐩樼偣鍏ュ簱
- /// </summary>
- [Description("鐩樼偣鍏ュ簱")]
- InInventory = 201,
-
- /// <summary>
- /// 鍒嗘嫞鍏ュ簱
- /// </summary>
- [Description("鍒嗘嫞鍏ュ簱")]
- InPick = 202,
-
- /// <summary>
- /// 璐ㄦ鍏ュ簱
- /// </summary>
- [Description("璐ㄦ鍏ュ簱")]
- InQuality = 203,
-
- /// <summary>
- /// 鍏ョ┖
- /// </summary>
- [Description("鍏ョ┖")]
- PalletInbound = 204,
-
- /// <summary>
- /// 鍥炵┖
- /// </summary>
- [Description("鍥炵┖")]
- PalletReturnInbound = 205,
-
- /// <summary>
- /// 绉诲簱
- /// </summary>
- [Description("绉诲簱")]
- Relocation = 300,
-
- /// <summary>
- /// 搴撳唴绉诲簱
- /// </summary>
- [Description("搴撳唴绉诲簱")]
- RelocationIn = 301,
-
- /// <summary>
- /// 搴撳绉诲簱
- /// </summary>
- [Description("搴撳绉诲簱")]
- RelocationOut = 302,
-
- [Description("AGV鎼繍")]
- AGVCarry = 500,
- }
-
- #endregion 浠诲姟绫诲瀷
-
- #region 鍏ュ簱浠诲姟鐘舵��
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鐘舵��
- /// </summary>
- public enum InTaskStatusEnum
- {
- /// <summary>
- /// 鏂板缓鍏ュ簱浠诲姟
- /// </summary>
- [Description("鏂板缓")]
- InNew = 200,
-
- /// <summary>
- /// 鍫嗗灈鏈哄叆搴撴墽琛屼腑
- /// </summary>
- [Description("鍫嗗灈鏈哄叆搴撴墽琛屼腑")]
- SC_InExecuting = 230,
-
- /// <summary>
- /// 鍫嗗灈鏈哄叆搴撳畬鎴�
- /// </summary>
- [Description("鍫嗗灈鏈哄叆搴撳畬鎴�")]
- SC_InFinish = 235,
-
- /// <summary>
- /// 鍏ュ簱浠诲姟瀹屾垚
- /// </summary>
- [Description("鍏ュ簱浠诲姟瀹屾垚")]
- InFinish = 290,
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鍙栨秷
- /// </summary>
- [Description("鍏ュ簱浠诲姟鍙栨秷")]
- InCancel = 298,
-
- /// <summary>
- /// 鍏ュ簱浠诲姟寮傚父
- /// </summary>
- [Description("鍏ュ簱浠诲姟寮傚父")]
- InException = 299,
-
- /// <summary>
- /// 鏂板缓绉诲簱浠诲姟
- /// </summary>
- [Description("鏂板缓绉诲簱浠诲姟")]
- RelocationNew = 300,
-
- /// <summary>
- /// 绉诲簱浠诲姟瀹屾垚
- /// </summary>
- [Description("绉诲簱浠诲姟瀹屾垚")]
- RelocationFinish = 310,
-
- /// <summary>
- /// 绉诲簱浠诲姟鎵ц涓�
- /// </summary>
- [Description("绉诲簱浠诲姟鎵ц涓�")]
- RelocationExecuting = 320,
-
- /// <summary>
- /// 绉诲簱浠诲姟鍙栨秷
- /// </summary>
- [Description("绉诲簱浠诲姟鍙栨秷")]
- RelocationCancel = 330,
-
- /// <summary>
- /// 绉诲簱浠诲姟寮傚父
- /// </summary>
- [Description("绉诲簱浠诲姟寮傚父")]
- RelocationException = 340,
- }
-
- #endregion 鍏ュ簱浠诲姟鐘舵��
-
- /// <summary>
- /// 鍑哄簱浠诲姟鐘舵��
- /// </summary>
- public enum OutTaskStatusEnum
- {
- /// <summary>
- /// 鏂板缓浠诲姟
- /// </summary>
- [Description("鏂板缓")]
- OutNew = 100,
-
- /// <summary>
- /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑
- /// </summary>
- [Description("鍫嗗灈鏈哄嚭搴撴墽琛屼腑")]
- SC_OutExecuting = 130,
-
- /// <summary>
- /// 鍫嗗灈鏈哄嚭搴撳畬鎴�
- /// </summary>
- [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")]
- SC_OutFinish = 135,
-
- /// <summary>
- /// 鍑哄簱浠诲姟瀹屾垚
- /// </summary>
- [Description("鍑哄簱浠诲姟瀹屾垚")]
- OutFinish = 190,
-
- /// <summary>
- /// 鍑哄簱浠诲姟鍙栨秷
- /// </summary>
- [Description("鍑哄簱浠诲姟鍙栨秷")]
- OutCancel = 198,
-
- /// <summary>
- /// 鍑哄簱浠诲姟寮傚父
- /// </summary>
- [Description("鍑哄簱浠诲姟寮傚父")]
- OutException = 199
- }
-
- public enum AGVTaskStatusEnum
- {
- [Description("鏂板缓")]
- AGV_New = 500,
-
- [Description("鎵ц涓�")]
- AGV_Executing = 510,
-
- [Description("瀹屾垚")]
- AGV_Finish = 520
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs"
index e449a0e..417610d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/CorsSetup.cs"
@@ -24,14 +24,14 @@
services.AddCors(c =>
{
- if (!AppSettings.app(new string[] { "Cors", "EnableAllIPs" }).ObjToBool())
+ if (!AppSettings.Get(new string[] { "Cors", "EnableAllIPs" }).ObjToBool())
{
- c.AddPolicy(AppSettings.app(new string[] {"Cors", "PolicyName" }),
+ c.AddPolicy(AppSettings.Get(new string[] {"Cors", "PolicyName" }),
policy =>
{
policy
- .WithOrigins(AppSettings.app(new string[] { "Cors", "IPs" }).Split(','))
+ .WithOrigins(AppSettings.Get(new string[] { "Cors", "IPs" }).Split(','))
.AllowAnyHeader()//Ensures that the policy allows any header.
.AllowAnyMethod();
});
@@ -39,7 +39,7 @@
else
{
//鍏佽浠绘剰璺ㄥ煙璇锋眰
- c.AddPolicy(AppSettings.app(new string[] { "Cors", "PolicyName" }),
+ c.AddPolicy(AppSettings.Get(new string[] { "Cors", "PolicyName" }),
policy =>
{
policy
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
index 30c52f8..2785bea 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Extensions/SwaggerSetup.cs"
@@ -29,7 +29,7 @@
var basePath = AppContext.BaseDirectory;
//var basePath2 = Microsoft.DotNet.PlatformAbstractions.ApplicationEnvironment.ApplicationBasePath;
- var ApiName = AppSettings.app(new string[] { "ApiName" });
+ var ApiName = AppSettings.Get(new string[] { "ApiName" });
services.AddSwaggerGen(c =>
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
index 2ccaf79..e87a29d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs"
@@ -74,7 +74,7 @@
{
DateTime? expDate = context.HttpContext.User.Claims.Where(x => x.Type == JwtRegisteredClaimNames.Exp).Select(x => x.Value).FirstOrDefault()?.GetTimeSpmpToDate();
//鍔ㄦ�佹爣璇嗗埛鏂皌oken(2021.05.01)
- int ExpMinutes = AppSettings.app("ExpMinutes").ObjToInt();
+ int ExpMinutes = AppSettings.Get("ExpMinutes").ObjToInt();
if ((expDate.GetValueOrDefault() - DateTime.Now).TotalMinutes > ExpMinutes)
{
context.Unauthorized("鐧婚檰宸茶繃鏈�");
@@ -104,7 +104,7 @@
{
DateTime? expDate = context.HttpContext.User.Claims.Where(x => x.Type == JwtRegisteredClaimNames.Exp).Select(x => x.Value).FirstOrDefault()?.GetTimeSpmpToDate();
//鍔ㄦ�佹爣璇嗗埛鏂皌oken(2021.05.01)
- int ExpMinutes = AppSettings.app("ExpMinutes").ObjToInt();
+ int ExpMinutes = AppSettings.Get("ExpMinutes").ObjToInt();
if ((expDate.GetValueOrDefault() - DateTime.Now).TotalMinutes < ExpMinutes / 3 && context.HttpContext.Request.Path != replaceTokenPath)
{
context.HttpContext.Response.Headers.Add("widesea_exp", "1");
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs"
index 1245695..c09bcba 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/AppSettings.cs"
@@ -39,7 +39,7 @@
/// </summary>
/// <param name="sections">鑺傜偣閰嶇疆</param>
/// <returns></returns>
- public static string app(params string[] sections)
+ public static string Get(params string[] sections)
{
try
{
@@ -60,7 +60,7 @@
/// <typeparam name="T"></typeparam>
/// <param name="sections"></param>
/// <returns></returns>
- public static List<T> app<T>(params string[] sections)
+ public static List<T> Get<T>(params string[] sections)
{
List<T> list = new List<T>();
// 寮曠敤 Microsoft.Extensions.Configuration.Binder 鍖�
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs"
index 6dbad0f..4bfa6e3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/CodeAnalysisHelper.cs"
@@ -7,6 +7,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Seed;
@@ -22,7 +23,7 @@
/// <param name="analysisCode">瑙勫垯缂栧彿</param>
/// <param name="code">闇�瑙ｆ瀽鐨勫瓧绗︿覆</param>
/// <returns></returns>
- public static T CodeAnalysis<T>(AnalysisCode analysisCode, string code)
+ public static T CodeAnalysis<T>(AnalysisCodeEnum analysisCode, string code)
{
Type type = typeof(T);
object? obj = Activator.CreateInstance(type);
@@ -52,7 +53,7 @@
if (items.Count == codes.Count)
{
PropertyInfo[] propertyInfos = type.GetProperties();
- if (AnalysisRule.Split == analysisRule.AnalysisRule)
+ if (AnalysisRuleEnum.Split == analysisRule.AnalysisRule)
{
for (int i = 0; i < propertyInfos.Length; i++)
{
@@ -85,7 +86,7 @@
/// <param name="analysisCode">瑙勫垯缂栧彿</param>
/// <param name="codeList">闇�瑙ｆ瀽鐨勫瓧绗︿覆闆嗗悎</param>
/// <returns></returns>
- public static List<T> CodeAnalysis<T>(AnalysisCode analysisCode, List<string> codeList)
+ public static List<T> CodeAnalysis<T>(AnalysisCodeEnum analysisCode, List<string> codeList)
{
Type type = typeof(T);
List<T> list = new List<T>();
@@ -117,7 +118,7 @@
if (items.Count == codes.Count)
{
PropertyInfo[] propertyInfos = type.GetProperties();
- if (AnalysisRule.Split == analysisRule.AnalysisRule)
+ if (AnalysisRuleEnum.Split == analysisRule.AnalysisRule)
{
for (int i = 0; i < propertyInfos.Length; i++)
{
@@ -125,7 +126,7 @@
AnalysisItemRuleAttribute? analysisItemRule = propertyInfo.GetCustomAttribute<AnalysisItemRuleAttribute>();
if (analysisItemRule != null)
{
- if(analysisItemRule.AnalysisFormaType == AnalysisFormatType.BD)
+ if(analysisItemRule.AnalysisFormaType == AnalysisFormatTypeEnum.BD)
{
propertyInfo.SetValue(result, code.ChangeType(propertyInfo.PropertyType));
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs"
index da9e300..6c713cf 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/HttpHelper.cs"
@@ -104,55 +104,5 @@
}
return null;
}
-
- public static T Post<T>(string url, object parm, string rquestName = "") where T : class
- {
- HttpWebResponse response = null;
- StreamReader resultReader = null;
- string responseContent = string.Empty;
- try
- {
- HttpWebRequest request = (HttpWebRequest)WebRequest.Create(url);
- request.Timeout = 10 * 1000;
- request.Method = "POST";
- request.ContentType = "application/json; charset=UTF-8";
- parm = parm ?? "";
- byte[] data = Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(parm));
- request.ContentLength = data.Length;
- using (Stream newStream = request.GetRequestStream())
- {
- newStream.Write(data, 0, data.Length);
- };
-
- response = (HttpWebResponse)request.GetResponse();
- Stream webStream = response.GetResponseStream();
- if (webStream == null)
- {
- throw new Exception("Network error");
- }
-
- int statsCode = (int)response.StatusCode;
- resultReader = new StreamReader(webStream, Encoding.UTF8);
- responseContent = resultReader.ReadToEnd();
-
- if (response != null)
- response.Close();
- if (resultReader != null)
- resultReader.Close();
-
- if (statsCode != 200)
- {
- throw new Exception("寮傚父锛屽搷搴旂爜锛�" + statsCode.ToString());
- }
-
- Logger.Write_Log("System/API璇锋眰", rquestName, "璇锋眰鎴愬姛", new { 璇锋眰鎶ユ枃 = parm, 鎺ユ敹鎶ユ枃 = responseContent });
- return JsonConvert.DeserializeObject<T>(responseContent);
- }
- catch (Exception ex)
- {
- Logger.Write_Log("System/API璇锋眰", rquestName, "璇锋眰寮傚父", new { 璇锋眰鎶ユ枃 = parm, 鎺ユ敹鎶ユ枃 = responseContent, 閿欒 = ex.Message });
- throw ex;
- }
- }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs"
index 5c8c45d..c44c9e2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/SecurityEncDecryptHelper.cs"
@@ -56,7 +56,7 @@
public static string DecryptDES(this string decryptString, string decryptKey)
{
- if (decryptKey == AppSecret.DB && !AppSettings.app(MainDb.ConnectionStringsEncryption).ObjToBool())
+ if (decryptKey == AppSecret.DB && !AppSettings.Get(MainDb.ConnectionStringsEncryption).ObjToBool())
return decryptString;
byte[] rgbKey = Encoding.UTF8.GetBytes(decryptKey.Substring(0, 16));
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
index 4995e84..7ce4580 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/LogHelper/Logger.cs"
@@ -16,143 +16,136 @@
{
public class Logger
{
-
- public static void Debug(string message)
+ /// <summary>
+ /// 鍐欏叆璋冭瘯鏃ュ織
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="msg"></param>
+ public void WriteDebug(string fileName, string msg)
{
-
- }
-
- public static void Debug(string message, Exception exception)
- {
-
- }
-
- public static void Info(string message)
- {
-
- }
-
- public static void Info(string message, Exception exception)
- {
-
- }
-
- public static void Warn(string message)
- {
-
- }
-
- public static void Warning(string message, Exception exception)
- {
-
- }
-
- public static void Error(string message)
- {
-
- }
-
- public static void Error(string message, Exception exception)
- {
-
- }
-
- public static void Fatal(string message)
- {
-
- }
-
- public static void Fatal(string message, Exception exception)
- {
-
- }
- public static void Write_Log(string groupName, string logName, string content, object data = null)
- {
- DateTime nowTime = DateTime.Now;
- string basePath = System.Environment.CurrentDirectory + "/Log/" + $"/{groupName}/{nowTime.ToString("yyyy-MM-dd")}";
- //濡傛灉鏃ュ織鏂囦欢鐩綍涓嶅瓨鍦�,鍒欏垱寤�
- if (!Directory.Exists(basePath))
+ if (AppSettings.Get(new string[] { "LogDeubgEnable" }).ObjToBool())
{
- Directory.CreateDirectory(basePath);
+ StringBuilder builder = new StringBuilder(msg);
+ builder.Append(Environment.NewLine);
+ builder.Append(Environment.NewLine);
+ WriteLogToFile($"Debug_{fileName}", builder.ToString());
}
+ }
+
+ /// <summary>
+ /// 鍐欏叆淇℃伅鏃ュ織
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="msg"></param>
+ public void WriteInfo(string fileName, string msg)
+ {
+ StringBuilder builder = new StringBuilder(msg);
+ builder.Append(Environment.NewLine);
+ builder.Append(Environment.NewLine);
+ WriteLogToFile($"Info_{fileName}", builder.ToString());
+ }
+
+ /// <summary>
+ /// 鍐欏叆閿欒鏃ュ織
+ /// </summary>
+ /// <param name="fileName"></param>
+ /// <param name="msg"></param>
+ /// <param name="ex"></param>
+ public void WriteError(string fileName, string msg, Exception ex)
+ {
+ StringBuilder builder = new StringBuilder(msg);
+ builder.Append(Environment.NewLine);
+ builder.Append("閿欒淇℃伅锛�");
+ builder.Append(ex.Message);
+ builder.Append(Environment.NewLine);
+ builder.Append("閿欒婧愶細");
+ builder.Append(ex.Source);
+ builder.Append(Environment.NewLine);
+ builder.Append("閿欒鍫嗘爤锛�");
+ builder.Append(ex.StackTrace);
+ builder.Append(Environment.NewLine);
+ builder.Append("閿欒绫诲瀷锛�");
+ builder.Append(ex.GetType().ToString());
+ builder.Append(Environment.NewLine);
+ builder.Append("閿欒鏂规硶锛�");
+ builder.Append(ex.TargetSite?.ToString());
+ builder.Append(Environment.NewLine);
+ builder.Append(Environment.NewLine);
+ WriteLogToFile($"Error_{fileName}", builder.ToString());
+ }
+
+
+ ReaderWriterLockSlim LogWriteLock = new ReaderWriterLockSlim();
+ string folderPath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, $"Log\\{DateTime.Now.ToString("yyyy-MM-dd")}");
+
+ private void WriteLogToFile(string fileName, string log)
+ {
try
{
- FileStream fs = new FileStream(basePath + "/" + logName + $"{nowTime.ToString("yyMMdd")}.txt", FileMode.Append);
- StreamWriter strwriter = new StreamWriter(fs);
- try
+ // 杩涘叆鍐欓攣
+ LogWriteLock.EnterWriteLock();
+
+ // 濡傛灉鏂囦欢澶逛笉瀛樺湪锛屽垯鍒涘缓鏂囦欢澶�
+ if (!Directory.Exists(folderPath))
{
- strwriter.WriteLine(nowTime.ToString() + "." + nowTime.Millisecond);
- strwriter.WriteLine(content);
- if (data != null)
- {
- strwriter.WriteLine(JsonConvert.SerializeObject(data));
- }
- strwriter.WriteLine("-------------------------------");
- strwriter.WriteLine();
- strwriter.Flush();
+ Directory.CreateDirectory(folderPath);
}
- catch { }
- finally
- {
- strwriter.Close();
- fs.Close();
- }
+ // 鑾峰彇鏃ュ織鏂囦欢璺緞
+ string logFilePath = Path.Combine(folderPath, GetLastAccessFileName(fileName));
+ // 鑾峰彇褰撳墠鏃堕棿
+ DateTime now = DateTime.Now;
+ // 鏋勯�犳棩蹇楀唴瀹�
+ string logContent = $"銆恵now}銆憑Environment.NewLine}{log}";
+
+ // 灏嗘棩蹇楀唴瀹硅拷鍔犲埌鏃ュ織鏂囦欢涓�
+ File.AppendAllText(logFilePath, logContent);
}
catch { }
+ finally
+ {
+ // 閫�鍑哄啓閿�
+ LogWriteLock.ExitWriteLock();
+ }
}
-
- public static void WriteApiLog2DB(HttpContext context, string requestParameter, DateTime beginDate, string responseParameter, DateTime endDate, LoggerStatus loggerStatus)
+ int size = 10 * 1024 * 1024;
+ string ext = ".log";
+ private string GetLogFilePath(string folderPath, string fileName)
{
- try
+ // 鑾峰彇鎸囧畾鏂囦欢澶逛笅鐨勬墍鏈夋枃浠�
+ var allFiles = new DirectoryInfo(folderPath);
+ // 鑾峰彇绗﹀悎鏉′欢鐨勬枃浠讹紝鎸夋枃浠跺悕闄嶅簭鎺掑垪
+ var selectFiles = allFiles.GetFiles().Where(fi => fi.Name.ToLower().Contains(fileName.ToLower()) && fi.Extension.ToLower() == ext.ToLower() && fi.Length < size).OrderByDescending(d => d.Name).ToList();
+
+ FileInfo? file = selectFiles.FirstOrDefault();
+ // 濡傛灉鏈夌鍚堟潯浠剁殑鏂囦欢锛岃繑鍥炵涓�涓枃浠剁殑瀹屾暣璺緞
+ if (file != null)
{
- if (context.Request.Method == "OPTIONS") return;
-
- if (context == null)
- {
- Console.WriteLine($"鏈幏鍙栧埌httpcontext淇℃伅,reqParam:{requestParameter},respParam:{responseParameter},success:{loggerStatus}");
- return;
- }
-
- Dictionary<string, object> dic = new Dictionary<string, object>
- {
- {"BeginDate",beginDate },
- {"ElapsedTime",(endDate - beginDate).TotalMilliseconds.DoubleToInt() },
- {"EndDate",endDate },
- {"RequestParam",requestParameter },
- {"ResponseParam",responseParameter },
- {"Success",1 },
- {"Url",context.Request.Path.Value??"" },
- {"UserIP",context.GetUserIp() },
- {"UserName","App.User?.Name" },
- {"User_Id","0" }
-
- //{"BeginDate",beginDate },
- //{"ElapsedTime",(endDate - beginDate).TotalMilliseconds.ObjToInt() },
- //{"EndDate",endDate },
- //{"RequestParam",requestParameter },
- //{"ResponseParam",responseParameter },
- //{"Success",1 },
- //{"Url",context.Request.Path.Value??"" },
- //{"UserIP",context.GetUserIp() },
- //{"UserName","App.User?.Name" },
- //{"User_Id","App.User?.ID" }
- };
-
-
- SqlSugarClient sqlSugarClient = DBContext.GetCustomDB(DBContext.GetConnectionConfig());
- sqlSugarClient.Insertable(dic).AS("Sys_Log").ExecuteCommand();
+ return file.FullName;
}
- catch (Exception ex)
- {
- }
+ // 濡傛灉娌℃湁绗﹀悎鏉′欢鐨勬枃浠讹紝杩斿洖涓�涓柊鐨勬枃浠惰矾寰勶紝鏂囦欢鍚嶄负鍘熸枃浠跺悕鍔犱笂褰撳墠鏃堕棿
+ return Path.Combine(folderPath, $@"{fileName}_{DateTime.Now.ToString("HH-mm-ss")}.log");
}
- }
- public enum LoggerStatus
- {
- Success = 1,
- Error = 2,
- Info = 3
+ private string GetLastAccessFileName(string fileName)
+ {
+ foreach (var m in GetExistLogFileNames(fileName))
+ {
+ FileInfo fileInfo = new FileInfo(m);
+ if (fileInfo.Length < size)
+ {
+ return m;
+ }
+ }
+
+ // 杩斿洖涓�涓柊鐨勯粯璁ゅ綋鍓嶆椂闂寸殑鏃ュ織鍚嶇О
+ return $@"{fileName}_{DateTime.Now.ToString("HH-mm-ss")}.log";
+ }
+
+ private string[] GetExistLogFileNames(string fileName)
+ {
+ string[] fileNames = Directory.GetFiles(folderPath, fileName + "*.log");
+ return fileNames;
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs"
index 5c88faf..f3c8cfc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Middlewares/SwaggerMiddleware.cs"
@@ -24,7 +24,7 @@
app.UseSwaggerUI(c =>
{
//鏍规嵁鐗堟湰鍚嶇О鍊掑簭 閬嶅巻灞曠ず
- var apiName = AppSettings.app(new string[] { "ApiName" });
+ var apiName = AppSettings.Get(new string[] { "ApiName" });
typeof(ApiVersions).GetEnumNames().OrderByDescending(e => e).ToList().ForEach(version =>
{
c.SwaggerEndpoint($"/swagger/{version}/swagger.json", $"{apiName} {version}");
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs"
index 3ebd497..14df465 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Seed/DBContext.cs"
@@ -25,7 +25,7 @@
{
MutiDBOperate mainDb = new MutiDBOperate()
{
- Connection = AppSettings.app(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
+ Connection = AppSettings.Get(MainDb.ConnectionString).DecryptDES(AppSecret.DB),
ConnId = MainDb.CurrentDbConnId,
DbType = DataBaseType.SqlServer
};
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InitializationLocationDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InitializationLocationDTO.cs"
index 7bade35..d56858d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InitializationLocationDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/InitializationLocationDTO.cs"
@@ -19,31 +19,25 @@
/// <summary>
/// 琛�
/// </summary>
- [PropertyValidate("琛�", MinValue = 0, IsContainMinValue = false)]
+ [PropertyValidate("琛�", MinValue = 1, IsContainMinValue = false)]
public int MaxRow { get; set; }
/// <summary>
/// 鍒�
/// </summary>
- [PropertyValidate("鍒�", MinValue = 0, IsContainMinValue = false)]
+ [PropertyValidate("鍒�", MinValue = 1, IsContainMinValue = false)]
public int MaxColumn { get; set; }
/// <summary>
/// 灞�
/// </summary>
- [PropertyValidate("灞�", MinValue = 0, IsContainMinValue = false)]
+ [PropertyValidate("灞�", MinValue = 1, IsContainMinValue = false)]
public int MaxLayer { get; set; }
/// <summary>
/// 鏄惁鍗曟繁璐т綅
/// </summary>
- [PropertyValidate("鏄惁鍗曟繁璐т綅", NotNullAndEmpty = true)]
- public bool IsSingleDepth { get; set; }
-
- /// <summary>
- /// 涓�娣辫鍙�
- /// </summary>
- [PropertyValidate("涓�娣辫鍙�", NotNullAndEmptyWithPropertyAndValue = new string[] { nameof(IsSingleDepth), "false" })]
- public List<int> FirstDepthRows { get; set; }
+ [PropertyValidate("娣卞害", MinValue = 1, NotNullAndEmpty = true)]
+ public int Depth { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MatSerialNumberDTO.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MatSerialNumberDTO.cs"
index afb36bd..0eacb9d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MatSerialNumberDTO.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MatSerialNumberDTO.cs"
@@ -10,22 +10,22 @@
[AnalysisRule, ModelValidate]
public class MatSerialNumberDTO
{
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.MTC), PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.MTC), PropertyValidate("鐗╂枡缂栧彿", NotNullAndEmpty = true)]
public string MaterielCode { get; set; }
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.MTPT), PropertyValidate("鐢熶骇鏃ユ湡", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.MTPT), PropertyValidate("鐢熶骇鏃ユ湡", NotNullAndEmpty = true)]
public string ProductionDate { get; set; }
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.BHN), PropertyValidate("鎵规鍙�", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.BHN), PropertyValidate("鎵规鍙�", NotNullAndEmpty = true)]
public string BatchNo { get; set; }
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.MTQ), PropertyValidate("鏁伴噺", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.MTQ), PropertyValidate("鏁伴噺", NotNullAndEmpty = true)]
public decimal MaterielQuantity { get; set; }
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.ODN), PropertyValidate("璁㈠崟缂栧彿", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.ODN), PropertyValidate("璁㈠崟缂栧彿", NotNullAndEmpty = true)]
public string OrderNo { get; set; }
- [AnalysisItemRule(WIDESEA_Core.Enums.AnalysisFormatType.BD), PropertyValidate("搴忓垪鍙�", NotNullAndEmpty = true)]
+ [AnalysisItemRule(WIDESEA_Core.CodeConfigEnum.AnalysisFormatTypeEnum.BD), PropertyValidate("搴忓垪鍙�", NotNullAndEmpty = true)]
public string SerialNumber { get; set; }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
index f3b6d7b..91f4cd2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicRepository/ILocationInfoRepository.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.LocationEnum;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Basic;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ILocationInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ILocationInfoService.cs"
index cac2db2..da8ea7c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ILocationInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IBasicService/ILocationInfoService.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_DTO.Basic;
@@ -15,5 +16,8 @@
{
ILocationInfoRepository Repository { get; }
+ WebResponseContent InitializationLocation(InitializationLocationDTO initializationLocationDTO);
+
+ Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
index eac800f..9e0169e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IOutboundService/IOutStockLockInfoService.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_IOutboundRepository;
@@ -18,6 +19,6 @@
List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId);
- List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutStockStatus outStockStatus);
+ List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs"
index fa69970..12e6908 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_IRecordService/IStockQuantityChangeRecordService.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_IRecordRepository;
@@ -14,6 +15,6 @@
{
IStockQuantityChangeRecordRepository Repository { get; }
- void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeType changeType,int taskNum);
+ void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeTypeEnum changeType,int taskNum);
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs"
index 3005140..7be5b2c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Base/InboundOrderService.cs"
@@ -7,6 +7,7 @@
using System.Reflection.Metadata;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -74,7 +75,7 @@
#endregion
Dt_InboundOrder inboundOrder = _mapper.Map<Dt_InboundOrder>(orderAddDTO);
- inboundOrder.OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt();
+ inboundOrder.OrderStatus = InOrderStatusEnum.鏈紑濮�.ObjToInt();
bool a = BaseDal.Db.InsertNav(inboundOrder).Include(x => x.Details).ExecuteCommand();
content = WebResponseContent.Instance.OK();
}
@@ -131,7 +132,7 @@
{
expressionOrder = x => x.OrderNo.Contains(inboundOrderGetDTO.OrderNo);
}
- int count = BaseDal.QueryData(x => x.OrderStatus == InboundStatusEnum.鏈紑濮�.ObjToInt()).ToList().Count();
+ int count = BaseDal.QueryData(x => x.OrderStatus == InOrderStatusEnum.鏈紑濮�.ObjToInt()).ToList().Count();
int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
if (inboundOrderGetDTO.pageNo <= maxPage)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs"
index 40f33b5..78a36ab 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_InboundService/Service/InboundOrderDetailService.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
index 5ce6efe..1a33a58 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder.cs"
@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
@@ -15,7 +16,7 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [CodeRule(WIDESEA_Core.Enums.RuleCode.InboundOrderRule)]
+ [CodeRule(RuleCodeEnum.InboundOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
public string OrderNo { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_Hty.cs"
index 1ffbda1..501f8c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_Hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Inbound/Dt_InboundOrder_Hty.cs"
@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
@@ -16,7 +17,6 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [CodeRule(WIDESEA_Core.Enums.RuleCode.InboundOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿")]
public string OrderNo { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
index 2e0b0a1..e0af58f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder.cs"
@@ -5,6 +5,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
@@ -15,7 +16,7 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [CodeRule(WIDESEA_Core.Enums.RuleCode.OutboundOrderRule)]
+ [CodeRule(RuleCodeEnum.OutboundOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
public string OrderNo { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
index 46d4162..621f32f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/Outbound/Dt_OutboundOrder_Hty.cs"
@@ -6,6 +6,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Attributes;
+using WIDESEA_Core.CodeConfigEnum;
using WIDESEA_Core.DB.Models;
namespace WIDESEA_Model.Models
@@ -16,7 +17,6 @@
[SugarColumn(IsPrimaryKey = true, IsIdentity = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
- [CodeRule(WIDESEA_Core.Enums.RuleCode.OutboundOrderRule)]
[SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍗曟嵁缂栧彿", IsOnlyIgnoreUpdate = true)]
public string OrderNo { get; set; }
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
index 9ddf538..5f7ad7f 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task.cs"
@@ -5,9 +5,9 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OtherEnum;
using WIDESEA_Core.Attributes;
using WIDESEA_Core.DB.Models;
-using WIDESEA_Core.Enums;
namespace WIDESEA_Model.Models
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs"
index 87a6ed6..b459906 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/TaskInfo/Dt_Task_Hty.cs"
@@ -5,8 +5,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OtherEnum;
using WIDESEA_Core.Attributes;
-using WIDESEA_Core.Enums;
namespace WIDESEA_Model.Models
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
index 80b756b..9ba5786 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutStockLockInfoService.cs"
@@ -3,6 +3,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -37,7 +38,7 @@
OrderNo = outboundOrder.OrderNo,
OrderType = outboundOrder.OrderType,
OriginalQuantity = item.Details.Where(x => x.MaterielCode == outboundOrderDetail.MaterielCode).Sum(x => x.StockQuantity),
- Status = taskNum == null ? OutStockStatus.宸插垎閰�.ObjToInt() : OutStockStatus.鍑哄簱涓�.ObjToInt(),
+ Status = taskNum == null ? OutLockStockStatusEnum.宸插垎閰�.ObjToInt() : OutLockStockStatusEnum.鍑哄簱涓�.ObjToInt(),
StockId = item.Id,
TaskNum = taskNum
};
@@ -52,7 +53,7 @@
return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId);
}
- public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutStockStatus outStockStatus)
+ public List<Dt_OutStockLockInfo> GetByOrderDetailId(int orderDetailId, OutLockStockStatusEnum outStockStatus)
{
return BaseDal.QueryData(x => x.OrderDetailId == orderDetailId && x.Status == outStockStatus.ObjToInt());
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
index 7f00344..65b8bf5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_OutboundService/Base/OutboundOrderService.cs"
@@ -7,6 +7,7 @@
using System.Linq.Expressions;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.OrderEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
@@ -88,7 +89,7 @@
#endregion
Dt_OutboundOrder outboundOrder = _mapper.Map<Dt_OutboundOrder>(orderAddDTO);
- outboundOrder.OrderStatus = InboundStatusEnum.鏈紑濮�.ObjToInt();
+ outboundOrder.OrderStatus = OutOrderStatusEnum.鏈紑濮�.ObjToInt();
bool a = BaseDal.Db.InsertNav(outboundOrder).Include(x => x.Details).ExecuteCommand();
content = WebResponseContent.Instance.OK();
}
@@ -154,7 +155,7 @@
{
expressionOrder = x => x.OrderNo.Contains(outboundOrderGetDTO.OrderNo);
}
- int count = BaseDal.QueryData(x => x.OrderStatus == OutboundStatusEnum.鏈紑濮�.ObjToInt()).ToList().Count();
+ int count = BaseDal.QueryData(x => x.OrderStatus == OutOrderStatusEnum.鏈紑濮�.ObjToInt()).ToList().Count();
int maxPage = Convert.ToInt32(Math.Ceiling(count / 10.0));
if (outboundOrderGetDTO.pageNo <= maxPage)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
index 8f2f430..58b1f41 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_RecordService/Service/StockQuantityChangeRecordService.cs"
@@ -4,6 +4,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
@@ -15,7 +16,7 @@
{
public partial class StockQuantityChangeRecordService : ServiceBase<Dt_StockQuantityChangeRecord, IStockQuantityChangeRecordRepository>, IStockQuantityChangeRecordService
{
- public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeType changeType,int taskNum)
+ public void AddStockChangeRecord(Dt_StockInfo stockInfo, List<Dt_StockInfoDetail> stockInfoDetails, decimal beforeQuantity, decimal totalQuantity, StockChangeTypeEnum changeType,int taskNum)
{
try
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
index adef8e2..4acbcb8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockRepository/StockInfoRepository.cs"
@@ -6,6 +6,8 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.Enums;
using WIDESEA_DTO.Stock;
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
index 68c747f..e05fd63 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Base/StockViewService.cs"
@@ -52,9 +52,7 @@
ISugarQueryable<Dt_StockInfo> sugarQueryable1 = _dbBase.Queryable<Dt_StockInfo>();
ISugarQueryable<Dt_LocationInfo> sugarQueryable = _dbBase.Queryable<Dt_LocationInfo>();
- ISugarQueryable<Dt_StockInfoDetail> sugarQueryable2 = _dbBase.Queryable<Dt_StockInfoDetail>();
-
-
+
List<StockViewDTO> list = sugarQueryable1.InnerJoin(sugarQueryable, (b, a) => a.LocationCode == b.LocationCode).WhereIF(!string.IsNullOrEmpty(where), where).Select((b, a) => new StockViewDTO
{
AreaId = a.AreaId,
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
index 12386b1..0fa3887 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_StockService/Service/StockInfoService.cs"
@@ -6,6 +6,7 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.StockEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseServices;
using WIDESEA_Core.Enums;
@@ -61,7 +62,7 @@
}
stockInfo.Details = details;
- _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeType.MaterielGroup,0);
+ _recordService.StockQuantityChangeRecordService.AddStockChangeRecord(stockInfo, stockInfo.Details, beforeQuantity, stockInfo.Details.Sum(x => x.StockQuantity) + beforeQuantity, StockChangeTypeEnum.MaterielGroup,0);
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
index 9743d4b..469aaf4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_SystemService/Sys_DictionaryService.cs"
@@ -7,6 +7,11 @@
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Common.CommonEnum;
+using WIDESEA_Common.LocationEnum;
+using WIDESEA_Common.OrderEnum;
+using WIDESEA_Common.StockEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseRepository;
using WIDESEA_Core.BaseServices;
@@ -153,12 +158,12 @@
case "inboundState":
{
List<object> data = new List<object>();
- Type type = typeof(InboundStatusEnum);
- List<int> enums = Enum.GetValues(typeof(InboundStatusEnum)).Cast<int>().ToList();
+ Type type = typeof(InOrderStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(InOrderStatusEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(InboundStatusEnum).GetField(((InboundStatusEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(InOrderStatusEnum).GetField(((InOrderStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -177,12 +182,12 @@
case "outboundStatusEnum":
{
List<object> data = new List<object>();
- Type type = typeof(OutboundStatusEnum);
- List<int> enums = Enum.GetValues(typeof(OutboundStatusEnum)).Cast<int>().ToList();
+ Type type = typeof(OutOrderStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(OutOrderStatusEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(OutboundStatusEnum).GetField(((OutboundStatusEnum)item).ToString());
+ FieldInfo? fieldInfo = typeof(OutOrderStatusEnum).GetField(((OutOrderStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -284,12 +289,12 @@
List<object> data = new List<object>();
{
- Type type = typeof(CreateType);
- List<int> enums = Enum.GetValues(typeof(CreateType)).Cast<int>().ToList();
+ Type type = typeof(OrderCreateTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(OrderCreateTypeEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(CreateType).GetField(((CreateType)item).ToString());
+ FieldInfo? fieldInfo = typeof(OrderCreateTypeEnum).GetField(((OrderCreateTypeEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -484,27 +489,6 @@
index++;
}
}
-
- {
- Type type = typeof(AGVTaskStatusEnum);
- List<int> enums = Enum.GetValues(typeof(AGVTaskStatusEnum)).Cast<int>().ToList();
- int index = 0;
- foreach (var item in enums)
- {
- FieldInfo? fieldInfo = typeof(AGVTaskStatusEnum).GetField(((AGVTaskStatusEnum)item).ToString());
- DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
- if (description != null)
- {
- data.Add(new { key = item.ToString(), value = description.Description });
- }
- else
- {
- data.Add(new { key = item.ToString(), value = item.ToString() });
- }
- index++;
- }
- }
-
result = new VueDictionaryDTO { DicNo = key, Config = "", Data = data };
}
break;
@@ -535,12 +519,12 @@
case "stockChangeType":
{
List<object> data = new List<object>();
- Type type = typeof(StockChangeType);
- List<int> enums = Enum.GetValues(typeof(StockChangeType)).Cast<int>().ToList();
+ Type type = typeof(StockChangeTypeEnum);
+ List<int> enums = Enum.GetValues(typeof(StockChangeTypeEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(StockChangeType).GetField(((StockChangeType)item).ToString());
+ FieldInfo? fieldInfo = typeof(StockChangeTypeEnum).GetField(((StockChangeTypeEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
@@ -559,12 +543,12 @@
case "outStockStatus":
{
List<object> data = new List<object>();
- Type type = typeof(OutStockStatus);
- List<int> enums = Enum.GetValues(typeof(OutStockStatus)).Cast<int>().ToList();
+ Type type = typeof(OutLockStockStatusEnum);
+ List<int> enums = Enum.GetValues(typeof(OutLockStockStatusEnum)).Cast<int>().ToList();
int index = 0;
foreach (var item in enums)
{
- FieldInfo? fieldInfo = typeof(OutStockStatus).GetField(((OutStockStatus)item).ToString());
+ FieldInfo? fieldInfo = typeof(OutLockStockStatusEnum).GetField(((OutLockStockStatusEnum)item).ToString());
DescriptionAttribute? description = fieldInfo.GetCustomAttribute<DescriptionAttribute>();
if (description != null)
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
deleted file mode 100644
index 3bed072..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_AGV.cs"
+++ /dev/null
@@ -1,17 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Common;
-using WIDESEA_Core;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core.Helper;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
deleted file mode 100644
index b374626..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Inbound.cs"
+++ /dev/null
@@ -1,21 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core;
-using WIDESEA_Model.Models;
-using WIDESEA_Core.Helper;
-using Microsoft.Extensions.Logging;
-using System.Net.Http.Headers;
-using System.Security.Policy;
-using Newtonsoft.Json;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
deleted file mode 100644
index 88d5c3d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/PartialTaskService_Outbound.cs"
+++ /dev/null
@@ -1,26 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core.Enums;
-using WIDESEA_Core;
-using WIDESEA_DTO.Stock;
-using WIDESEA_Model.Models;
-using WIDESEA_Core.Helper;
-using Microsoft.AspNetCore.Http;
-using System.Reflection.Metadata;
-using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
-using SkiaSharp;
-using System.Collections;
-using Newtonsoft.Json;
-using WIDESEA_Core.Log;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
-
-
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskServiceExtendFunc.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskServiceExtendFunc.cs"
deleted file mode 100644
index 9669c50..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_TaskInfoService/TaskServiceExtendFunc.cs"
+++ /dev/null
@@ -1,14 +0,0 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEA_Core;
-using WIDESEA_Model.Models;
-
-namespace WIDESEA_TaskInfoService
-{
- public partial class TaskService
- {
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
index b58266b..e89e2e9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/Basic/LocationInfoController.cs"
@@ -2,6 +2,7 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using System.Collections.Generic;
+using WIDESEA_Common.CommonEnum;
using WIDESEA_Core;
using WIDESEA_Core.BaseController;
using WIDESEA_Core.Enums;
@@ -21,5 +22,17 @@
{
_repository = repository;
}
+
+ [HttpPost, Route("InitializationLocation"), AllowAnonymous]
+ public WebResponseContent InitializationLocation([FromBody] InitializationLocationDTO initializationLocationDTO)
+ {
+ return Service.InitializationLocation(initializationLocationDTO);
+ }
+
+ [HttpPost, HttpGet, Route("AssignLocation"), AllowAnonymous]
+ public Dt_LocationInfo? AssignLocation(string roadwayNo, PalletTypeEnum palletType)
+ {
+ return Service.AssignLocation(roadwayNo, palletType);
+ }
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
index c7bbcc6..2df5516 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs"
@@ -109,7 +109,7 @@
//todo
//app.UseRecordAccessLogsMiddle();
-app.UseCors(AppSettings.app(new string[] { "Cors", "PolicyName" }));
+app.UseCors(AppSettings.Get(new string[] { "Cors", "PolicyName" }));
DefaultFilesOptions defaultFilesOptions = new DefaultFilesOptions();
defaultFilesOptions.DefaultFileNames.Clear();
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
index 0a6c18c..b54ea05 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/appsettings.json"
@@ -12,7 +12,7 @@
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=sa123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWMS_HUAIAN;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
"PolicyName": "CorsIpAccess", //绛栫暐鍚嶇О
--
Gitblit v1.9.3