From a4342e58b21d24428285f78abb95d6a87ccf5979 Mon Sep 17 00:00:00 2001
From: 陈勇 <竞男@ASUNA>
Date: 星期一, 30 三月 2026 16:02:36 +0800
Subject: [PATCH] 同步
---
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs | 12
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs | 2
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs | 2
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 69 ++-----
项目代码/WCS/WCSServer/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs | 7
项目代码/WMS/WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs | 17 +
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestEmptyInboundRoadWayNo.cs | 39 ++-
项目代码/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx | 44 ++--
项目代码/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs | 16 +
项目代码/WMS/WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs | 22 ++
项目代码/WCS/WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 40 ++--
项目代码/WMS/WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs | 9
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs | 6
项目代码/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs | 10 +
项目代码/WCS/WCSServer/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs | 2
项目代码/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBodyInfo_hty.cs | 6
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/HZPassTZ.cs | 5
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs | 9
项目代码/WCS/WCSServer/WIDESEAWCS_Server/appsettings.json | 11 -
项目代码/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Stock/VV_StockInfo.cs | 9 +
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs | 48 ++--
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs | 3
项目代码/WMS/WMSServer/WIDESEA_Model/Models/BasicInfo/Dt_RoadWay.cs | 1
项目代码/WMS/WMSClient/src/api/buttons.js | 4
项目代码/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue | 2
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs | 50 +++++
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs | 18 +
项目代码/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs | 7
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/QuartzJobMildd.cs | 2
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs | 5
项目代码/WMS/WMSServer/WIDESEA_WMSServer.sln | 5
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/lock.cs | 2
项目代码/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/TZPassZZ.cs | 3
项目代码/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 6
项目代码/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs | 16 -
项目代码/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs | 1
36 files changed, 317 insertions(+), 193 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
index 6f72559..5c160de 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs"
@@ -56,6 +56,8 @@
public const string TZPassZZ = "TZPassZZ";
+ public const string HZPassTZ = "HZPassTZ";
+
public const string Queue = "Queue";
public const string RequestInboundRoadWayNo = "RequestInboundRoadWayNo";
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
index 0716fae..1995812 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
@@ -24,14 +24,14 @@
/// <summary>
/// 鍒嗘嫞鍏ュ簱
/// </summary>
- [Description("鍒嗘嫞鍏ュ簱")]
- InPick = 202,
+ //[Description("鍒嗘嫞鍏ュ簱")]
+ //InPick = 202,
/// <summary>
/// 璐ㄦ鍏ュ簱
/// </summary>
- [Description("璐ㄦ鍏ュ簱")]
- InQuality = 203,
+ //[Description("璐ㄦ鍏ュ簱")]
+ //InQuality = 203,
/// <summary>
/// 绌烘墭鐩樺叆搴�
@@ -42,20 +42,20 @@
/// <summary>
/// NG鍏ュ簱
/// </summary>
- [Description("NG鍏ュ簱")]
- InNG = 205,
+ //[Description("NG鍏ュ簱")]
+ //InNG = 205,
/// <summary>
/// 杞﹁疆鍏ュ簱
/// </summary>
- [Description("杞﹁疆鍏ュ簱")]
- InWheels = 206,
+ //[Description("杞﹁疆鍏ュ簱")]
+ //InWheels = 206,
/// <summary>
/// 鍒跺姩鐩樺叆搴�
/// </summary>
- [Description("鍒跺姩鐩樺叆搴�")]
- InBrake = 207,
+ //[Description("鍒跺姩鐩樺叆搴�")]
+ //InBrake = 207,
}
public enum TaskOutboundTypeEnum
@@ -75,14 +75,14 @@
/// <summary>
/// 鍒嗘嫞鍑哄簱
/// </summary>
- [Description("鍒嗘嫞鍑哄簱")]
- OutPick = 102,
+ //[Description("鍒嗘嫞鍑哄簱")]
+ //OutPick = 102,
/// <summary>
/// 璐ㄦ鍑哄簱
/// </summary>
- [Description("璐ㄦ鍑哄簱")]
- OutQuality = 103,
+ //[Description("璐ㄦ鍑哄簱")]
+ //OutQuality = 103,
/// <summary>
/// 绌烘墭鐩樺嚭搴�
@@ -93,8 +93,8 @@
/// <summary>
/// NG鍑哄簱
/// </summary>
- [Description("NG鍑哄簱")]
- OutNG = 105,
+ //[Description("NG鍑哄簱")]
+ //OutNG = 105,
/// <summary>
/// 鐩存帴鍑哄簱
@@ -105,14 +105,14 @@
/// <summary>
/// 杞﹁疆鍑哄簱
/// </summary>
- [Description("杞﹁疆鍑哄簱")]
- OutWheels = 107,
+ //[Description("杞﹁疆鍑哄簱")]
+ //OutWheels = 107,
/// <summary>
/// 鍒跺姩鐩樺嚭搴�
/// </summary>
- [Description("鍒跺姩鐩樺嚭搴�")]
- OutBrake = 108,
+ //[Description("鍒跺姩鐩樺嚭搴�")]
+ //OutBrake = 108,
}
public enum TaskRelocationTypeEnum
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
index 757089d..e9fc175 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_DTO/TaskInfo/WMSTaskDTO.cs"
@@ -24,11 +24,16 @@
public string PalletCode { get; set; }
/// <summary>
- /// 宸烽亾鍙�
+ /// 宸烽亾璁惧鍙�
/// </summary>
public string RoadWay { get; set; }
/// <summary>
+ /// 宸烽亾鍙�
+ /// </summary>
+ public string RoadwayNo { get; set; }
+
+ /// <summary>
/// 浠诲姟绫诲瀷
/// </summary>
public int TaskType { get; set; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
index a390978..77e17ec 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs"
@@ -156,6 +156,12 @@
public int CarType { get; set; }
/// <summary>
+ /// 宸烽亾鍙�
+ ///</summary>
+ [SugarColumn(ColumnName = "RoadwayNo", ColumnDescription = "宸烽亾鍙�")]
+ public string RoadwayNo { get; set; }
+
+ /// <summary>
/// 澶� 娉�:PVI鐮�
/// 榛樿鍊�:
///</summary>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
index 4dd5490..d15f55e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task_Hty.cs"
@@ -54,12 +54,20 @@
public string PalletCode { get; set; }
/// <summary>
+ /// 宸烽亾鏈�
+ /// </summary>
+ [ImporterHeader(Name = "宸烽亾鏈�")]
+ [ExporterHeader(DisplayName = "宸烽亾鏈�")]
+ [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鏈�")]
+ public string Roadway { get; set; }
+
+ /// <summary>
/// 宸烽亾鍙�
/// </summary>
[ImporterHeader(Name = "宸烽亾鍙�")]
[ExporterHeader(DisplayName = "宸烽亾鍙�")]
[SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鍙�")]
- public string Roadway { get; set; }
+ public string RoadwayNo { get; set; }
/// <summary>
/// 浠诲姟绫诲瀷
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Server/appsettings.json"
index fe828f1..03ed267 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Server/appsettings.json"
@@ -11,16 +11,9 @@
"ConnectionStringsEncryption": false,
"MainDB": "DB_WIDESEA", //褰撳墠椤圭洰鐨勪富搴擄紝鎵�瀵瑰簲鐨勮繛鎺ュ瓧绗︿覆鐨凟nabled蹇呴』涓簍rue
//杩炴帴瀛楃涓�
- //"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
- //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
- //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=.;Initial Catalog=LP_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=.;Initial Catalog=ZCLDY_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=127.0.0.1;Initial Catalog=WIDESEA_WCS2F08;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=True",
- //"ConnectionString": "Data Source=192.168.20.251;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=123456@gy;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "Data Source=192.168.5.251;Initial Catalog=WIDESEAWCS_TEST;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
-
+ //"ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=MX_LDY_WCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
+ "ConnectionString": "Data Source=.\\LIULEI;Initial Catalog=LP_WIDESEAWCS;User ID=sa;Password=123456;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//"ConnectionString": "Data Source=172.21.1.139;Initial Catalog=WIDESEA_WCSDB;User ID=sa;Password=Admin123;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
//璺ㄥ煙
"Cors": {
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
index 2d3686e..78ca85c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs"
@@ -129,9 +129,9 @@
// 妫�鏌ュ綋鍓嶆墭鐩樻槸鍚﹀瓨鍦ㄤ换鍔�
- private async Task<bool> HasTask(string PVI)
+ private async Task<bool> HasTask(string palletCode)
{
- var hasTask = await BaseDal.QueryFirstAsync(x => x.PVI == PVI);
+ var hasTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
return hasTask != null;
}
@@ -191,10 +191,10 @@
StaticVariable.isLineRun = false;
// 妫�鏌ュ綋鍓嶆墭鐩樻槸鍚﹀瓨鍦ㄤ换鍔�
- if (await HasTask(palletCode))
- {
- return content.Error("褰撳墠鎵樼洏瀛樺湪浠诲姟");
- }
+ //if (await HasTask(palletCode))
+ //{
+ // return content.Error("褰撳墠鎵樼洏瀛樺湪浠诲姟");
+ //}
//PVI = "J26000456TF12"; // 妯℃嫙PVI璇锋眰浠诲姟
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 49d7a14..7c08374 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -4,7 +4,6 @@
using Newtonsoft.Json;
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
-using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
@@ -19,12 +18,9 @@
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
-using WIDESEAWCS_QuartzJob.DeviceBase;
-using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
-using WIDESEAWCS_QuartzJob.DTO;
namespace WIDESEAWCS_TaskInfoService
{
@@ -97,6 +93,7 @@
task.CarType = item.CarType;
task.PVI = item.PVI;
task.NextAddress = item.NextAddress;
+ task.RoadwayNo = item.RoadwayNo;
// 鍒ゆ柇浠诲姟绫诲瀷鏄惁涓哄嚭搴撲换鍔�
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
@@ -665,7 +662,7 @@
if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
{
- if(task.NextAddress == task.TargetAddress)
+ if (task.NextAddress == task.TargetAddress)
{
task.ModifyDate = DateTime.Now;
task.Modifier = "System";
@@ -674,11 +671,11 @@
task.TaskState = nextStatus;
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
- //task_Hty.CarType = task.CarType;
+ task_Hty.CarType = task.CarType;
task_Hty.PVI = task.PVI;
+ task_Hty.RoadwayNo = task.RoadwayNo;
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
-
}
else
{
@@ -695,8 +692,6 @@
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄嚭搴撳畬鎴�");
}
-
-
//鏆備笉鑰冭檻澶氫釜鍑哄簱鍙�
}
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
@@ -708,7 +703,6 @@
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈哄叆搴撳畬鎴�");
@@ -716,10 +710,8 @@
else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
{
task.TaskState = (int)TaskStatusGroup.Completed;
-
Dt_Task_Hty task_Hty = _mapper.Map<Dt_Task_Hty>(task);
task_Hty.TaskId = 0;
-
BaseDal.DeleteData(task);
_taskHtyRepository.AddData(task_Hty);
_taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"鍫嗗灈鏈虹Щ搴撳畬鎴�");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index 6486ac6..1452454 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -117,7 +117,21 @@
if (station.stationModel == "1") //鐩撮�氭ā寮�
{
- //todo BDC02杩囩偣 鐒婃秱缁戝畾
+ var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
+ var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
+ var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.HZPassTZ)?.ConfigValue;
+ if (wmsBase == null || requestTask == null)
+ {
+ throw new InvalidOperationException("WMS IP 鏈厤缃�");
+ }
+ var wmsIpAddrss = wmsBase + requestTask;
+
+ var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletcode, Roadways = station.Roadway, area = station.stationArea, Position = station.stationChildCode, PVI = pvi }.ToJsonString());
+ WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
+ if (!content.Status)
+ {
+ throw new Exception(content.Message);
+ }
conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare6, 2, station.stationChildCode);
conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
}
@@ -138,59 +152,14 @@
_taskService.UpdateTaskStatusToNext(task);
}
}
+ //else
+ //{
+ // conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 12, station.stationChildCode);
+ //}
}
}
- //var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
- //var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
- //var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestInboundRoadWayNo)?.ConfigValue;
- //if (wmsBase == null || requestTask == null)
- //{
- // throw new InvalidOperationException("WMS IP 鏈厤缃�");
- //}
- //var wmsIpAddrss = wmsBase + requestTask;
-
- //var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletcode, Roadways = station.Roadway, area = station.stationArea, Position = station.stationChildCode, PVI = pvi }.ToJsonString());
- //WebResponseContent content = JsonConvert.DeserializeObject<WebResponseContent>(result);
- //if (!content.Status)
- //{
- // return;
- //}
-
- ////鐒婃秱鎻愬崌鏈� 鐩撮�氫汉娑傝-2 鍏ュ簱-3
- //conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare6, 3, station.stationChildCode);
- //conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare5, 5, station.stationChildCode);
- //conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
}
- //DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == station.stationChildCode && x.ProtocalDetailValue == request.ToString());
-
- //if (deviceProtocolDetails != null)
- //{
- // MethodInfo? method = GetType().GetMethod(deviceProtocolDetails.ProtocolDetailType);
- // if (method != null)
- // {
- // method.Invoke(this, new object[] { conveyorLine, conveyorLine, station });
- // }
- //}
-
- //ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(station.stationChildCode);
- //command.PVI.Replace("/0", "").Replace("\"\\u0010\\u000f", "");
- //command.CarColor.Replace("/0", "");
- //command.CarType.Replace("/0", "");
- //command.CarCate.Replace("/0", "");
- //command.CatSkyWindow.Replace("/0", "");
-
- //DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == station.stationChildCode && x.ProtocalDetailValue == command.Request.ToString());
-
- ////x.DeviceProParamName == nameof(ConveyorLineTaskCommand.ConveyorLineSingal)
- //if (deviceProtocolDetails != null)
- //{
- // MethodInfo? method = GetType().GetMethod(deviceProtocolDetails.ProtocolDetailType);
- // if (method != null)
- // {
- // method.Invoke(this, new object[] { conveyorLine, command, station });
- // }
- //}
#region 璋冪敤浜嬩欢鎬荤嚎閫氱煡鍓嶇
//var tokenInfos = _cacheService.Get<List<UserInfo>>("Cache_UserToken");
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs"
index 6961bb9..6be3c5a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/ConveyorLineJobTZ/CommonConveyorLineTZJob.cs"
@@ -165,7 +165,7 @@
}
}
- if (station.stationType == 1) //鍏ュ簱鍙�
+ if (station.stationType == 1 ) //鍏ュ簱鍙�
{
var requestInbound = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
if (requestInbound)
@@ -193,7 +193,7 @@
}
}
- if (station.stationType == 3)
+ if (station.stationType == 3) //RB043绮炬帓鐐�
{
var requestFolw = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
if (requestFolw)
@@ -242,11 +242,24 @@
//var pvi = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.PVI, station.stationChildCode);
WebResponseContent response = _taskService.RequestRoadWayTask(palletcode.ToString(), palletcode.ToString(), station).Result;
- if (!response.Status)
+ if (response.Status)
{
+ var task = _taskService.QueryBarCodeConveyorLineTask(palletcode.ToString(), station.stationChildCode);
+ if (task != null)
+ {
+ var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == task.NextAddress);
+ conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare6, Convert.ToInt16(stationInfo.stationTCLocation), station.stationChildCode);
+ Thread.Sleep(200);
+ //conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.Spare5, 3, station.stationChildCode);
+ conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
+ _taskService.UpdateTaskStatusToNext(task);
+ }
}
- conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
+ //else
+ //{
+ // conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
+ //}
}
}
@@ -269,6 +282,35 @@
}
}
+
+ if (station.stationType == 6) //绌烘粦姗囧叆搴撳彛
+ {
+ var requestInbound = conveyorLine.GetValue<ConveyorLineDBName, bool>(ConveyorLineDBName.EntApply, station.stationChildCode);
+ if (requestInbound)
+ {
+ var palletcode = conveyorLine.GetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.SkidNo, station.stationChildCode);
+ //var pvi = conveyorLine.GetValue<ConveyorLineDBName, string>(ConveyorLineDBName.PVI, station.stationChildCode);
+
+ //_taskService.QueryBarCodeConveyorLineTask();
+ var task = _taskService.QueryExecutingTaskByBarcode(palletcode.ToString(), station.stationChildCode);
+ if (task != null)
+ {
+ _taskService.UpdateTaskStatusToNext(task);
+ conveyorLine.SetValue<ConveyorLineDBName, Int16>(ConveyorLineDBName.AllowRelease, 1, station.stationChildCode);
+ }
+ else
+ {
+ continue;
+ //濡傛壘涓嶅埌瀵瑰簲鍏ュ簱浠诲姟锛屽垯鏍规嵁鎵樼洏 PVI鐢宠鍏ュ簱
+ //WebResponseContent response = _taskService.RequestTask(palletcode.ToString(), pvi, station).Result;
+ //if (!response.Status)
+ //{
+ // continue;
+ //}
+ }
+ }
+ }
+
#region 鏍规嵁鍗忚璇诲彇鏂规
//DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == station.stationChildCode && x.ProtocalDetailValue == request.ToString());
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
index 48ff77f..41a4196 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServer/WIDESEAWCS_Tasks/SC/SCJob.cs"
@@ -67,6 +67,7 @@
if (flag && value != null && value is STK commonStackerCrane)
{
List<string> childCodes = commonStackerCrane.DeviceProDTOs.GroupBy(d => d.DeviceChildCode).Select(g => g.Key).ToList();
+ childCodes = new List<string> { "SC01", "SC03", "SC05", "SC07" }; //娴嬭瘯浣跨敤
Parallel.For(0, childCodes.Count, (i, state) =>
{
//ConsoleHelper.WriteColorLine($"銆恵childCodes[i]}銆戞椂闂淬�恵DateTime.Now}銆戙�戙�恵Thread.CurrentThread.ManagedThreadId}銆�", ConsoleColor.Magenta);
@@ -135,7 +136,7 @@
Thread.Sleep(500);
WebResponseContent responseContent = SendStackerTask(commonStackerCrane, task, childCodes[i]);
- if(responseContent.Status)
+ if (responseContent.Status)
{
_taskService.UpdateTaskStatusToNext(task.TaskNum);
}
@@ -253,7 +254,7 @@
{
//return task;
- var stationList = _stationManagerRepository.QueryData(x => x.stationType == 2 && x.Roadway == task.Roadway);
+ //var stationList = _stationManagerRepository.QueryData(x => x.stationType == 2 && x.Roadway == task.Roadway);
//foreach (var item in stationList)
//{
@@ -377,7 +378,7 @@
{
return responseContent.Error(ex.Message);
}
-
+
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/api/buttons.js" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/api/buttons.js"
index b50dc23..a995471 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/api/buttons.js"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/api/buttons.js"
@@ -206,7 +206,7 @@
}
}
, {
- name: '搴撳瓨閿佸畾',
+ name: '閿佸畾',
// icon: 'el-icon-printer',
type: 'primary',
// plain: true,
@@ -217,7 +217,7 @@
}
}
, {
- name: '搴撳瓨瑙ｉ攣',
+ name: '瑙ｉ攣',
// icon: 'el-icon-printer',
type: 'primary',
// plain: true,
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
index 791132c..476bde6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/extension/widesea_wms/taskinfo/Dt_Task.jsx"
@@ -47,28 +47,28 @@
}
}
- let confirmTask=this.buttons.find(x=>x.value=='confirmTask');
- if(confirmTask){
- confirmTask.onClick=function(){
- let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
- if (row <= 0) {
- //濡傛灉娌℃湁閫変腑琛�
- this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
- return
- }
- let taskNum = row[0].taskNum
- this.http.get(`/api/Task/confirmTask?taskNum=${taskNum}`, {}, "姝ｅ湪纭瀹屾垚浠诲姟").then((res) => {
- //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
- if (res.status) {
- this.$Message.success('纭浠诲姟瀹屾垚');
- this.refresh();
- } else {
- this.$Message.error(res.message) //閿欒鎻愮ず
- this.refresh();
- }
- })
- }
- }
+ // let confirmTask=this.buttons.find(x=>x.value=='confirmTask');
+ // if(confirmTask){
+ // confirmTask.onClick=function(){
+ // let row = this.$refs.table.getSelected() //鑾峰彇閫変腑鐨勮
+ // if (row <= 0) {
+ // //濡傛灉娌℃湁閫変腑琛�
+ // this.$Message.error('璇烽�夋嫨涓�琛屾暟鎹�')
+ // return
+ // }
+ // let taskNum = row[0].taskNum
+ // this.http.get(`/api/Task/confirmTask?taskNum=${taskNum}`, {}, "姝ｅ湪纭瀹屾垚浠诲姟").then((res) => {
+ // //绀轰緥锛氳皟鐢ㄥ悗鍙版帴鍙�
+ // if (res.status) {
+ // this.$Message.success('纭浠诲姟瀹屾垚');
+ // this.refresh();
+ // } else {
+ // this.$Message.error(res.message) //閿欒鎻愮ず
+ // this.refresh();
+ // }
+ // })
+ // }
+ // }
//绀轰緥锛氬湪鎸夐挳鐨勬渶鍓嶉潰娣诲姞涓�涓寜閽�
// this.buttons.unshift({
// //涔熷彲浠ョ敤push鎴栬�卻plice鏂规硶鏉ヤ慨鏀筨uttons鏁扮粍
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
index c06038f..1880ea0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSClient/src/views/widesea_wms/taskinfo/Dt_Task.vue"
@@ -57,7 +57,7 @@
{ field: 'roadway', title: '宸烽亾', type: 'string', width: 110, align: 'left' },
{ field: 'taskType', title: '浠诲姟绫诲瀷', type: 'int', width: 110, align: 'left', bind: { key: "TaskType", data: [] } },
{ field: 'taskState', title: '浠诲姟鐘舵��', type: 'int', width: 150, align: 'left', bind: { key: "TaskStatus", data: [] } },
- { field: 'carType', title: '杞﹀瀷', type: 'int', width: 150, align: 'left'},
+ { field: 'carType', title: '杞﹁韩绫诲瀷', type: 'int', width: 150, align: 'left'},
{ field: 'sourceAddress', title: '璧峰浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'targetAddress', title: '鐩爣浣嶇疆', type: 'string', width: 110, align: 'left' },
{ field: 'grade', title: '浼樺厛绾�', type: 'int', width: 60, align: 'left' },
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs"
index 058e70f..cafd6b6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_DTO/WMS/WMSTaskDTO.cs"
@@ -25,7 +25,7 @@
public string PalletCode { get; set; }
/// <summary>
- /// 宸烽亾鍙�
+ /// 宸烽亾鏈�
/// </summary>
public string RoadWay { get; set; }
@@ -54,9 +54,24 @@
/// </summary>
public int Grade { get; set; }
+ /// <summary>
+ /// PVI鐮�
+ /// </summary>
public string pvi { get; set; }
+ /// <summary>
+ /// 杞﹁韩绫诲瀷
+ /// </summary>
public int CarType { get; set; }
+
+ /// <summary>
+ /// 宸烽亾鍙�
+ /// </summary>
+ public string RoadwayNo { get; set; }
+
+ /// <summary>
+ /// (涓嬩竴浣嶇疆)鍏ュ簱鍙�
+ /// </summary>
public string NextAddress { get; set; }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
index 45fd146..ea09108 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_IStoragIntegrationServices/WCS/IWCSService.cs"
@@ -18,11 +18,18 @@
WebResponseContent RequstCarBodyInfo(RequestTaskDto json);
/// <summary>
- /// 娑傛�绘彁鍗囨満鍏ュ簱璇锋眰
+ /// 鐒婃秱/娑傛�绘彁鍗囨満鍏ュ簱璇锋眰
/// </summary>
/// <param name="json"></param>
/// <returns></returns>
WebResponseContent RequestInboundRoadWayNo(RequestTaskDto json);
+
+ /// <summary>
+ /// 绌烘粦姗囧叆搴�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ WebResponseContent RequestEmptyInboundRoadWayNo(RequestTaskDto json);
/// <summary>
/// 娑傝鐩撮�氭�昏
@@ -32,6 +39,13 @@
WebResponseContent TZPassZZ(RequestTaskDto json);
/// <summary>
+ /// 鐒婅瑁呯洿閫氭秱瑁�
+ /// </summary>
+ /// <param name="json"></param>
+ /// <returns></returns>
+ WebResponseContent HZPassTZ(RequestTaskDto json);
+
+ /// <summary>
/// 娑傛�荤簿鎺掔偣
/// </summary>
/// <param name="json"></param>
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
index 63ee0aa..df7d799 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Basic/Dt_Task.cs"
@@ -53,6 +53,13 @@
public string? Roadway { get; set; }
/// <summary>
+ /// 澶� 娉�:宸烽亾鍙�
+ /// 榛樿鍊�:
+ ///</summary>
+ [SugarColumn(ColumnName = "RoadwayNo", ColumnDescription = "宸烽亾鍙�")]
+ public string RoadwayNo { get; set; }
+
+ /// <summary>
/// 澶� 娉�:浠诲姟绫诲瀷锛�100 鍑哄簱;鐩樼偣鍑哄簱 101; 102 鍒嗘嫞鍑哄簱;103 璐ㄦ鍑哄簱;200 鍏ュ簱;鐩樼偣鍏ュ簱 201;鍒嗘嫞鍏ュ簱 202;璐ㄦ鍏ュ簱 203;绉诲簱 300;搴撳唴绉诲簱 301;搴撳绉诲簱 302 锛�
/// 榛樿鍊�:
///</summary>
@@ -124,7 +131,7 @@
public string? ErrorMessage { get; set; }
/// <summary>
- /// 杞﹀瀷
+ /// 杞﹁韩绫诲瀷 1-鐧� 2-褰� 3-绌烘挰缁�
///</summary>
[SugarColumn(ColumnName = "CarType", ColumnDescription = "杞﹀瀷")]
public int CarType { get; set; }
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicInfo/Dt_RoadWay.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicInfo/Dt_RoadWay.cs"
index c6c20bc..2a37691 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicInfo/Dt_RoadWay.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicInfo/Dt_RoadWay.cs"
@@ -63,6 +63,5 @@
[ExporterHeader(DisplayName = "澶囨敞")]
[SugarColumn(IsNullable = false, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
-
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Stock/VV_StockInfo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Stock/VV_StockInfo.cs"
index 0e195ff..d3237ce 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Stock/VV_StockInfo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/BasicModel/Stock/VV_StockInfo.cs"
@@ -43,6 +43,7 @@
[ExporterHeader(DisplayName = "杞﹁韩ID")]
[SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "杞﹁韩ID")]
public int carBodyID { get; set; }
+
/// <summary>
/// PVI鐮�
/// </summary>
@@ -52,6 +53,14 @@
public string PVI { get; set; }
/// <summary>
+ /// RFID
+ /// </summary>
+ [ImporterHeader(Name = "RFID")]
+ [ExporterHeader(DisplayName = "RFID")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "RFID")]
+ public string RFID { get; set; }
+
+ /// <summary>
/// 婊戞﹪鍙�
/// </summary>
[ImporterHeader(Name = "婊戞﹪鍙�")]
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBodyInfo_hty.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBodyInfo_hty.cs"
index 9b8f0c9..cc88f4a 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBodyInfo_hty.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_Model/Models/Inbound/Dt_CarBodyInfo_hty.cs"
@@ -167,5 +167,11 @@
/// </summary>
[SugarColumn(IsNullable = true, ColumnDescription = "瀹屾垚鏂瑰紡")]
public int FinishType { get; set; }
+
+ /// <summary>
+ /// 婧怚D
+ /// </summary>
+ [SugarColumn(IsNullable = true, ColumnDescription = "瀹屾垚鏂瑰紡")]
+ public int sourceID { get; set; }
}
}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
index f116670..bd9320c 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/PassPoint.cs"
@@ -64,7 +64,7 @@
}
LogFactory.GetLog("杞﹁韩杩囩偣").Info(true, $"\r\r--------------------------------------");
- LogFactory.GetLog("杞﹁韩杩囩偣").Info(true, $"宸ヤ綅鍙�:{json.Position},RFID:{json.PVI},鍝嶅簲淇℃伅:{responseContent.ToJson}");
+ LogFactory.GetLog("杞﹁韩杩囩偣").Info(true, $"宸ヤ綅鍙�:{json.Position},RFID:{json.PVI},鍝嶅簲淇℃伅:{MESrespon}");
return content.OK();
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
index 9d9d021..0aef302 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/bindWorkOrder.cs"
@@ -41,7 +41,7 @@
var carBodyInfo = _carBodyRepository.QueryFirst(x => x.RFID == rfid);
- //if (carBodyInfo == null) throw new Exception($"鏈壘鍒癙VI{rfid}鐨勮溅韬暟鎹�");
+ if (carBodyInfo == null) throw new Exception($"鏈壘鍒癙VI{rfid}鐨勮溅韬暟鎹�");
BindWorkOrder bindOrder = new BindWorkOrder()
{
@@ -67,7 +67,7 @@
BindWorkOrderRespon characterRespon = JsonConvert.DeserializeObject<BindWorkOrderRespon>(webResponse.Data.ToJson());
_unitOfWorkManage.BeginTran();
- if (stationInfo.stationChildCode == "EL01RB") //娑傝绮炬帓鐐�
+ if (stationInfo.stationChildCode == "EL01RB") //鐒婅-娑傝鎻愬崌鏈�
{
var paintingOrderInfo = _paintingOrderInfoRepository.QueryFirst(x => x.workOrderNo == characterRespon.workOrderNo);
@@ -79,7 +79,7 @@
carBodyInfo.carBodyCharacteristic = paintingOrderInfo.carBodyCharacteristic;
_carBodyRepository.UpdateData(carBodyInfo);
}
- else if (stationInfo.stationChildCode == "EL01RB01") //鎬昏绮炬帓鐐�
+ else if (stationInfo.stationChildCode == "EL01RB01") //娑傝绮炬帓鐐�
{
var assemblyOrderInfo = _assemblyOrderInfoRepository.QueryFirst(x => x.workOrderNo == characterRespon.workOrderNo);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
index 2a955db..32c0367 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/issuedCharacter.cs"
@@ -53,6 +53,8 @@
IssuedCharacterRespon characterRespon = JsonConvert.DeserializeObject<IssuedCharacterRespon>(webResponse.Data.ToJson());
+ //_carBodyRepository.QueryFirst(x => x.PalletCode == palletCode);
+
Dt_CarBodyInfo CarBody = new Dt_CarBodyInfo()
{
biwInPassTime = Convert.ToDateTime(characterRespon.biwInPassTime),
@@ -75,7 +77,6 @@
LogFactory.GetLog("璇锋眰鐒婅鐗瑰緛淇℃伅").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("璇锋眰鐒婅鐗瑰緛淇℃伅").Info(true, $"宸ヤ綅鍙�:{stationNo},RFID:{rfidPrint},鍝嶅簲淇℃伅:{webResponse.ToJson()}");
-
return content.OK("鑾峰彇鐒婅鐧借溅韬俊鎭垚鍔�");
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/lock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/lock.cs"
index 5ffc548..8f84a7b 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/lock.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/lock.cs"
@@ -27,7 +27,7 @@
WebResponseContent content = new WebResponseContent();
try
{
-
+
LogFactory.GetLog("閿佽溅涓婃姤").Info(true, $"\r\r--------------------------------------");
LogFactory.GetLog("閿佽溅涓婃姤").Info(true, jsondata.ToJsonString());
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
index 3ae3103..321f303 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/MES/Partial/pullLock.cs"
@@ -46,7 +46,7 @@
{
// carinfo = _palletStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial);
//carbodyinfo = _carBodyRepository.QueryFirst(x => x.pbMaterial == item.pbMaterial && x.PVI == item.pvi);
- OutStock = _VVStockInfoRepository.QueryFirst(x => x.PVI == item.pvi && x.pbMaterial == item.pbMaterial && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0);
+ OutStock = _VVStockInfoRepository.QueryFirst(x => x.PVI == item.pvi /*&& x.pbMaterial == item.pbMaterial*/ && x.StockStatus == 0 && x.LockOrder == 0 && x.StayStatus == 0);
if (OutStock == null)
{
throw new Exception($"鏈壘鍒版寚瀹歅VI杞﹁韩淇℃伅{item.pvi}");
@@ -131,12 +131,15 @@
//{
stockInfo.StockStatus = 0;
stockInfo.LockOrder = 1;
- carBody.BodyStatus = 1;
+ //carBody.BodyStatus = 1;
+ assemblyOrderInfo.pvi = carBody.PVI;
+ carBody.assemblyWorrkNo = item.workOrderNo;
_MESLockInfoRepository.AddData(mESLockInfo);
+ _assemblyOrderInfoRepository.UpdateData(assemblyOrderInfo);
//_taskRepository.AddData(task);
_palletStockInfoRepository.UpdateData(stockInfo);
- //_carBodyRepository.UpdateData(carbodyinfo);
+ _carBodyRepository.UpdateData(carBody);
_unitOfWorkManage.CommitTran();
//}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/HZPassTZ.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/HZPassTZ.cs"
index 8f707ed..e99e746 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/HZPassTZ.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/HZPassTZ.cs"
@@ -21,7 +21,7 @@
//if (carInfo != null) throw new Exception($"娑傝鐩撮�氭�昏澶辫触:PVI{json.Rfid}宸插瓨鍦ㄣ��");
var station = _stationManagerRepository.QueryFirst(x => x.stationChildCode == json.Position);
- if (station == null) throw new Exception("绔欏彴鏈壘鍒�");
+ if (station == null) throw new Exception($"{json.Position}宸ヤ綅绔欏彴鏈壘鍒�");
WebResponseContent webResponse = _mesService.bindWorkOrder(json.Position, json.PVI);
if (!webResponse.Status) throw new Exception($"鐒婃秱缁戝畾澶辫触锛歿webResponse.msg}");
@@ -34,7 +34,8 @@
}
catch (Exception ex)
{
- content.Error(ex.Message);
+ throw new Exception($"鐒婅鎻愬崌鏈哄紓甯�:{ex.Message}");
+ //content.Error(ex.Message);
}
return content;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestEmptyInboundRoadWayNo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestEmptyInboundRoadWayNo.cs"
index cbca152..261c5bf 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestEmptyInboundRoadWayNo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestEmptyInboundRoadWayNo.cs"
@@ -11,6 +11,7 @@
using WIDESEA_DTO;
using WIDESEA_Model.Models;
using WIDESEA_Repository;
+using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_Model.Models;
@@ -28,18 +29,30 @@
WebResponseContent response = new WebResponseContent();
try
{
+
+ //濡備换鍔″凡瀛樺湪鍒� 杩斿洖姝や换鍔�
+ var checkTask = _taskRepository.QueryFirst(x => x.PalletCode == json.PalletCode && x.PVI == json.PVI);
+ if (checkTask != null)
+ {
+ return response.OK("鐢宠鍏ュ簱鎴愬姛", data: checkTask);
+ }
+
var carInfo = _carBodyInfoRepository.QueryFirst(x => x.RFID == json.PVI && x.PalletCode == json.PalletCode);
- if (carInfo == null) throw new Exception("鏈煡绌烘挰淇℃伅,鏃犳硶鍏ュ簱");
- //{
- // Dt_CarBodyInfo _CarBodyInfo = new Dt_CarBodyInfo //娴嬭瘯
- // {
- // PVI = "J25000660",
- // RFID = json.PVI,
- // BodyStatus = 0,
- // CarType = 1,
- // };
- //}
+ if (carInfo == null)
+ {
+ Dt_CarBodyInfo dt_CarBodyInfo = new Dt_CarBodyInfo
+ {
+ PalletCode = json.PalletCode,
+ CarType = 3,
+ PVI = json.PalletCode,
+ RFID = json.PalletCode,
+ BodyStatus = 0
+ };
+ _carBodyInfoRepository.AddData(dt_CarBodyInfo);
+
+ carInfo = _carBodyInfoRepository.QueryFirst(x => x.RFID == json.PVI && x.PalletCode == json.PalletCode);
+ }
var maxGroup = _locationRepository.QueryData(x => x.LocationType == 3 && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == (int)EnableEnum.Enable)
.GroupBy(x => x.RoadwayNo)
@@ -77,13 +90,11 @@
TaskNum = _taskRepository.GetTaskNo().Result,
Creater = "Systeam",
PVI = json.PVI,
-
+ CarType = carInfo.CarType
};
_unitOfWorkManage.BeginTran();
_taskRepository.AddData(newtask);
- //location.LocationStatus = (int)LocationEnum.InStockDisable;
- //_locationRepository.UpdateData(location);
_unitOfWorkManage.CommitTran();
response.OK("绌烘挰鐢宠鍏ュ簱鎴愬姛", data: newtask);
@@ -92,7 +103,7 @@
}
catch (Exception ex)
{
- response.Error($"璇锋眰宸烽亾鍙峰け璐�:{ex.Message}");
+ response.Error($"绌烘挰璇锋眰宸烽亾鍙峰け璐�:{ex.Message}");
}
return response;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
index 9172a7c..68967e2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/RequestInboundRoadWayNo.cs"
@@ -28,6 +28,13 @@
WebResponseContent response = new WebResponseContent();
try
{
+ //濡備换鍔″凡瀛樺湪鍒� 杩斿洖姝や换鍔�
+ var checkTask = _taskRepository.QueryFirst(x => x.PalletCode == json.PalletCode && x.PVI == json.PVI);
+ if (checkTask != null)
+ {
+ return response.OK("鐢宠鍏ュ簱鎴愬姛", data: checkTask);
+ }
+
//灞忚斀MES
if (json.Position == "EL01RB")
{
@@ -63,15 +70,19 @@
roadWays = _roadWayRepository.QueryData(x => x.WirteCar == 2);
}
+ //var locations = _locationRepository.QueryData(x => (x.LocationType == carInfo.CarType || x.LocationType == 3) && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == (int)EnableEnum.Enable);
+
var maxGroup = _locationRepository.QueryData(x => (x.LocationType == carInfo.CarType || x.LocationType == 3) && x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == (int)EnableEnum.Enable)
.GroupBy(x => x.RoadwayNo)
.OrderByDescending(g => g.Count()) // 鏍规嵁姣忎釜缁勭殑鍏冪礌鏁伴噺鎺掑簭
.ToList(); // 鍙栧嚭鏁伴噺鏈�澶氱殑缁�
+ if (maxGroup.Count == 0) return response.Error(12, "鏃犲彲鐢ㄥ簱浣�");
+
Dictionary<string, int> result = new Dictionary<string, int>();
foreach (var item in maxGroup)
{
- var number = _taskRepository.QueryData(x => x.TargetAddress == item.Key).Count();
+ var number = _taskRepository.QueryData(x => x.RoadwayNo == item.Key && x.CarType == carInfo.CarType && (x.TaskType == (int)TaskInboundTypeEnum.Inbound || x.TaskType == (int)TaskInboundTypeEnum.InTray)).Count();
if (item.Count() - number <= 0)
{
continue;
@@ -87,7 +98,7 @@
if (stationList.Count > 1)
{
- var task = _taskRepository.QueryData(x => x.Roadway == stationList.FirstOrDefault().Roadway).OrderByDescending(x => x.CreateDate).FirstOrDefault();
+ var task = _taskRepository.QueryData(x => x.Roadway == stationList.FirstOrDefault().Roadway && x.TaskType == (int)TaskInboundTypeEnum.Inbound).OrderByDescending(x => x.CreateDate).FirstOrDefault();
if (task != null) station = stationList.Where(x => x.stationChildCode != task.NextAddress && x.stationChildCode != task.CurrentAddress).FirstOrDefault();
else station = stationList.FirstOrDefault();
}
@@ -118,7 +129,8 @@
TaskNum = _taskRepository.GetTaskNo().Result,
Creater = "Systeam",
PVI = json.PVI,
- CarType = carInfo.CarType
+ CarType = carInfo.CarType,
+ RoadwayNo = station.RoadwayNo
};
_unitOfWorkManage.BeginTran();
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/TZPassZZ.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/TZPassZZ.cs"
index 4b9d3f5..d8f6922 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/TZPassZZ.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StoragIntegrationServices/WCS/Partial/TZPassZZ.cs"
@@ -49,7 +49,8 @@
}
catch (Exception ex)
{
- content.Error(ex.Message);
+ throw new Exception($"娑傝鎻愬崌鏈哄紓甯�:{ex.Message}");
+ //content.Error(ex.Message);
}
return content;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
index 7d41a5a..9c73e07 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/BackgroundJob.cs"
@@ -8,6 +8,7 @@
using System.Text;
using System.Threading.Tasks;
using WIDESEA_Core.Const;
+using WIDESEA_DTO;
using WIDESEA_DTO.WMS;
using WIDESEA_IServices;
using WIDESEAWCS_BasicInfoRepository;
@@ -125,6 +126,7 @@
CreateDate = DateTime.Now,
TaskId = 0,
CarType = stock.CarType,
+ RoadwayNo = stock.RoadwayNo,
};
// 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/QuartzJobMildd.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/QuartzJobMildd.cs"
index 7e186dd..0f3e296 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/QuartzJobMildd.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/QuartzJobMildd.cs"
@@ -41,7 +41,7 @@
AssemblyName = "WIDESEA_StorageTaskServices",
ClassName = "WhiteCarAutoOutJob",
CreateTime = DateTime.Now,
- IntervalSecond = 15,
+ IntervalSecond = 60,
IsDeleted = false,
IsStart = false,
JobGroup = "AutoTask",
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
index 077d7d1..830bd19 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/AutoTask/WhiteCarAutoOutJob.cs"
@@ -109,6 +109,7 @@
CreateDate = DateTime.Now,
TaskId = 0,
CarType = stock.CarType,
+ RoadwayNo = stock.RoadwayNo
};
// 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
index 13f72e2..637e876 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs"
@@ -39,6 +39,7 @@
private readonly IDt_BDCConfigurationService _bdcConfigurationService;
private readonly IDt_RoadWayRepository _roadWayRepository;
private readonly IDt_RoadWayInfoRepository _roadWayInfoRepository;
+ private readonly IDt_CarBodyInfo_htyRepository _carBodyInfo_HtyRepository;
public Dt_TaskService(IDt_TaskRepository BaseDal,
IUnitOfWorkManage unitOfWorkManage,
@@ -48,7 +49,7 @@
ITaskExecuteDetailRepository taskExecuteDetailRepository,
ILocationStatusChangeRecordRepository locationStatusChangeRecordRepository,
IDt_StationManagerRepository stationManagerRepository,
- ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository, IDt_PalletStockInfo_htyRepository palletStockInfo_HtyRepository, IDt_CarBodyInfoRepository carBodyRepository, IDt_BDCConfigurationRepository bdcConfigurationRepository, IDt_BDCConfigurationService bDCConfigurationService, IDt_RoadWayRepository roadWayRepository, IDt_RoadWayInfoRepository roadWayInfoRepository) : base(BaseDal)
+ ISys_ConfigService configService, IDt_PalletStockInfoRepository palletStockInfoRepository, IDt_PalletStockInfo_htyRepository palletStockInfo_HtyRepository, IDt_CarBodyInfoRepository carBodyRepository, IDt_BDCConfigurationRepository bdcConfigurationRepository, IDt_BDCConfigurationService bDCConfigurationService, IDt_RoadWayRepository roadWayRepository, IDt_RoadWayInfoRepository roadWayInfoRepository, IDt_CarBodyInfo_htyRepository carBodyInfo_HtyRepository) : base(BaseDal)
{
_unitOfWorkManage = unitOfWorkManage;
@@ -66,6 +67,7 @@
_bdcConfigurationService = bDCConfigurationService;
_roadWayRepository = roadWayRepository;
_roadWayInfoRepository = roadWayInfoRepository;
+ _carBodyInfo_HtyRepository = carBodyInfo_HtyRepository;
}
#region 澶栭儴鎺ュ彛鏂规硶
@@ -157,25 +159,26 @@
stockInfo_Hty.FinishTime = DateTime.Now;
stockInfo_Hty.OperateType = (int)OperateTypeEnum.鑷姩瀹屾垚;
- var boxinfo = _carBodyRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
-
+ var carInfo = _carBodyRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
+ carInfo.BodyStatus = 2;
// 浜嬪姟澶勭悊
await _unitOfWorkManage.UseTranAsync(async () =>
{
var isLocationUpdate = await _locationRepository.UpdateDataAsync(loc); //鏇存柊搴撲綅
var isPalletHty = await _palletStockInfo_HtyRepository.AddDataAsync(stockInfo_Hty); //娣诲姞鍘嗗彶搴撳瓨璁板綍
var isTaskUpdated = await BaseDal.DeleteDataByIdAsync(task.TaskId); //鍒犻櫎浠诲姟
- //await BaseDal.UpdateDataAsync(task); //鍙栨秷鍒犻櫎浠诲姟锛屾敼涓哄畬鎴愮姸鎬侊紱骞禬MS鐣岄潰鐢变汉宸ョ‘璁ゅ畬鎴�
var isTaskAdd = await _task_HtyRepository.AddDataAsync(taskHty) > 0; //鍔犲叆鍘嗗彶浠诲姟
var isDelete = await _palletStockInfoRepository.DeleteDataAsync(stock); //鍒犻櫎搴撳瓨
- //await DeleteStockInfoDetailsAsync(stock.StockInfoDetails); //鍒犻櫎搴撳瓨鏄庣粏
- //if (boxinfo != null)
- //{
- // var isDeleteBoxing = await _boxingInfoRepository.Db.DeleteNav<DtBoxingInfo>(x => x.Id == boxinfo.Id)
- // .Include(x => x.BoxingInfoDetails)
- // .ExecuteCommandAsync(); //鍒犻櫎缁勭洏
- //}
-
+ if (task.CarType != 2)//闈炲僵杞﹁韩鍑哄簱鍚� 娓呴櫎缁勭洏鏁版嵁
+ {
+ //鍒犻櫎缁勭洏
+ Dt_CarBodyInfo_hty carInfo_Hty = carInfo.Adapt<Dt_CarBodyInfo_hty>();
+ carInfo_Hty.FinishTime = DateTime.Now;
+ carInfo_Hty.FinishType = (int)OperateTypeEnum.鑷姩瀹屾垚;
+ carInfo_Hty.sourceID = carInfo.Id;
+ await _carBodyInfo_HtyRepository.AddDataAsync(carInfo_Hty);
+ await _carBodyRepository.DeleteDataAsync(carInfo);
+ }
});
return content.OK("浠诲姟瀹屾垚鎴愬姛", task.Remark);
@@ -241,6 +244,7 @@
return await CompleteInboundTaskAsync(task);
case (int)TaskOutboundTypeEnum.Outbound:
+ case (int)TaskOutboundTypeEnum.OutTray:
LogFactory.GetLog("浠诲姟瀹屾垚").InfoFormat(true, "鍑哄簱浠诲姟", "");
return await CompleteStackTaskAsync(task);
default:
@@ -335,7 +339,7 @@
try
{
string palletCode = saveModel.MainData["palletCode"].ToString();
- string station = saveModel.MainData["station"].ToString();
+ //string station = saveModel.MainData["station"].ToString();
var barcode = JsonConvert.DeserializeObject<List<string>>(saveModel.MainData["palletCode"].ToString());
@@ -351,7 +355,7 @@
return content.Error("鏈煡璇㈠埌瀵瑰簲鐨勫簱瀛樹俊鎭�");
}
- if (stockInfo.StockStatus != 0) return content.Error($"鎸囧畾澶辫触锛氭墭鐩榹item}褰撳墠鐘舵�佷笉鍏佽鎸囧畾鍑哄簱");
+ if (stockInfo.StockStatus != 0) return content.Error($"鎸囧畾澶辫触锛氬簱瀛樻粦姗噞item}宸查攣瀹氫笉鍏佽鎸囧畾鍑哄簱");
stockInfo.StockStatus = 1;
@@ -399,19 +403,17 @@
//}
//var stationInfo = stationInfos.FirstOrDefault();
-
-
// 鍒涘缓骞舵坊鍔犱换鍔″埌鏁版嵁搴�
task = new Dt_Task
{
Grade = 1,
Roadway = Outstation.Roadway,
- TargetAddress = "RB043",
+ TargetAddress = carBody.CarType == 2 ? "RB043" : Outstation.stationChildCode,
Dispatchertime = DateTime.Now,
NextAddress = Outstation.stationChildCode,
OrderNo = null,
PalletCode = carBody.PalletCode,
- PVI = carBody.PVI,
+ PVI = carBody.RFID,
SourceAddress = stockInfo.LocationCode,
CurrentAddress = stockInfo.LocationCode,
TaskState = (int)TaskOutStatusEnum.OutNew,
@@ -420,6 +422,8 @@
Creater = "System",
CreateDate = DateTime.Now,
TaskId = 0,
+ CarType = carBody.CarType,
+ RoadwayNo = stockInfo.RoadwayNo
};
// 鍒涘缓浠诲姟浼犺緭鐢ㄧ殑DTO瀵硅薄
@@ -431,7 +435,6 @@
{
throw new InvalidOperationException("WMS IP 鏈厤缃�");
}
-
var tasks = new List<WMSTaskDTO>() { taskDTO };
// 鍙戦�佷换鍔¤姹傚埌WMS
@@ -463,7 +466,6 @@
}
#endregion 鎸囧畾浠诲姟鍑哄簱
-
/// <summary>
/// 鍒涘缓浠诲姟DTO
/// </summary>
@@ -481,7 +483,8 @@
Id = 0,
TaskType = task.TaskType,
pvi = task.PVI,
- NextAddress = task.NextAddress
+ NextAddress = task.NextAddress,
+ CarType = task.CarType
};
}
@@ -787,8 +790,7 @@
{
// 鍒涘缓WebResponseContent瀵硅薄
var content = new WebResponseContent();
-
- var carInfo = _carBodyRepository.QueryFirst(x => x.PalletCode == task.PalletCode );
+ var carInfo = _carBodyRepository.QueryFirst(x => x.PalletCode == task.PalletCode);
var stationInfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);
// 鑾峰彇搴撲綅;
var location = RequestLocation(stationInfo.RoadwayNo, carInfo.CarType);
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
index bcd6cc6..2c47791 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs"
@@ -157,17 +157,16 @@
DtLocationInfo locationinfo = new DtLocationInfo();
if (carType == 1 || carType == 3)
{
- locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Column).ThenBy(x => x.Layer).ThenBy(x => x.Row).FirstOrDefault();
}
else if (carType == 2)
{
- locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Layer).ThenByDescending(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
+ locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderByDescending(x => x.Column).ThenBy(x => x.Layer).ThenBy(x => x.Row).FirstOrDefault();
}
//else if (carType == 3)
//{
// locationinfo = dtLocationInfos.Where(x => x.LocationStatus == (int)LocationEnum.Free && x.EnalbeStatus == 1).OrderBy(x => x.Column).ThenBy(x => x.Row).ThenBy(x => x.Layer).FirstOrDefault();
//}
-
return locationinfo;
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer.sln" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer.sln"
index bb25daf..aad0632 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer.sln"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer.sln"
@@ -74,9 +74,9 @@
.editorconfig = .editorconfig
EndProjectSection
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -465,6 +465,7 @@
{986CA639-B3B4-4D4F-B12B-3D8FBA48B2B1} = {A73C1AFF-FF92-4825-B607-2E908077EBA4}
{4BDE58B2-5B2E-480B-932F-D63C2A7D557C} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
{9912BD12-4CF7-4A91-8203-47C9C125004C} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
+ {9BA96018-EF8A-4D84-8E72-DA697FA5EAF8} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
{55326F38-372A-4606-B7FB-8C01BBAEC4FC} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
{94D572FA-810E-4897-B673-AF988FD4019E} = {A73C1AFF-FF92-4825-B607-2E908077EBA4}
EndGlobalSection
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
index 427ab70..73987a0 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WMSServer/WIDESEA_WMSServer/Controllers/WCS/WCSController.cs"
@@ -43,6 +43,17 @@
}
/// <summary>
+ /// 璇锋眰鍏ュ簱宸烽亾
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("RequestEmptyInboundRoadWayNo"), AllowAnonymous]
+ public WebResponseContent RequestEmptyInboundRoadWayNo([FromBody] RequestTaskDto input)
+ {
+ return _WCSService.RequestEmptyInboundRoadWayNo(input);
+ }
+
+ /// <summary>
/// 娑傝鐩撮�氭�昏(涓存椂鏂规)
/// </summary>
/// <param name="input"></param>
@@ -54,6 +65,17 @@
}
/// <summary>
+ /// 鐒婅鐩撮�氭秱瑁�(涓存椂鏂规)
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost, Route("HZPassTZ"), AllowAnonymous]
+ public WebResponseContent HZPassTZ([FromBody] RequestTaskDto input)
+ {
+ return _WCSService.HZPassTZ(input);
+ }
+
+ /// <summary>
/// 鎬昏绮炬帓鐐�
/// </summary>
/// <param name="input"></param>
--
Gitblit v1.9.3