From 733c975cd8647f6d006736f1863bad731e32e6fb Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期日, 26 十月 2025 17:15:52 +0800
Subject: [PATCH] 上传最新代码，ERP接口，MES接口优化，WMS业务优化等
---
项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob_CP.cs | 67 ++++++++++++++++++++-------------
1 files changed, 40 insertions(+), 27 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 7bd3cea..7a01bb0 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"
@@ -77,13 +77,13 @@
if (flag && value != null)
{
OtherDevice device = (OtherDevice)value;
- List<Dt_StationManger> stationMangers = _stationMangerRepository.QueryData(x => x.StackerCraneCode == device.DeviceCode && x.StationType == 33);
+ 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)
{
//鑾峰彇鍗忚
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();
- if (deviceProRead != null && deviceProWrite != null && item.IsOccupied == 0)
+ if (deviceProRead != null && deviceProWrite != null)
{
short Allow = device.GetValue<R_MDDB, short>(R_MDDB.R_MDAllow, item.StackerCraneCode);
@@ -92,70 +92,75 @@
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)
{
- Thread.Sleep(500);
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDReceiveDone.ToString()).DeviceProDataBlock, 0);
+ 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}娓呴櫎涓嬪彂鏍囪瘑淇″彿");
+ }
+ 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}鍐欏叆宸ヤ綅缁撴墭淇″彿");
+ continue;
}
-
- ConsoleHelper.WriteInfoLine($"鐮佸灈宸ヤ綅{item.StationCode}鐘舵�亄Allow}");
+ //鐮佸灈鐢宠
if (Allow == 3 || Allow == 7)
{
//鑾峰彇褰撳墠浠诲姟
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) //鐮佸灈鐢宠
+ if (task != null)
{
- device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 1);
-
+ //鍐欏叆宸ヤ綅鍙�
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);
-
- WriteInfo(item.StationName, $"鐮佸灈鏁伴噺銆恵PackNum}銆戯紝涓嬪彂鐮佸灈鍧愭爣X銆乊銆乑銆恵result.Serialize()}銆�");
-
+
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
- if (device.DeviceCode == "MD8_CP")
- {
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, -1);
- }
- else
- {
- device.Communicator.Write<float>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == W_MDDB.W_MDA.ToString()).DeviceProDataBlock, 1);
- }
-
+ 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);
//鏇存柊浠诲姟淇℃伅
- //_taskService.TaskCompleted(task.TaskNum);
task.TaskState = TaskStatusEnum.Finish.ObjToInt();
//_taskRepository.UpdateData(task);
- Thread.Sleep(1500);
+ //_taskService.TaskCompleted(task.TaskNum);
+ Thread.Sleep(1000);
WriteInfo(item.StationName, $"浠诲姟鍙穥task.TaskNum}鐮佸灈");
+ return Task.CompletedTask;
}
}
@@ -173,7 +178,9 @@
}
return Task.CompletedTask;
}
-
+ /// <summary>
+ /// 鐮佸灈鏁伴噺
+ /// </summary>
public R_MDDB GetPackNumEnum(string StationCode)
{
switch (StationCode)
@@ -190,6 +197,9 @@
throw new Exception("鏈畾涔夊伐浣�");
}
}
+ /// <summary>
+ /// 鐮佸灈鐘舵��
+ /// </summary>
public R_MDDB GetPackStateEnum(string StationCode)
{
switch (StationCode)
@@ -206,6 +216,9 @@
throw new Exception("鏈畾涔夊伐浣�");
}
}
+ /// <summary>
+ /// 鐮佸灈宸ヤ綅
+ /// </summary>
public W_MDDB GetPackSendEnum(string StationCode)
{
switch (StationCode)
--
Gitblit v1.9.3