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_Server/appsettings.json | 4
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 85 ++++++++++++++++++++++-----
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/GZJ/GZJJob.cs | 63 +++++++++++---------
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs | 18 ++++--
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs | 2
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs | 4
6 files changed, 121 insertions(+), 55 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
index 0d4a85e..782c499 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs"
@@ -80,6 +80,6 @@
/// 澶╄溅绉诲姩
/// </summary>
[Description("澶╄溅绉诲姩")]
- Mowe = 100,
+ Mowe = 300,
}
-}
+}
\ No newline at end of file
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
index 146f422..0c523ba 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/appsettings.json"
@@ -19,8 +19,8 @@
//杩炴帴瀛楃涓�
//"ConnectionString": "HTI6FB1H05Krd07mNm9yBCNhofW6edA5zLs9TY~MNthRYW3kn0qKbMIsGp~3yyPDF1YZUCPBQx8U0Jfk4PH~ajNFXVIwlH85M3F~v_qKYQ3CeAz3q1mLVDn8O5uWt1~3Ut2V3KRkEwYHvW2oMDN~QIDXPxDgXN0R2oTIhc9dNu7QNaLEknblqmHhjaNSSpERdDVZIgHnMKejU_SL49tralBkZmDNi0hmkbL~837j1NWe37u9fJKmv91QPb~16JsuI9uu0EvNZ06g6PuZfOSAeFH9GMMIZiketdcJG3tHelo=",
//"ConnectionString": "Data Source=.;Initial Catalog=WIDESEAWCS_TEST555;User ID=sa;Password=P@ssw0rd;Integrated Security=False;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False",
- //"ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=123456;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
- "ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
+ "ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=123456;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
+ //"ConnectionString": "server=localhost;Database=wideseawcs_yangji;Uid=root;Pwd=root;Port=3306;Allow User Variables=True;AllowLoadLocalInfile=true",
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 b89f4b0..206447e 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"
@@ -263,7 +263,8 @@
//浼樺厛杩斿洖鎵ц鍒颁竴鍗婄殑浠诲姟缁х画鎵ц
return task;
}
- else {
+ else
+ {
//鏌ヨ澶╄溅绉诲姩浠诲姟
task = BaseDal.QueryFirst(v => v.TaskType == (int)TaskMoveEnum.Mowe && v.TaskState == (int)TaskMoveStatusEnum.OutNewMove);
if (task!=null)
@@ -277,17 +278,22 @@
//{
// throw new Exception($"褰撳墠浠诲姟姹犱腑瀛樺湪鎵ц涓殑浠诲姟,浠诲姟鍙�:銆恵task.TaskNum}銆�");
//}
- if (task.TaskState!= (int)TaskMoveStatusEnum.OutNewMove)
+ //if (task != null)
+ //{
+ // if (task.TaskState != (int)TaskMoveStatusEnum.OutNewMove)
+ // {
+
+ // }
+ //}
+ if (workTpe.Equals("In"))
{
- 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();
- }
- 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)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();
+ }
+
}
catch (Exception)
{
@@ -445,7 +451,7 @@
{
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.TaskState = (int)TaskOutStatusEnum.Line_OutWownExecuting;
}
@@ -597,6 +603,8 @@
{
throw new Exception(string.Format("澶╄溅鏀捐揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", taskNum));
}
+
+
if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
var batck = _batchinfoRepository.QueryFirst(v=>v.Id==1);
@@ -648,6 +656,7 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
+
//寮�濮嬫暟鎹簱浜嬪姟
_unitOfWorkManage.BeginTran();
_stockRepository.AddData(stock);
@@ -689,8 +698,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 = "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);
@@ -717,12 +742,38 @@
taskhty.PalletCode = nawtask.PalletCode;
taskhty.NextAddress = nawtask.NextAddress;
taskhty.CurrentAddress = nawtask.CurrentAddress;
- //寮�濮嬫暟鎹簱浜嬪姟
- _unitOfWorkManage.BeginTran();
- _taskhtyRepository.AddData(taskhty);
- BaseDal.DeleteData(nawtask);
- //鎻愪氦浜嬪姟
- _unitOfWorkManage.CommitTran();
+ 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();
}
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);
}
}
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
index e2590a8..a1027df 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/OHT/OHTJob.cs"
@@ -54,10 +54,10 @@
var ZXJdevice = Storage.Devices.Find(v => v.DeviceName == "闃虫瀬鏁村舰鏈�");
//瑙勬暣鏈篜LC瀵硅薄
var GZJevice = Storage.Devices.Find(v => v.DeviceName == "闃虫瀬瑙勬暣鏈�");
- if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
- {
- return Task.CompletedTask;
- }
+ //if (!device.Communicator.IsConnected || !ZXJdevice.Communicator.IsConnected || !GZJevice.Communicator.IsConnected)
+ //{
+ // return Task.CompletedTask;
+ //}
try
{
#region 澶╄溅瀹屾垚浠诲姟閫昏緫
@@ -71,11 +71,13 @@
{
throw new Exception(string.Format("澶╄溅鍙栬揣瀹屾垚浠诲姟鏈煡璇㈠埌浠诲姟鍙穥0}", oHTReadData.R_TaskNumber));
}
+ //鍏ュ簱
if (nawtask.TaskType == (int)TaskInboundTypeEnum.Inbound)
{
- //濡傛灉浠诲姟鐨勭姸鎬佹槸澶╄溅鍏ュ簱鍙栬揣鎵ц涓�
+ //濡傛灉浠诲姟鐨勭姸鎬佹槸鍚︽槸澶╄溅鍏ュ簱鍙栬揣鎵ц涓�
if (nawtask.TaskState == (int)TaskInStatusEnum.Line_InGrabExecuting)
{
+ //淇敼鐘舵��
WebResponseContent result = _taskService.UpdateTaskStatusToLine_Ingrab(nawtask);
if (result.Status)
{
@@ -83,11 +85,13 @@
}
}
}
+ //鍑哄簱
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.Outbound)
{
- //濡傛灉浠诲姟鐘舵�佹槸澶╄溅鍑哄簱鍙栬揣鎵ц涓�
+ //濡傛灉浠诲姟鐘舵�佹槸鍚︽槸澶╄溅鍑哄簱鍙栬揣鎵ц涓�
if (nawtask.TaskState == (int)TaskOutStatusEnum.Line_OutGrabExecuting)
{
+ //淇敼鐘舵��
WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
if (result.Status)
{
@@ -95,8 +99,10 @@
}
}
}
+ //鐩存帴鍑哄簱
else if (nawtask.TaskType == (int)TaskOutboundTypeEnum.OutInventory)
{
+ //淇敼鐘舵��
WebResponseContent result = _taskService.UpdateTaskStatusToLine_Outgrab(nawtask);
if (result.Status)
{
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs"
index b29a8be..f1d957e 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_WMSPart/LocationInfoService.cs"
@@ -138,7 +138,9 @@
{
//鏌ユ壘鐩搁偦鐨勫簱浣�
Dt_LocationInfo Towlocation = new Dt_LocationInfo();
+
var Onelocation = BaseDal.QueryFirst(v => v.LocationCode == location.LocationCode);
+
if (Onelocation.Depth == 1)
{
Towlocation = BaseDal.QueryFirst(v => v.Row == Onelocation.Row && v.Column == Onelocation.Column && v.Depth == 2);
--
Gitblit v1.9.3