From 379bdd05d0b7ede3a161115b7a6fedfef104a37a Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 14 二月 2025 10:33:52 +0800
Subject: [PATCH] 小车入库前等待
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 3691b1b..89f5243 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -890,7 +890,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="ruku"></param>
- public void AgvTransport(string palletNo, string areaNo, string ruku, int userId, string url)
+ public void AgvTransport(string palletNo, string areaNo, string ruku, int userId, string url, string wcsurl)
{
if (string.IsNullOrEmpty(palletNo))
{
@@ -907,7 +907,7 @@
try
{
string EndLocat = string.Empty,OrderTy = "";//鐩爣浣嶇疆
-
+ var tasktype = "D00"; //灏忚溅浠诲姟绫诲瀷锛岄粯璁や负鐐瑰埌鐐逛换鍔�
var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
if (log != null)
@@ -969,6 +969,24 @@
//寮�鍚簨鍔�
Db.BeginTran();
+ //璇锋眰WCS鍏ュ簱鍙ｆ斁璐х‘璁�
+ try
+ {
+ var res = HttpHelper.DoPost(wcsurl, EndLocat, "璇锋眰WCS鍏ュ簱鍙ｆ槸鍚﹀彲鏀捐揣", "WCS");
+
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var ret = JsonConvert.DeserializeObject<WcsModel>(res);
+ if (ret.StatusCode == -1)
+ {
+ throw new Exception(EndLocat + "鍏ュ簱鍙ｅ凡鏈夊叾浠栦换鍔″崰鐢�,璇烽�夋嫨鍏朵粬鍏ュ簱鍙�");
+ }
+ }
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
+
//娣诲姞鍑哄簱浠诲姟
var taskNo = new Common().GetMaxNo("TK");
var exTask = new LogTask
@@ -1017,7 +1035,7 @@
#region 鍛煎彨灏忚溅浠ｇ爜
var endlono = EndLocat;
- var tasktype = "D00"; //榛樿涓虹偣鍒扮偣浠诲姟
+
//鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
switch (storageLocatEnd.AreaNo)
{
@@ -1028,6 +1046,10 @@
tasktype = "D01"; // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
break;
}
+ if (OrderTy == "0")
+ {
+ tasktype = "RK0"; //鍏ュ簱浠诲姟
+ }
//缂撳瓨搴撲綅杞崲 3妤煎師杈呮枡Y003_001锛孻003_002锛孻003_003 1妤糦138_001鍒癥138_021澶栧寘缂撳瓨鍖� 1妤糦128_001鍒癥128_015鍐呭寘缂撳瓨鍖�
if (storageLocatEnd.AreaNo == "B12")
--
Gitblit v1.8.0