From 6167bf4c8fe617d9f9861585042149d48ad15dbb Mon Sep 17 00:00:00 2001
From: chengsc <11752@DESKTOP-DS49RCP>
Date: 星期二, 13 五月 2025 17:54:50 +0800
Subject: [PATCH] 修改问题，添加PDA下发出库页面
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 45 ++++++++++++++++++---------------------------
1 files changed, 18 insertions(+), 27 deletions(-)
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 88bb8bb..a0243b2 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2200,17 +2200,17 @@
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list2, time1, time2);
str += "涓嬪彂鎴愬姛";
}
- if (wcsModel.StatusCode == -1)
+ else
{
- new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.Msg);
- throw new Exception(wcsModel.Msg);
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, wcsModel.message);
+ throw new Exception(wcsModel.message);
}
}
catch (Exception ex)
@@ -3150,18 +3150,17 @@
outDto1.Add(new OutCommandDto()
{
+ TaskNo = exTask.TaskNo, // 浠诲姟鍙�
+ TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
+
PalletNo = item.PalletNo,//鎵樼洏鍙�
StartLocate = locate.LocatNo, // 璧峰浣嶇疆
StartRoadway = locate.RoadwayNo,//鍏跺疄宸烽亾
EndLocate = outModeLocate, // 鐩爣浣嶇疆
- TaskNo = exTask.TaskNo, // 浠诲姟鍙�
- TaskType = "1",// 浠诲姟绫诲瀷 (鍑哄簱)0鍏� 1鍑� 2绉�
- OutMode = outModeLocate, //鍑哄簱鍙�
- Order = 1,
-
- //UnstackingMode = "unstackingMode2",//鎷ｈ揣鏂瑰紡 0鏈哄櫒鎷嗘墭鍑� 1 浜哄伐鎷ｈ揣鍑�
- //CompleteQty = outCount2, //鎷嗙殑浠舵暟
- //BoxexQty = outCount, //鎬讳欢鏁�
+
+ Order = 999,
+ Type = PLCTypeEnum.AGV
+
});
taskNoStr = exTask.TaskNo;
@@ -5574,9 +5573,6 @@
OutMode = toLocation, //鍑哄簱鍙�
Order = 1,
- UnstackingMode=unstackingMode2,//鎷ｈ揣鏂瑰紡 0鏈哄櫒鎷嗘墭鍑� 1 浜哄伐鎷ｈ揣鍑�
- CompleteQty= outCount2, //鎷嗙殑浠舵暟
- BoxexQty = outCount, //鎬讳欢鏁�
});
taskNoStr = exTask.TaskNo;
}
@@ -5691,9 +5687,7 @@
OutMode = toLocation, //鐩爣鍦板潃
Order = 1,
- UnstackingMode = "1",//鎷ｈ揣鏂瑰紡 0鏈哄櫒鎷嗘墭鍑� 1 浜哄伐鎷ｈ揣鍑�
- CompleteQty = 0, //鎷嗙殑浠舵暟
- BoxexQty = 0, //鎬讳欢鏁�
+
});
#endregion
@@ -5749,9 +5743,6 @@
OutMode = toLocation, //鐩爣鍦板潃
Order = 1,
- UnstackingMode = unstackingMode2,//鎷ｈ揣鏂瑰紡 0鏈哄櫒鎷嗘墭鍑� 1 浜哄伐鎷ｈ揣鍑�
- CompleteQty = outCount2, //鎷嗙殑浠舵暟
- BoxexQty = outCount, //鎬讳欢鏁�
});
taskNoStr = exTask1.TaskNo;
#endregion
@@ -5978,17 +5969,17 @@
var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
////瑙ｆ瀽杩斿洖鏁版嵁
- var wcsModel = JsonConvert.DeserializeObject<WcsModel>(response);
- if (wcsModel.StatusCode == 0)
+ var wcsModel = JsonConvert.DeserializeObject<WcsModel2>(response);
+ if (wcsModel.code == 200)
{
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list, time1, time2);
}
- if (wcsModel.StatusCode == -1)
+ else
{
- new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.Msg);
- throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.Msg}");
+ new TaskServer().EditTaskIssueNo(list, time1, time2, wcsModel.message);
+ throw new Exception($"wcs杩斿洖鐘舵�佸紓甯革細{wcsModel.message}");
}
}
catch (Exception ex)
--
Gitblit v1.8.0