From b0c756bd9b37bc2eeffbb0f39c8000648061d82c Mon Sep 17 00:00:00 2001
From: qinchulong <qinchulong@hnkhzn.com>
Date: 星期六, 08 三月 2025 17:43:00 +0800
Subject: [PATCH] 出库条件判断
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 187 ++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 168 insertions(+), 19 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 1fbfd07..17d369e 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"
@@ -185,6 +185,17 @@
}
/// <summary>
+ /// 鏍规嵁浠诲姟鐘舵�佹煡璇换鍔�
+ /// </summary>
+ /// <param name="deviceNo">璁惧缂栧彿</param>
+ /// <param name="currentAddress">褰撳墠鍦板潃</param>
+ /// <returns></returns>
+ public Dt_Task QueryTaskState()
+ {
+ return BaseDal.QueryFirst(x => x.TaskState== (int)TaskInStatusEnum.InNew );
+ }
+
+ /// <summary>
/// 鏍规嵁璁惧缂栧彿銆佸綋鍓嶅湴鍧�鏌ヨ杈撻�佺嚎鏈墽琛岀殑浠诲姟
/// </summary>
/// <param name="deviceNo">璁惧缂栧彿</param>
@@ -252,20 +263,37 @@
//浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
return task;
}
- //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鐘舵�佷负闈炴柊寤虹殑
- task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
- if (task != null)
+ else
{
- throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ //鏌ヨ澶╄溅绉诲姩浠诲姟
+ task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
+ if (task!=null)
+ {
+ return task;
+ }
}
+ //鏌ヨ褰撳墠浠诲姟姹犱腑鏄惁瀛樺湪鐘舵�佷负闈炴柊寤虹殑
+ //task= BaseDal.QueryFirst(v => v.TaskState != (int)TaskInStatusEnum.InNew || v.TaskState != (int)TaskOutStatusEnum.OutNew);
+ //if (task != null)
+ //{
+ // throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
+ //}
+ //if (task != null)
+ //{
+ // 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.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.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
+ task = BaseDal.QueryData(v => (v.TaskType == (int)TaskOutboundTypeEnum.Outbound || v.TaskType == (int)TaskOutboundTypeEnum.OutInventory) && v.TaskState == (int)TaskOutStatusEnum.OutNew).OrderBy(v => v.CreateDate).First();
}
+
}
catch (Exception)
{
@@ -273,6 +301,24 @@
}
return task;
+ }
+
+ public Dt_Task QueryTasking()
+ {
+ Dt_Task task = new Dt_Task();
+ 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)
+ {
+ return task;
+ }
+ else
+ {
+ return null;
+ }
}
/// <summary>
@@ -311,7 +357,7 @@
/// <returns>杩斿洖浠诲姟瀹炰綋瀵硅薄锛屽彲鑳戒负null</returns>
public Dt_Task QueryTakNnmTask(int taskNum)
{
- return BaseDal.QueryFirst(v=>v.TaskNum== taskNum);
+ return BaseDal.QueryFirst(v=>v.TaskId== taskNum);
}
/// <summary>
/// 淇敼澶╄溅浠诲姟鐘舵�侊紝灏嗗叆搴撳彇璐ф墽琛屼腑淇敼涓哄叆搴撳彇璐у畬鎴�
@@ -329,7 +375,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
- UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -350,7 +396,7 @@
catch (Exception ex)
{
content = WebResponseContent.Instance.Error(ex.Message);
- UpdateTaskExceptionMessage(task.TaskNum, ex.Message);
+ UpdateTaskExceptionMessage(task.TaskId, ex.Message);
}
return content;
}
@@ -376,7 +422,7 @@
WebResponseContent content = new WebResponseContent();
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
if (task == null) return WebResponseContent.Instance.Error($"鏈壘鍒拌浠诲姟淇℃伅,浠诲姟鍙�:銆恵taskNum}銆�");
//if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
//{
@@ -410,22 +456,26 @@
{
try
{
- Dt_Task task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
+ Dt_Task task = BaseDal.QueryFirst(x => x.TaskId == taskNum);
if (status == 2 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
task.TaskState = (int)TaskInStatusEnum.Line_InGrabExecuting;
}
- else if (status == 2 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 2 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutGrabExecuting;
}
- if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
+ else if (status == 3 && task.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
task.TaskState = (int)TaskInStatusEnum.Line_InDownExecuting;
}
- else if (status == 3 && task.TaskType == (int)TaskOutboundTypeEnum.Outbound)
+ else if (status == 3 && (task.TaskType == (int)TaskOutboundTypeEnum.Outbound || task.TaskType == (int)TaskOutboundTypeEnum.OutInventory))
{
task.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
+ }
+ else if(status == 4 && task.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ task.TaskState = (int)TaskMoveStatusEnum.Line_OutMove;
}
task.ModifyDate = DateTime.Now;
BaseDal.UpdateData(task);
@@ -566,11 +616,13 @@
WebResponseContent content = new WebResponseContent();
try
{
- var nawtask = BaseDal.QueryFirst(v=>v.TaskNum== 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)
{
var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
@@ -578,7 +630,7 @@
Dt_StockInfo stock = new Dt_StockInfo();
stock.LocationCode = nawtask.TargetAddress;
stock.Weight = (decimal)weight;
- stock.StockStatus = (int)stockEnum.Lock;
+ stock.StockStatus = (int)stockEnum.Free;
stock.BatchNo = batck.InBatch;
if (nawtask.Remark== (int)MateTypeEnum.ZiChan)
{
@@ -588,9 +640,25 @@
{
stock.Remark = (int)MateTypeEnum.WaiGou;
}
+ Dt_StockInfo stockTow = new Dt_StockInfo();
+ stockTow.LocationCode = nawtask.NextAddress;
+ stockTow.Weight = (decimal)weight;
+ stockTow.StockStatus = (int)stockEnum.Free;
+ stockTow.BatchNo = batck.InBatch;
+ if (nawtask.Remark == (int)MateTypeEnum.ZiChan)
+ {
+ stockTow.Remark = (int)MateTypeEnum.ZiChan;
+ }
+ else
+ {
+ stockTow.Remark = (int)MateTypeEnum.WaiGou;
+ }
//淇敼璐т綅淇℃伅
var location = _locationRepository.QueryFirst(v=>v.LocationCode==nawtask.TargetAddress);
location.LocationStatus = (int)LocationStatusEnum.InStock;
+ //淇敼璐т綅淇℃伅
+ var locationtow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationtow.LocationStatus = (int)LocationStatusEnum.InStock;
//澶勭悊浠诲姟淇℃伅
Dt_Task_hty taskhty = new Dt_Task_hty();
taskhty.TaskNum = nawtask.TaskNum;
@@ -603,10 +671,16 @@
taskhty.Grade = nawtask.Grade;
taskhty.Dispatchertime = nawtask.Dispatchertime;
taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
_stockRepository.AddData(stock);
+ _stockRepository.AddData(stockTow);
_locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationtow);
_taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
@@ -615,35 +689,110 @@
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
//鏌ユ壘搴撳瓨
- var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.TargetAddress);
+ var stock = _stockRepository.QueryFirst(v=>v.LocationCode== nawtask.SourceAddress);
if (stock == null)
{
throw new Exception($"鏈壘鍒板簱瀛樹俊鎭揣浣嶅彿:銆恵nawtask.TargetAddress}銆�");
}
+ var Towstock = _stockRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
//淇敼璐т綅鐘舵��
- var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.TargetAddress);
+ var location = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.SourceAddress);
location.LocationStatus = (int)LocationStatusEnum.Free;
+ //淇敼璐т綅鐘舵��
+ var locationTow = _locationRepository.QueryFirst(v => v.LocationCode == nawtask.NextAddress);
+ locationTow.LocationStatus = (int)LocationStatusEnum.Free;
//鍑嗗鍘嗗彶浠诲姟鏁版嵁
Dt_Task_hty taskhty = new Dt_Task_hty();
taskhty.TaskNum = nawtask.TaskNum;
taskhty.Roadway = nawtask.Roadway;
taskhty.TaskType = nawtask.TaskType;
- taskhty.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
taskhty.SourceAddress = nawtask.SourceAddress;
taskhty.TargetAddress = nawtask.TargetAddress;
taskhty.ExceptionMessage = nawtask.ExceptionMessage;
taskhty.Grade = nawtask.Grade;
taskhty.Dispatchertime = nawtask.Dispatchertime;
taskhty.Remark = nawtask.Remark;
+ 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 = "1-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
//寮�濮嬫暟鎹簱浜嬪姟
+
_unitOfWorkManage.BeginTran();
+ BaseDal.AddData(Movstask);
_stockRepository.DeleteData(stock);
+ _stockRepository.DeleteData(Towstock);
_locationRepository.UpdateData(location);
+ _locationRepository.UpdateData(locationTow);
_taskhtyRepository.AddData(taskhty);
BaseDal.DeleteData(nawtask);
//鎻愪氦浜嬪姟
_unitOfWorkManage.CommitTran();
}
+ else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory || nawtask.TaskType == (int)TaskMoveEnum.Mowe)
+ {
+ //澶勭悊浠诲姟淇℃伅
+ Dt_Task_hty taskhty = new Dt_Task_hty();
+ taskhty.TaskNum = nawtask.TaskNum;
+ taskhty.Roadway = nawtask.Roadway;
+ taskhty.TaskType = nawtask.TaskType;
+ taskhty.TaskState = (int)TaskOutStatusEnum.OutFinish;
+ taskhty.SourceAddress = nawtask.SourceAddress;
+ taskhty.TargetAddress = nawtask.TargetAddress;
+ taskhty.ExceptionMessage = nawtask.ExceptionMessage;
+ taskhty.Grade = nawtask.Grade;
+ taskhty.Dispatchertime = nawtask.Dispatchertime;
+ taskhty.Remark = nawtask.Remark;
+ taskhty.PalletCode = nawtask.PalletCode;
+ taskhty.NextAddress = nawtask.NextAddress;
+ taskhty.CurrentAddress = nawtask.CurrentAddress;
+ if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
+ {
+ //寮�濮嬪垱寤轰换鍔�
+ Dt_Task Movstask = new Dt_Task();
+ Movstask.Roadway = "TC01";
+ Movstask.TaskType = (int)TaskMoveEnum.Mowe;
+ Movstask.TaskState = (int)TaskMoveStatusEnum.OutNewMove;
+ Movstask.SourceAddress = "0";
+ Movstask.TargetAddress = "1-5-1";
+ Movstask.NextAddress = "text";
+ Movstask.Grade = 1;
+ Movstask.WMSId = 3;
+ Movstask.Remark = 0;
+ Movstask.PalletCode = "text";
+ Movstask.CurrentAddress = "text";
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ BaseDal.AddData(Movstask);
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ else
+ {
+ //寮�濮嬫暟鎹簱浜嬪姟
+ _unitOfWorkManage.BeginTran();
+ _taskhtyRepository.AddData(taskhty);
+ BaseDal.DeleteData(nawtask);
+ //鎻愪氦浜嬪姟
+ _unitOfWorkManage.CommitTran();
+ }
+ }
content = WebResponseContent.Instance.OK();
}
catch (Exception ex)
--
Gitblit v1.9.3