From 7924008bfdcfc7a73428826fc10ae475b1f71353 Mon Sep 17 00:00:00 2001
From: Zhang-Hong-Lin <a3219986988@163.com>
Date: 星期二, 27 五月 2025 12:20:52 +0800
Subject: [PATCH] 剔除
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 250 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 211 insertions(+), 39 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 5031e00..83abd14 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -76,8 +76,8 @@
//SBText ITaskService.text { get => throw new NotImplementedException(); set => throw new NotImplementedException(); }
- public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService,
- ITaskExecuteDetailService taskExecuteDetailService,
+ public TaskService(IRepository<Dt_Task> BaseDal, IRouterService routerService,
+ ITaskExecuteDetailService taskExecuteDetailService,
IRepository<Dt_TaskExecuteDetail> taskExecuteDetailRepository,
IRepository<Dt_StockInfo> stockRepository,
IRepository<Dt_LocationInfo> locationRepository,
@@ -210,7 +210,7 @@
/// <returns></returns>
public Dt_Task QueryTaskState()
{
- return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
+ return BaseDal.QueryFirst(x => x.TaskState == (int)TaskInStatusEnum.InNew);
}
/// <summary>
@@ -281,11 +281,11 @@
//浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
return task;
}
- else
+ else
{
//鏌ヨ澶╄溅绉诲姩浠诲姟
task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
- if (task!=null)
+ if (task != null)
{
return task;
}
@@ -300,16 +300,16 @@
//{
// if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
// {
-
+
// }
//}
if (workTpe.Equals("In"))
{
- task = BaseDal.QueryData(v => v.TaskType == (int)TaskInboundTypeEnum.Inbound && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu || v.TaskType == (int)TaskInboundTypeEnum.Inbound) && v.TaskState == (int)TaskInStatusEnum.InNew).OrderByDescending(v => v.Grade).OrderBy(v => v.CreateDate).First();
}
else if (workTpe.Equals("Out"))
{
- task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || v.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu || v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
}
}
@@ -321,15 +321,15 @@
return task;
}
- public Dt_Task QueryTasking()
+ public Dt_Task QueryTasking()
{
Dt_Task task = new Dt_Task();
- task = BaseDal.QueryFirst(v=>v.TaskState!=(int)TaskInStatusEnum.InNew
- && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
+ task = BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew
+ && v.TaskState != (int)TaskMoveStatusEnum.OutNewMove
&& v.TaskState != (int)TaskOutStatusEnum.OutNew
&& v.TaskState != (int)TaskOutStatusEnum.SC_OutExecuting
&& v.TaskState != (int)TaskInStatusEnum.Line_Ingrab);
- if (task!=null)
+ if (task != null)
{
return task;
}
@@ -375,13 +375,13 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryTakNnmTask(int taskNum)
{
- return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
+ return BaseDal.QueryFirst(v => v.TaskId == taskNum);
}
/// <summary>
/// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
/// </summary>
/// <returns></returns>
- public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task)
+ public WebResponseContent UpdateTaskStatusToLine_Ingrab(Dt_Task task)
{
WebResponseContent content = new WebResponseContent();
try
@@ -475,23 +475,23 @@
try
{
Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
- if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ if (status == 2 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
{
task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
}
- else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
+ else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
}
- else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ else if (status == 3 && (task.TaskType == (int)TaskInboundTypeEnum.Inbound || task.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu))
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
- else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
+ else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory || task.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu || task.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
}
- else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
+ else if (status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
{
task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
}
@@ -629,18 +629,18 @@
/// </summary>
/// <param name="taskNum">浠诲姟缂栧彿</param>
/// <returns>杩斿洖澶勭悊缁撴灉</returns>
- public WebResponseContent StackCraneTaskCompleted(int taskNum,float weight)
+ public WebResponseContent StackCraneTaskCompleted(int taskNum, float weight)
{
WebResponseContent content = new WebResponseContent();
try
{
- var nawtask = BaseDal.QueryFirst(v=>v.TaskId== taskNum);
+ var nawtask = BaseDal.QueryFirst(v => v.TaskId == taskNum);
if (nawtask == null)
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
}
- if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
{
var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�");
string sourceAddress = station.Row + "-" + station.Column + "-1";
@@ -746,7 +746,7 @@
_unitOfWorkManage.CommitTran();
}
}
- else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
{
var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
string targetAddress = station.Row + "-" + station.Column + "-1";
@@ -776,8 +776,24 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
- //寮�濮嬫暟鎹簱浜嬪姟
+ //濡傛灉鏀捐揣浣嶇疆琛屾槸40锛屽垯绔嬮┈鐢熸垚涓�鏉＄Щ鍔ㄤ换鍔�
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task Movstask = new Dt_Task();
+ Movstask.Roadway = "TC01";
+ Movstask.TaskType = (int)TaskMoveEnum.Mowe;
+ Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ Movstask.SourceAddress = "0";
+ Movstask.TargetAddress = "8-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
+
+ //寮�濮嬫暟鎹簱浜嬪姟
+ BaseDal.AddData(Movstask);
_unitOfWorkManage.BeginTran();
_stockRepository.DeleteData(stock);
_locationRepository.UpdateData(location);
@@ -844,7 +860,7 @@
_unitOfWorkManage.CommitTran();
}
}
- else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
{
//澶勭悊浠诲姟淇℃伅
Dt_Task_hty taskhty = new Dt_Task_hty();
@@ -861,7 +877,7 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
- if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu)
{
//寮�濮嬪垱寤轰换鍔�
Dt_Task Movstask = new Dt_Task();
@@ -901,7 +917,7 @@
//鍥炴粴浜嬪姟
_unitOfWorkManage.RollbackTran();
content = WebResponseContent.Instance.Error($"浠诲姟瀹屾垚寮傚父,浠诲姟鍙�:銆恵taskNum}銆�");
- UpdateTaskExceptionMessage(taskNum,ex.Message);
+ UpdateTaskExceptionMessage(taskNum, ex.Message);
}
return content;
}
@@ -1002,7 +1018,7 @@
WebResponseContent content = new WebResponseContent();
Dt_Task nawtask = BaseDal.QueryFirst(v => v.TaskId == taskid);
//鍏ュ簱
- if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound || nawtask.TaskType == (int)TaskInboundTypeEnum.TiChuRuKu)
{
//鍓旈櫎鍏ュ簱
var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�");
@@ -1108,7 +1124,7 @@
}
}
//鍑哄簱
- else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound || nawtask.TaskType == (int)TaskOutboundTypeEnum.TiChuChuKu)
{
//鍓旈櫎鍑哄簱
var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
@@ -1164,7 +1180,10 @@
location.LocationStatus = (int)LocationStatusEnum.Free;
//淇敼璐т綅鐘舵��
var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
- locationTow.LocationStatus = (int)LocationStatusEnum.Free;
+ if (locationTow!=null)
+ {
+ locationTow.LocationStatus = (int)LocationStatusEnum.Free;
+ }
//鍑嗗鍘嗗彶浠诲姟鏁版嵁
Dt_Task_hty taskhty = new Dt_Task_hty();
taskhty.TaskNum = nawtask.TaskNum;
@@ -1184,9 +1203,12 @@
_unitOfWorkManage.BeginTran();
_stockRepository.DeleteData(stock);
- _stockRepository.DeleteData(Towstock);
_locationRepository.UpdateData(location);
- _locationRepository.UpdateData(locationTow);
+ if (locationTow != null)
+ {
+ _locationRepository.UpdateData(locationTow);
+ _stockRepository.DeleteData(Towstock);
+ }
_taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
@@ -1260,17 +1282,24 @@
location.LocationStatus = (int)LocationStatusEnum.InStock;
//淇敼璐т綅淇℃伅
var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
- locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
-
+ Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
+
+ if (locationtow != null)
+ {
+ locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
+ stockInfos.StockStatus = (int)stockEnum.Free;
+ }
Dt_StockInfo stockInfo = _stockRepository.QueryFirst(v => v.LocationCode == task.SourceAddress);
stockInfo.StockStatus = (int)stockEnum.Free;
- Dt_StockInfo stockInfos = _stockRepository.QueryFirst(v => v.LocationCode == task.NextAddress);
- stockInfos.StockStatus = (int)stockEnum.Free;
+
_unitOfWorkManage.BeginTran();
_locationRepository.UpdateData(location);
- _locationRepository.UpdateData(locationtow);
+ if (locationtow != null)
+ {
+ _locationRepository.UpdateData(locationtow);
+ _stockRepository.UpdateData(stockInfos);
+ }
_stockRepository.UpdateData(stockInfo);
- _stockRepository.UpdateData(stockInfos);
BaseDal.DeleteData(task);
_unitOfWorkManage.CommitTran();
return content.OK("5");
@@ -1309,7 +1338,7 @@
return content.OK("1");
}
- public WebResponseContent banzidong(string wei,string weis)
+ public WebResponseContent banzidong(string wei, string weis)
{
WebResponseContent content = new WebResponseContent();
//if (!OHTJob.oHTReadData.R_ZXJ_isWork)
@@ -1376,5 +1405,148 @@
}
return content.OK("1");
}
+
+ public WebResponseContent zhijiechuku()
+ {
+ Dt_Task task = new Dt_Task();
+ WebResponseContent content = new WebResponseContent();
+ var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
+ if (isout.isout == 0)
+ {
+ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
+ if (oldtask != null)
+ {
+ throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�");
+ }
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ task.TargetAddress = station.Row + "-" + station.Column + "-1";
+ var stations = _dt_stationInfoRepository.QueryFirst(v => v.msg == "鍓旈櫎鏋�");
+ task.SourceAddress = stations.Row + "-" + stations.Column + "-1";
+ var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
+ if (oldhtytask == null)
+ {
+ task.Grade = 3;
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ task.NextAddress = "text";
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskOutboundTypeEnum.TiChuZhiJieChuKu;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 2;
+ _dt_taskRepositiry.AddData(task);
+ return content.OK("2");
+ }
+ }
+ else
+ {
+ return content.OK("1");
+ }
+ return content.OK("3");
+ }
+
+ public WebResponseContent tichuchuku(string wei)
+ {
+ Dt_Task task = new Dt_Task();
+ WebResponseContent content = new WebResponseContent();
+ //if (!OHTJob.oHTReadData.R_TCMode && !OHTJob.oHTReadData.R_TC_isready)
+ //{
+ // throw new Exception($"瑙勬暣鏈哄墧闄ゆ灦瀛愬彲鏀炬澘鎴栧墧闄や笂鏂欐ā寮忎俊鍙蜂负false");
+ //}
+ //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鍑哄簱浠诲姟锛屽嚭搴撲换鍔″彧鑳藉瓨鍦ㄤ竴鏉�
+ var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
+ if (isout.isout == 0)
+ {
+ var oldtask = _dt_taskRepositiry.QueryFirst(v => v.TaskType == (int)TaskOutboundTypeEnum.Outbound);
+ if (oldtask != null)
+ {
+ throw new Exception($"褰撳墠浠诲姟姹犱腑宸插瓨鍦ㄤ竴鏉″嚭搴撲换鍔�");
+ }
+ //鏌ヨ搴撳瓨
+ Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
+ if (huo.LocationStatus == 0)
+ {
+ return content.OK("4");
+ }
+ huo.LocationStatus = 1;
+ Dt_StockInfo stockinfo = _StockInfoRepository.QueryFirst(v => v.LocationCode == wei);
+ if (stockinfo==null)
+ {
+ return content.OK("4");
+ }
+ stockinfo.StockStatus = 1;
+ var station = _dt_stationInfoRepository.QueryFirst(v => v.msg == "瑗胯法鏋跺瓙");
+ task.TargetAddress = station.Row + "-" + station.Column + "-1";
+ var oldhtytask = _dt_taskRepositiry.QueryFirst(v => v.SourceAddress == task.SourceAddress);
+ if (oldhtytask == null)
+ {
+ task.SourceAddress = wei;
+ task.Grade = 3;
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ task.NextAddress = "text";
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskOutboundTypeEnum.TiChuChuKu;
+ task.TaskState = (int)TaskOutStatusEnum.OutNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 2;
+ _unitOfWorkManage.BeginTran();
+ _dt_taskRepositiry.AddData(task);
+ _LocationInfoRepository.UpdateData(huo);
+ _StockInfoRepository.UpdateData(stockinfo);
+ _unitOfWorkManage.CommitTran();
+ return content.OK("2");
+ }
+ }
+ return content.OK("3");
+ }
+
+ public WebResponseContent tichuruku(string wei)
+ {
+ Dt_Task task = new Dt_Task();
+ WebResponseContent content = new WebResponseContent();
+ //if (!OHTJob.oHTReadData.R_ZXJ_isWork)
+ //{
+ // throw new Exception($"鏁村舰鏈烘姇鍏ヤ娇鐢ㄤ俊鍙蜂负false");
+ //}
+ var isout = _outStockRepository.QueryFirst(v => v.Id == 1);
+ if (isout.isout == 0)
+ {
+ //鍒ゆ柇搴撳瓨鏄惁鏈夎揣
+ //鏌ヨ璐т綅
+ Dt_LocationInfo huo = _LocationInfoRepository.QueryFirst(v => v.LocationCode == wei);
+ if (huo.LocationStatus!=0)
+ {
+ return content.OK("4");
+ }
+ huo.LocationStatus = 1;
+ 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 = wei;
+ task.Grade = 3;
+ task.Remark = (int)MateTypeEnum.ZiChan;
+ task.NextAddress = "text";
+ task.Roadway = "TC01";
+ task.TaskType = (int)TaskInboundTypeEnum.TiChuRuKu;
+ task.TaskState = (int)TaskInStatusEnum.InNew;
+ task.PalletCode = "text";
+ task.CurrentAddress = "text";
+ task.WMSId = 2;
+ _unitOfWorkManage.BeginTran();
+ _dt_taskRepositiry.AddData(task);
+ _LocationInfoRepository.UpdateData(huo);
+ _unitOfWorkManage.CommitTran();
+ return content.OK("2");
+ }
+ }
+ else
+ {
+ return content.OK("1");
+ }
+ return content.OK("3");
+ }
}
}
--
Gitblit v1.9.3