From 9d34ec27aa5bb9310abd23c6f542b6e4e79a3637 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期日, 09 三月 2025 10:44:08 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/ZhuZhouYouRuiKe/YangJiPingKu
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs | 42 +++++++++++++++++++++++++++---------------
1 files changed, 27 insertions(+), 15 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 bf1c63c..b6c7193 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"
@@ -5,6 +5,7 @@
using Microsoft.Extensions.Hosting;
using Microsoft.VisualBasic.FileIO;
using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.RefAndLookup;
using Quartz;
using SixLabors.ImageSharp.PixelFormats;
using System;
@@ -104,10 +105,7 @@
if (oldhtytask ==null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
- 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)
+ if (OHTJob.oHTReadData.R_DK_isready)
{
task.Grade = 2;
}
@@ -169,18 +167,15 @@
_dt_taskRepositiry.AddData(task);
}
}
- if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_DK_isready)
{
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 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)
+ if (OHTJob.oHTReadData.R_XK_isready)
{
task.Grade = 2;
}
@@ -188,7 +183,6 @@
{
task.Grade = 1;
}
- task.Grade = 1;
task.Remark = (int)MateTypeEnum.WaiGou;
//鏌ユ壘鐩搁偦鐨勫簱浣�
Dt_LocationInfo Towlocation = new Dt_LocationInfo();
@@ -211,7 +205,7 @@
_dt_taskRepositiry.AddData(task);
}
}
- if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)//浜哄伐鍙夎溅涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
+ if (OHTJob.oHTReadData.R_CCMode && OHTJob.oHTReadData.R_XK_isready)
{
var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
task.SourceAddress = station.Row + "-" + station.Column + "-1";
@@ -219,6 +213,17 @@
if (oldhtytask == null)
{
task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
+ //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)
+ //{
+ // task.Grade = 2;
+ //}
+ //else
+ //{
+ // task.Grade = 1;
+ //}
task.Grade = 1;
task.Remark = (int)MateTypeEnum.WaiGou;
//鏌ユ壘鐩搁偦鐨勫簱浣�
@@ -242,14 +247,17 @@
_dt_taskRepositiry.AddData(task);
}
}
-
}
//鐩存帴鍑哄簱
else if(Inisout.InOut == 2)
{
- if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
+ if (!OHTJob.oHTReadData.R_ZXJ_TCMode)
{
throw new Exception($"鏁村舰鏈轰笉灞炰簬澶╄溅涓婃枡妯″紡鎴栧ぉ杞︽斁鏉夸俊鍙蜂负false");
+ }
+ if (!OHTJob.oHTReadData.R_HC_isReadyWork)
+ {
+ throw new Exception($"鏁村舰鏈哄ぉ杞︽斁鏉夸俊鍙蜂负false");
}
Dt_Task outtask = new Dt_Task();
//灏忚溅涓婃枡
@@ -312,10 +320,14 @@
var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
if (isout.isout == 1)
{
- if (!OHTJob.oHTReadData.R_ZXJ_TCMode || !OHTJob.oHTReadData.R_HC_isReadyWork)
+ if (!OHTJob.oHTReadData.R_ZXJ_TCMode )
{
throw new Exception($"鏁村舰鏈轰笉灞炰簬澶╄溅涓婃枡妯″紡鎴栧ぉ杞︽斁鏉夸俊鍙蜂负false");
}
+ if (!OHTJob.oHTReadData.R_HC_isReadyWork)
+ {
+ throw new Exception($"鏁村舰鏈哄ぉ杞︽斁鏉夸俊鍙蜂负false");
+ }
//鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉�
var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
if (oldtask != null)
--
Gitblit v1.9.3