From 65a231315d1dcc35d2996106d36e9cca9aba6ce6 Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期五, 06 三月 2026 09:06:44 +0800
Subject: [PATCH] 更新码垛分配工位优化，老厂退库称重上报设定差异范围
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob_CP.cs | 224 +++++++++++++++++++++++++++++++------------------------
1 files changed, 125 insertions(+), 99 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
index 2e405db..2fb32e2 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WCSServices/WIDESEAWCS_Tasks/\347\240\201\345\236\233/MDJob_CP.cs"
@@ -15,6 +15,7 @@
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Communicator;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.BaseServices;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_IBasicInfoRepository;
using WIDESEAWCS_IPackInfoRepository;
@@ -27,6 +28,7 @@
using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Repository;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoRepository;
using WIDESEAWCS_Tasks.ConveyorLineJob;
using WIDESEAWCS_Tasks.DBNames;
using ICacheService = WIDESEAWCS_Core.Caches.ICacheService;
@@ -37,26 +39,17 @@
public class MDJob_CP : JobBase, IJob
{
private readonly ICacheService _cacheService;
- private readonly ITaskService _taskService;
- private readonly ITaskExecuteDetailService _taskExecuteDetailService;
- private readonly ITaskRepository _taskRepository;
private readonly IStationMangerRepository _stationMangerRepository;
- private readonly IDt_PackaxisRepository _packaxisRepository;
- private readonly IRouterRepository _routerRepository;
- private readonly IRouterService _routerService;
- private readonly IRouterExtension _routerExtension;
+ private readonly IPackaxisRepository _packaxisRepository;
+ private readonly IPackaxisTaskRepository _packaxisTaskRepository;
+ private readonly IPackaxisTaskService _packaxisTaskService;
+ private readonly IStationPackInfoRepository _stationPackInfoRepository;
private readonly List<Dt_WarehouseDevice> warehouseDevices;
- public MDJob_CP(ICacheService cacheService, ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, ITaskRepository taskRepository, IStationMangerRepository stationMangerRepository, IRouterRepository routerRepository, IRouterService routerService, IRouterExtension routerExtension, IDt_PackaxisRepository packaxisRepository)
+ public MDJob_CP(ICacheService cacheService, IStationMangerRepository stationMangerRepository, IPackaxisRepository packaxisRepository, IPackaxisTaskRepository packaxisTaskRepository,IPackaxisTaskService packaxisTaskService, IStationPackInfoRepository stationPackInfoRepository)
{
_cacheService = cacheService;
- _taskService = taskService;
- _taskExecuteDetailService = taskExecuteDetailService;
- _taskRepository = taskRepository;
_stationMangerRepository = stationMangerRepository;
- _routerRepository = routerRepository;
- _routerService = routerService;
- _routerExtension = routerExtension;
_packaxisRepository = packaxisRepository;
string? warehouseDevicesStr = _cacheService.Get<string>(nameof(Dt_WarehouseDevice));
@@ -68,113 +61,146 @@
{
warehouseDevices = new List<Dt_WarehouseDevice>();
}
+ _packaxisTaskRepository = packaxisTaskRepository;
+ _packaxisTaskService = packaxisTaskService;
+ _stationPackInfoRepository = stationPackInfoRepository;
}
public Task Execute(IJobExecutionContext context)
{
- bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
- if (flag && value != null)
+ try
{
- OtherDevice device = (OtherDevice)value;
- List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StackerCraneCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt() && x.IsOccupied == 0);
- foreach (var item in stationMangers)
+ bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
+ if (flag && value != null)
{
+ OtherDevice device = (OtherDevice)value;
+ List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StackerCraneCode == device.DeviceCode && x.StationType == StationTypeEnum.StationType_InStartAndOutEnd.ObjToInt());
//鑾峰彇鍗忚
- DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StackerCraneCode && x.DeviceProParamType == nameof(R_MDDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
- DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == item.StackerCraneCode && x.DeviceProParamType == nameof(W_MDDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ DeviceProDTO? deviceProRead = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(R_MDDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
+ DeviceProDTO? deviceProWrite = device.DeviceProDTOs.Where(x => x.DeviceChildCode == device.DeviceCode && x.DeviceProParamType == nameof(W_MDDB)).OrderBy(x => x.DeviceProOffset).FirstOrDefault();
if (deviceProRead != null && deviceProWrite != null)
{
- short Allow = device.GetValue<R_MDDB, short>(R_MDDB.R_MDAllow, item.StackerCraneCode);
-
- #region 璇诲彇宸ヤ綅鐘舵��
- short R_MDStatus1 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus1, item.StackerCraneCode);
- short R_MDStatus2 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus2, item.StackerCraneCode);
- short R_MDStatus3 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus3, item.StackerCraneCode);
- short R_MDStatus4 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus4, item.StackerCraneCode);
-
- short ReceiveDoneState = device.GetValue<W_MDDB, short>(W_MDDB.W_MDReceiveDone, item.StackerCraneCode);
- #endregion
- //鐮佸灈鐘舵��
- short PackState = device.GetValue<R_MDDB, short>(GetPackStateEnum(item.StackerCraneStationCode), item.StackerCraneCode);
- //鐮佸灈鏁伴噺
- short PackNum = device.GetValue<R_MDDB, short>(GetPackNumEnum(item.StackerCraneStationCode), item.StackerCraneCode);
- if (R_MDStatus1 == 1 || R_MDStatus2 == 1 || R_MDStatus3 == 1 || R_MDStatus4 == 1)
+ foreach (var item in stationMangers)
{
- Thread.Sleep(200);
- if (ReceiveDoneState!=0)
+ short Allow = device.GetValue<R_MDDB, short>(R_MDDB.R_MDAllow, item.StackerCraneCode);
+ #region 璇诲彇宸ヤ綅鐘舵��
+ short R_MDStatus1 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus1, item.StackerCraneCode);
+ short R_MDStatus2 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus2, item.StackerCraneCode);
+ short R_MDStatus3 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus3, item.StackerCraneCode);
+ short R_MDStatus4 = device.GetValue<R_MDDB, short>(R_MDDB.R_MDStatus4, item.StackerCraneCode);
+ short ReceiveDoneState = device.GetValue<W_MDDB, short>(W_MDDB.W_MDReceiveDone, item.StackerCraneCode);
+ #endregion
+ //鐮佸灈鐘舵��
+ short PackState = device.GetValue<R_MDDB, short>(GetPackStateEnum(item.StackerCraneStationCode), item.StackerCraneCode);
+ short PackSendState = device.GetValue<W_MDDB, short>(GetPackSendEnum(item.StackerCraneStationCode), item.StackerCraneCode);
+ //鐮佸灈鏁伴噺
+ short PackNum = device.GetValue<R_MDDB, short>(GetPackNumEnum(item.StackerCraneStationCode), item.StackerCraneCode);
+ if ((R_MDStatus1 == 1 || R_MDStatus2 == 1 || R_MDStatus3 == 1 || R_MDStatus4 == 1) && Allow == 4)
{
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 0);
- WriteInfo(item.StackerCraneCode, $"{item.StackerCraneCode}娓呴櫎涓嬪彂鏍囪瘑淇″彿");
- }
- continue;
- }
- if (PackState == 2)
- {
- Thread.Sleep(200);
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 0);
- WriteInfo(item.StationName, $"{item.StationName}娓呴櫎宸ヤ綅缁撴墭淇″彿");
- continue;
- }
- var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == Convert.ToInt32(item.StackerCraneStationCode));
- if (axis != null)
- {
- //杩涜缁撴墭
- if (Convert.ToInt32(PackNum) == axis.PackNum)
- {
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
- WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅缁撴墭淇″彿");
+ Thread.Sleep(200);
+ if (ReceiveDoneState != 0)
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 0);
+ WriteInfo(item.StackerCraneCode, $"{item.StackerCraneCode}宸ヤ綅浠诲姟涓嬪彂鏍囪瘑鍊间负锛歿ReceiveDoneState},鏈哄櫒浜鸿鍙栫姸鎬佷负锛歿Allow}锛�1宸ヤ綅{R_MDStatus1}锛�2宸ヤ綅{R_MDStatus2}锛�3宸ヤ綅{R_MDStatus3}锛�4宸ヤ綅{R_MDStatus4}锛岀爜鍨涙竻闄や笅鍙戞爣璇嗕俊鍙�");
+ }
continue;
}
- //鐮佸灈鐢宠
- if (Allow == 3 || Allow == 7)
+ if (PackState == 2 && PackSendState == 2)
{
- //鑾峰彇褰撳墠浠诲姟
- Dt_Task task = _taskRepository.QueryData(x => x.NextAddress == item.StationCode && _taskService.TaskInboundTypes.Contains(x.TaskType) && x.TaskState == TaskStatusEnum.MD_Executing.ObjToInt() && x.DeviceCode == device.DeviceCode).OrderBy(x => x.TaskNum).FirstOrDefault();
-
- if (task != null)
- {
- //鍐欏叆宸ヤ綅鍙�
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSendID.ToString()).DeviceProDataBlock, Convert.ToInt16(item.StackerCraneStationCode));
- //鍐欏叆宸ヤ綅鍏佽鐮佸灈
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 1);
-
- #region 鑾峰彇鍐欏叆鐮佸灈X銆乊銆乑鍧愭爣
- (int, int, int) result = GetAxis(PackNum, axis, item.StackerCraneStationCode);
-
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, result.Item1);
-
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, result.Item2);
-
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDZ.ToString()).DeviceProDataBlock, result.Item3);
- WriteInfo(item.StationName, $"鐮佸灈鏁伴噺銆恵PackNum}銆戯紝涓嬪彂鐮佸灈鍧愭爣X銆乊銆乑銆恵result.Serialize()}銆�");
- #endregion
-
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, 1);
- //鍐欏叆涓嬪彂鏍囪瘑
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 3);
-
- //鏇存柊浠诲姟淇℃伅
- task.TaskState = TaskStatusEnum.Finish.ObjToInt();
- //_taskRepository.UpdateData(task);
- _taskService.TaskCompleted(task.TaskNum);
- Thread.Sleep(1000);
- WriteInfo(item.StationName, $"浠诲姟鍙穥task.TaskNum}鐮佸灈");
- return Task.CompletedTask;
- }
-
+ Thread.Sleep(200);
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 4);
+ WriteInfo(item.StationName, $"{item.StationName}鍐欏叆娓呮墭淇″彿");
+ continue;
}
- }
- else
- {
- WriteError(item.StationName, $"鏈壘鍒拌宸ヤ綅{item.StationName}鐨勫潗鏍囦俊鎭紝璇锋牳瀵规暟鎹�");
+ if (PackState == 4 && PackSendState == 4)
+ {
+ Thread.Sleep(200);
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 0);
+ WriteInfo(item.StationName, $"{item.StationName}娓呮墭淇″彿澶嶄綅");
+ continue;
+ }
+ //鑾峰彇褰撳墠宸ヤ綅鐮佸灈鎵ц涓暟鎹�
+ Dt_StationPackInfo stationPackInfo = _stationPackInfoRepository.QueryFirst(x => x.StationCode == item.StationCode && x.AssignNum > 0);
+ if (stationPackInfo!=null)
+ {
+ var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
+ if (axis != null)
+ {
+ //杩涜缁撴墭
+ if (Convert.ToInt32(PackNum) == axis.PackNum)
+ {
+ WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
+ if (responseContent.Status)
+ {
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
+ WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅缁撴墭淇″彿");
+ }
+ else
+ {
+ WriteError(item.StationName, $"{responseContent.Message}");
+ }
+ continue;
+ }
+ //鐮佸灈鐢宠
+ if (Allow == 3 || Allow == 7)
+ {
+ //鑾峰彇褰撳墠浠诲姟
+ Dt_PackaxisTask packaxisTask = _packaxisTaskRepository.QueryFirst(x => x.NextAddress == item.StationCode && x.DeviceCode == item.StackerCraneCode && x.PackType == stationPackInfo.PackType && x.TaskState == TaskStatusEnum.MD_Executing.ObjToInt());
+ if (packaxisTask != null)
+ {
+ //鍐欏叆宸ヤ綅鍙�
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDSendID.ToString()).DeviceProDataBlock, Convert.ToInt16(item.StackerCraneStationCode));
+ //鍐欏叆宸ヤ綅鍏佽鐮佸灈
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 1);
+
+ #region 鑾峰彇鍐欏叆鐮佸灈X銆乊銆乑鍧愭爣
+ (int, int, int) result = GetAxis(PackNum, axis, item.StackerCraneStationCode);
+
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDX.ToString()).DeviceProDataBlock, result.Item1);
+
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDY.ToString()).DeviceProDataBlock, result.Item2);
+
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDZ.ToString()).DeviceProDataBlock, result.Item3);
+ WriteInfo(item.StationName, $"鐮佸灈鏁伴噺銆恵PackNum}銆戯紝涓嬪彂鐮佸灈鍧愭爣X銆乊銆乑銆恵result.Serialize()}銆�");
+ #endregion
+
+ device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, 1);
+ //鍐欏叆涓嬪彂鏍囪瘑
+ device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 3);
+ packaxisTask.TaskState = TaskStatusEnum.Finish.ObjToInt();
+ _packaxisTaskRepository.UpdateData(packaxisTask);
+ //浠诲姟瀹屾垚
+ WebResponseContent webResponse = _packaxisTaskService.TaskCompleted(packaxisTask: packaxisTask);
+ if (!webResponse.Status)
+ {
+ WriteError(item.StationName, $"浠诲姟鍙穥packaxisTask.PackTaskNum}鐮佸灈瀹屾垚閿欒{webResponse.Message}");
+ }
+ else
+ {
+ WriteInfo(item.StationName, $"浠诲姟鍙穥packaxisTask.PackTaskNum}鐮佸灈瀹屾垚");
+ }
+ Thread.Sleep(800);
+ return Task.CompletedTask;
+ }
+ }
+ }
+ else
+ {
+ WriteError(item.StationName, $"鏈壘鍒拌宸ヤ綅{item.StationName}鐨勫潗鏍囦俊鎭紝璇锋牳瀵规暟鎹�");
+ }
+ }
}
}
else
{
- WriteError(item.StationName, $"鏈壘鍒拌澶囧瓙缂栧彿{item.StationCode}鐨勫崗璁俊鎭�");
+ WriteError(device.DeviceCode, $"鏈壘鍒拌澶噞device.DeviceCode}鐨勫崗璁俊鎭�");
}
}
}
+ catch (Exception ex)
+ {
+ WriteError(nameof(MDJob_CP),ex.Message);
+ }
return Task.CompletedTask;
}
/// <summary>
--
Gitblit v1.9.3