From 6513c35280f2283ff53b36bdc0c9d83aba475f8d Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期五, 07 三月 2025 19:54:24 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs | 63 +++++++++++++++++--------------
1 files changed, 35 insertions(+), 28 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
index a680bba..38024d6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs"
@@ -85,22 +85,23 @@
try
{
#region 鐢熸垚鍏ュ簱浠诲姟
- if (!OHTJob.oHTReadData.R_GZJ_isWork)
- {
- throw new Exception($"瑙勬暣鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
- }
+ //if (!OHTJob.oHTReadData.R_GZJ_isWork)
+ //{
+ // throw new Exception($"瑙勬暣鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
+ //}
var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
+ //鍏ュ簱
if (Inisout.InOut==1)
{
Dt_Task task = new Dt_Task();
var storagemode = _storagemodeRepository.QueryFirst(v => v.Id == 1);
- if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
{
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
task.SourceAddress = station.Row + "-" + station.Column + "-1";
var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
- if (oldhtytask !=null)
+ if (oldhtytask ==null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
task.Grade = 1;
@@ -126,15 +127,15 @@
_dt_taskRepositiry.AddData(task);
}
}
- if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
{
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
task.SourceAddress = station.Row + "-" + station.Column + "-1";
var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
- if (oldhtytask!=null)
+ if (oldhtytask==null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
- var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ var DKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
string address = DKstation.Row + "-" + DKstation.Column + "-1";
var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
@@ -167,12 +168,12 @@
_dt_taskRepositiry.AddData(task);
}
}
- if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
{
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
task.SourceAddress = station.Row + "-" + station.Column + "-1";
var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
- if (oldhtytask!=null)
+ if (oldhtytask==null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
task.Grade = 1;
@@ -198,15 +199,15 @@
_dt_taskRepositiry.AddData(task);
}
}
- if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
{
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
task.SourceAddress = station.Row + "-" + station.Column + "-1";
var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
- if (true)
+ if (oldhtytask == null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
- var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ var XKstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
string address = XKstation.Row + "-" + XKstation.Column + "-1";
var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == address);
if (oldtask != null && oldtask.TaskState == (int)TaskInStatusEnum.InNew)
@@ -241,6 +242,7 @@
}
}
+ //鐩存帴鍑哄簱
else if(Inisout.InOut == 2)
{
if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
@@ -248,15 +250,22 @@
throw new Exception($"鏁村舰鏈轰笉灞炰簬澶╄溅涓婃枡妯″紡鎴栧ぉ杞︽斁鏉夸俊鍙蜂负false");
}
Dt_Task outtask = new Dt_Task();
- if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready )
+ //灏忚溅涓婃枡
+ if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready )
{
- var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
}
- else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)
+ else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)
{
- var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
+ }
+ //浜哄伐涓婃枡
+ else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
+ {
+ var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
}
else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
@@ -264,13 +273,9 @@
var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
}
- else if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
- {
- var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
- outtask.SourceAddress = Stastation.Row + "-" + Stastation.Column + "-1";
- }
var Endstation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鏁村舰鏈烘斁鏂欎綅");
+ //娣诲姞浠诲姟淇℃伅
outtask.TargetAddress = Endstation.Row + "-" + Endstation.Column + "-1";
outtask.Grade = 1;
outtask.NextAddress = Endstation.Row + "-" + Endstation.Column + "-1";
@@ -280,9 +285,11 @@
outtask.WMSId = 3;
outtask.PalletCode = "text";
outtask.CurrentAddress = "text";
- var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.SourceAddress);
+ //闃叉閲嶅浠诲姟
+ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == outtask.SourceAddress &&v.TargetAddress== outtask.TargetAddress);
if (oldtask == null)
{
+ //鐢熸垚浠诲姟
_dt_taskRepositiry.AddData(outtask);
}
}
--
Gitblit v1.9.3