From 533df0275a3090951af5d3bf8f5fdbeea2ce44b8 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期五, 17 一月 2025 09:42:11 +0800
Subject: [PATCH] WCS出库完成接口修改，PDA的AGV转运调度小车修改
---
Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs | 4 ++--
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 16 +++++++---------
Wms/Wms/Controllers/DownApiController.cs | 4 ++--
Pda/View/SoSetting/palletOut.html | 2 ++
4 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/Pda/View/SoSetting/palletOut.html b/Pda/View/SoSetting/palletOut.html
index 0cbc81f..0e7ac26 100644
--- a/Pda/View/SoSetting/palletOut.html
+++ b/Pda/View/SoSetting/palletOut.html
@@ -74,6 +74,8 @@
<option value="044">044</option>
<option value="051">051</option>
<option value="059">059</option>
+ <option value="440">440</option>
+ <option value="443">443</option>
</select>
<!-- <img src="/assets/down_arraw.png" > -->
</div>
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index 59aeddc..0873805 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -799,10 +799,10 @@
{
throw new Exception("鎵樼洏鍌ㄤ綅淇℃伅涓嶅瓨鍦�,璇锋鏌�!");
}
- if (models.WareHouseNo != "W02")
- {
- throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
- }
+ //if (models.WareHouseNo != "W02")
+ //{
+ // throw new Exception("璇ユ墭鐩樻湭鍦ㄥ钩搴撳唴,璇锋鏌�!");
+ //}
var storageLocat = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == models.LocatNo);
if (storageLocat == null)
{
@@ -1351,9 +1351,7 @@
- var IsTrue = false;
- while (IsTrue == true)
- {
+
// 姝ｅ紡杩愯绋嬪簭鏀惧紑
string str = "";
var list2 = agvTaskList.Select(m => m.TaskCode).ToList();
@@ -1375,7 +1373,7 @@
//鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
new TaskServer().EditTaskIssueOk(list2, time1, time2);
str += "涓嬪彂鎴愬姛";
- IsTrue = true;
+ //IsTrue = true;
}
if (agvModel.Code == "1")
{
@@ -1387,7 +1385,7 @@
{
throw new Exception(ex.Message);
}
- }
+
#endregion
diff --git a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
index 71613e4..e9f2244 100644
--- a/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
+++ b/Wms/WMS.BLL/BllSoServer/ExportNoticeServer.cs
@@ -2251,8 +2251,8 @@
var outLine = "";
if (userId == 0)
{
- TtaskNo = taskNo.Substring(0, taskNo.Length - 4);
- outLine = taskNo.Substring(taskNo.Length - 4, 3);
+ TtaskNo = taskNo.Substring(0, taskNo.Length - 3);
+ outLine = taskNo.Substring(taskNo.Length - 3, 3);
}
//褰撳墠浠诲姟淇℃伅
var task = Db.Queryable<LogTask>().First(m => m.TaskNo == TtaskNo && m.IsDel == "0");
diff --git a/Wms/Wms/Controllers/DownApiController.cs b/Wms/Wms/Controllers/DownApiController.cs
index a578558..8499efb 100644
--- a/Wms/Wms/Controllers/DownApiController.cs
+++ b/Wms/Wms/Controllers/DownApiController.cs
@@ -364,8 +364,8 @@
}
//鎺ユ敹鏃堕棿
var time1 = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
- var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 鍒ゆ柇鍗曟嵁绫诲瀷鍏ュ嚭绉�
- switch (orderType)
+ //var orderType = _taskSvc.GetTaskOrderType(model.TaskNo);// 鍒ゆ柇鍗曟嵁绫诲瀷鍏ュ嚭绉�
+ switch (model.TaskType)
{
case "0"://鍏ュ簱瀹屾垚浠诲姟
if (model.TaskType == "0")//0锛氬叆搴� 1锛氬嚭搴� 2锛氱Щ搴�
--
Gitblit v1.8.0