From eb72ad7c5ec8f4f0cd8b291d16534a10e9eb113c Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期一, 10 三月 2025 14:50:01 +0800
Subject: [PATCH] 后端
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs | 410 ++++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 311 insertions(+), 99 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 8326550..b6c9f94 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;
@@ -77,120 +78,295 @@
public Task Execute(IJobExecutionContext context)
{
-
+ //return Task.CompletedTask;
bool flag = context.JobDetail.JobDataMap.TryGetValue("JobParams", out object? value);
if (flag && value != null)
{
OtherDevice device = (OtherDevice)value;
+
try
{
- #region 鐢熸垚鍏ュ簱浠诲姟
- if (!OHTJob.oHTReadData.R_GZJ_isWork)
+ #region 鐢熸垚鍓旈櫎璐т綅鍏ュ簱浠诲姟
+ //鍒ゆ柇鏁村舰鏈轰俊鍙�
+ if(!OHTJob.oHTReadData.R_ZXJ_TC_isready&& !OHTJob.oHTReadData.R_TCMode_TC)
{
- throw new Exception($"瑙勬暣鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
+ throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
}
- var Inisout = _outStockRepository.QueryFirst(v => v.Id == 1);
- if (Inisout.InOut==1)
+ Dt_Task task = new Dt_Task();
+ 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)
{
- 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涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
- {
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
- task.SourceAddress = station.Row + "-" + station.Column + "-1";
- task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
-
- task.Grade = 1;
- task.Remark = (int)MateTypeEnum.ZiChan;
- }
- else if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready)//RGV涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
- {
- var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
- task.SourceAddress = station.Row + "-" + station.Column + "-1";
- 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)
- {
- task.Grade = 2;
- }
- else
- {
- task.Grade = 1;
- }
- task.Remark = (int)MateTypeEnum.ZiChan;
- }
- else 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";
- task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
- task.Grade = 1;
- task.Remark = (int)MateTypeEnum.WaiGou;
- }
- else 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";
- 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.Remark = (int)MateTypeEnum.WaiGou;
- }
- else
- {
- throw new Exception($"瑙勬暣鏈哄綋鍓嶄俊鍙蜂笉婊¤冻鍏ュ簱浠诲姟鐢熸垚鏉′欢");
- }
- //鏌ユ壘鐩搁偦鐨勫簱浣�
- Dt_LocationInfo Towlocation = new Dt_LocationInfo();
- var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
- if (Onelocation.Depth == 1)
- {
- Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
- }
- else
- {
- Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
- }
- task.NextAddress = Towlocation.LocationCode;
+ task.TargetAddress = _locationInfoService.GetInLocation(6).LocationCode;
+ task.Grade = 1;
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ task.NextAddress = "text";
task.Roadway = "TC01";
task.TaskType = (int)TaskInboundTypeEnum.Inbound;
task.TaskState = (int)TaskInStatusEnum.InNew;
task.PalletCode = "text";
task.CurrentAddress = "text";
- task.WMSId = 3;
- var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
- if (oldhtytask == null)
+ task.WMSId = 2;
+ _dt_taskRepositiry.AddData(task);
+ }
+
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ _ErrormsginfoService.UpdateErrorMsg(ex.Message, 5);
+ }
+
+ try
+ {
+ #region 鐢熸垚鍓旈櫎璐т綅鍑哄簱浠诲姟
+ if (!OHTJob.oHTReadData.R_TCMode && !OHTJob.oHTReadData.R_TC_isready)
+ {
+ throw new Exception($"瑙勬暣鏈哄墧闄ゆ灦瀛愬彲鏀炬澘鎴栧墧闄や笂鏂欐ā寮忎俊鍙蜂负false");
+ }
+ //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉�
+ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
+ if (oldtask != null)
+ {
+ throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�");
+ }
+ //鏌ヨ褰撳墠闇�瑕佸嚭搴撶殑鎵规鍙凤紝浠ュ強鍑哄簱鐗╂枡绫诲瀷
+ var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
+ //鏌ヨ搴撳瓨鐗╂枡搴撳瓨淇℃伅
+ var stocks = _StockInfoRepository.QueryData(v => v.Remark == 3 && v.BatchNo == batch.OutBatch && v.StockStatus == 0)
+ .OrderBy(v => v.CreateDate).ToList();
+ if (stocks.Count <= 0)
+ {
+ throw new Exception($"褰撳墠搴撳瓨涓病鏈夈�恵batch.materType}銆戯紙0鑷骇 1澶栬喘锛変笖鎵规涓恒�恵batch.OutBatch}銆戠殑鐗╂枡");
+ }
+ //鏌ヨ璐т綅
+ var locaOne = _LocationInfoRepository.QueryFirst(v => v.LocationCode == stocks[0].LocationCode);
+ locaOne.LocationStatus = (int)LocationStatusEnum.Lock;
+ stocks[0].StockStatus = 1;
+ //鏌ヨ缁堢偣绔欏彴淇℃伅
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task outtask = new Dt_Task();
+ outtask.Roadway = "TC01";
+ outtask.TaskType = (int)TaskOutboundTypeEnum.Outbound;
+ outtask.TaskState = (int)TaskOutStatusEnum.OutNew;
+ outtask.SourceAddress = stocks[0].LocationCode;
+ outtask.TargetAddress = station.Row + "-" + station.Column + "-1";
+ outtask.NextAddress = "text";
+ outtask.Grade = 1;
+ outtask.WMSId = 2;
+ outtask.Remark = 3;
+ outtask.PalletCode = "text";
+ outtask.CurrentAddress = "text";
+
+ _unitOfWorkManage.BeginTran();
+ _LocationInfoRepository.UpdateData(locaOne);
+ _dt_taskRepositiry.AddData(outtask);
+ _StockInfoRepository.UpdateData(stocks[0]);
+ _unitOfWorkManage.CommitTran();
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ _ErrormsginfoService.UpdateErrorMsg(ex.Message, 6);
+ }
+
+ try
+ {
+ #region 鐢熸垚鍏ュ簱浠诲姟
+
+
+ //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_XK_isready)//RGV涓婃枡妯″紡锛屼笖涓滆法鏋跺瓙鏈変笂鏂欎俊鍙�
{
- _dt_taskRepositiry.AddData(task);
+
+ 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)
+ {
+ task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
+ if (OHTJob.oHTReadData.R_DK_isready)
+ {
+ task.Grade = 2;
+ }
+ else
+ {
+ task.Grade = 1;
+ }
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ //鏌ユ壘鐩搁偦鐨勫簱浣�
+ Dt_LocationInfo Towlocation = new Dt_LocationInfo();
+ var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
+ if (Onelocation.Depth == 1)
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
+ }
+ else
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
+ }
+ task.NextAddress = Towlocation.LocationCode;
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 3;
+ _dt_taskRepositiry.AddData(task);
+ }
+ }
+ if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready)//RGV涓婃枡妯″紡锛屼笖瑗胯法鏋跺瓙鏈変笂鏂欎俊鍙�
+ {
+ 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)
+ {
+ task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
+
+ task.Grade = 1;
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ //鏌ユ壘鐩搁偦鐨勫簱浣�
+ Dt_LocationInfo Towlocation = new Dt_LocationInfo();
+ var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
+ if (Onelocation.Depth == 1)
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
+ }
+ else
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
+ }
+ task.NextAddress = Towlocation.LocationCode;
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 3;
+ _dt_taskRepositiry.AddData(task);
+ }
+ }
+ 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)
+ {
+ task.TargetAddress = _locationInfoService.GetInLocation(storagemode.storagemode).LocationCode;
+ if (OHTJob.oHTReadData.R_XK_isready)
+ {
+ task.Grade = 2;
+ }
+ else
+ {
+ task.Grade = 1;
+ }
+ task.Remark = (int)MateTypeEnum.WaiGou;
+ //鏌ユ壘鐩搁偦鐨勫簱浣�
+ Dt_LocationInfo Towlocation = new Dt_LocationInfo();
+ var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
+ if (Onelocation.Depth == 1)
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
+ }
+ else
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
+ }
+ task.NextAddress = Towlocation.LocationCode;
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 3;
+ _dt_taskRepositiry.AddData(task);
+ }
+ }
+ 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";
+ var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
+ 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;
+ //鏌ユ壘鐩搁偦鐨勫簱浣�
+ Dt_LocationInfo Towlocation = new Dt_LocationInfo();
+ var Onelocation = _LocationInfoRepository.QueryFirst(v => v.LocationCode == task.TargetAddress);
+ if (Onelocation.Depth == 1)
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
+ }
+ else
+ {
+ Towlocation = _LocationInfoRepository.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 1);
+ }
+ task.NextAddress = Towlocation.LocationCode;
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskInboundTypeEnum.Inbound;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 3;
+ _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");
}
- Dt_Task outtask = new Dt_Task();
- if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_DK_isready )
+ if (!OHTJob.oHTReadData.R_HC_isReadyWork)
{
- var Stastation = _dt_stationInfoRepository.QueryFirst(v => v.msg == "涓滆法鏋跺瓙");
+ throw new Exception($"鏁村舰鏈哄ぉ杞︽斁鏉夸俊鍙蜂负false");
+ }
+ Dt_Task outtask = new Dt_Task();
+ //灏忚溅涓婃枡
+ if (OHTJob.oHTReadData.R_RGVMode && OHTJob.oHTReadData.R_XK_isready )
+ {
+ 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)
@@ -198,13 +374,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";
@@ -214,13 +386,14 @@
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);
}
}
-
#endregion
}
catch (Exception ex)
@@ -231,16 +404,20 @@
try
{
#region 鐢熸垚鍑哄簱浠诲姟
- if (!OHTJob.oHTReadData.R_ZXJ_isWork)
- {
- throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
- }
+ //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
+ //{
+ // throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
+ //}
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);
@@ -307,6 +484,41 @@
_unitOfWorkManage.RollbackTran();
_ErrormsginfoService.UpdateErrorMsg(ex.Message, 3);
}
+
+
+ try
+ {
+ #region 鐢熸垚澶╄溅绉诲姩浠诲姟
+ if (!OHTJob.oHTReadData.R_ZXJ_isWork || !OHTJob.oHTReadData.R_HC_isReady)
+ {
+ throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false鎴栬�呰杞﹀彲鍑嗗鍙栨澘涓篺alse");
+ }
+ //鏌ヨ褰撳墠闇�瑕佸嚭搴撶殑鎵规鍙凤紝浠ュ強鍑哄簱鐗╂枡绫诲瀷
+ var batch = _batchInfoRepository.QueryFirst(v => v.Id == 1);
+ //鏌ヨ搴撳瓨鐗╂枡搴撳瓨淇℃伅
+ var stocks = _StockInfoRepository.QueryData(v => v.Remark == batch.materType && v.BatchNo == batch.OutBatch && v.StockStatus == 0)
+ .OrderBy(v => v.CreateDate).ToList();
+
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task outtask = new Dt_Task();
+ outtask.Roadway = "TC01";
+ outtask.TaskType = (int)TaskMoveEnum.Mowe;
+ outtask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ outtask.SourceAddress = "text";
+ outtask.TargetAddress = stocks[0].LocationCode;
+ outtask.NextAddress = "text";
+ outtask.Grade = 1;
+ outtask.WMSId = 3;
+ outtask.Remark = batch.materType;
+ outtask.PalletCode = "text";
+ outtask.CurrentAddress = "text";
+ _dt_taskRepositiry.AddData(outtask);
+ #endregion
+ }
+ catch (Exception ex)
+ {
+ _ErrormsginfoService.UpdateErrorMsg(ex.Message, 4);
+ }
}
return Task.CompletedTask;
}
--
Gitblit v1.9.3