From 2920728d7908da2ee196f3af8b3d1c635696e9a1 Mon Sep 17 00:00:00 2001
From: zwc <526854230@qq.com>
Date: 星期三, 15 一月 2025 15:47:15 +0800
Subject: [PATCH] 修改问题
---
Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs | 327 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 285 insertions(+), 42 deletions(-)
diff --git a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
index b4bb031..b146a20 100644
--- a/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
+++ b/Wms/WMS.BLL/BllPdaServer/PdaCrServer.cs
@@ -1,4 +1,5 @@
锘縰sing System;
+using System.Collections;
using System.Collections.Generic;
using System.Linq;
using System.Security.Policy;
@@ -6,6 +7,7 @@
using System.Threading.Tasks;
using Model.InterFaceModel;
using Model.ModelDto.BllCheckDto;
+using Model.ModelDto.LogDto;
using Model.ModelDto.PdaDto;
using Model.ModelDto.SysDto;
using Model.ModelVm;
@@ -904,7 +906,8 @@
}
try
{
- string EndLocat = string.Empty;//鐩爣浣嶇疆
+ string EndLocat = string.Empty,OrderTy = "";//鐩爣浣嶇疆
+
var log = Db.Queryable<LogTask>().First(w => w.IsDel == "0" && w.PalletNo == palletNo && (w.Status == "0" || w.Status == "1"));
if (log != null)
@@ -924,10 +927,14 @@
throw new Exception("鎵�閫夊尯鍩熶俊鎭笉瀛樺湪,璇锋鏌�!");
}
EndLocat = GetLocat(areaNo, stockDetail.SkuNo, stockDetail.LotNo, palletNo);
+ OrderTy = "3";//绉诲簱
}
else
{
EndLocat = ruku;
+ OrderTy = "0";//鍏ュ簱
+
+
}
var stock = Db.Queryable<DataStock>().First(w => w.IsDel == "0" && w.SkuNo == stockDetail.SkuNo && w.LotNo == stockDetail.LotNo);
if (stock == null)
@@ -980,7 +987,7 @@
IsFinish = 1,//鏄惁鍙畬鎴�
Type = "2",//浠诲姟绫诲瀷 0 鍏ュ簱浠诲姟 1 鍑哄簱浠诲姟 2 绉诲簱浠诲姟
Status = "0",//浠诲姟鐘舵��0锛氱瓑寰呮墽琛�1姝ｅ湪鎵ц2鎵ц瀹屾垚
- OrderType = "3",//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
+ OrderType = OrderTy,//0 鍏ュ簱鍗� 1 鍑哄簱鍗� 2 鐩樼偣鍗� 3 绉诲簱鍗�
CreateTime = DateTime.Now
};
@@ -1009,53 +1016,105 @@
#region 鍛煎彨灏忚溅浠ｇ爜
+ var endlono = EndLocat;
+ var tasktype = "D00"; //榛樿涓虹偣鍒扮偣浠诲姟
+ //鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
+ switch (storageLocatEnd.AreaNo)
+ {
+ case "B13" :
+ tasktype = "D02"; // 鍙犳墭浠诲姟锛堢洰鐨勫湴鍧�涓虹┖鎵樼洏鏀堕泦鍖猴級
+ break;
+ case "B15":
+ tasktype = "D01"; // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
+ break;
+ }
+
+ //缂撳瓨搴撲綅杞崲 3妤煎師杈呮枡Y003_001锛孻003_002锛孻003_003 1妤糦138_001鍒癥138_021澶栧寘缂撳瓨鍖� 1妤糦128_001鍒癥128_015鍐呭寘缂撳瓨鍖�
+ if (storageLocatEnd.AreaNo == "B12")
+ {
+ switch (EndLocat.ToString().Substring(4, 1))
+ {
+ case "1":
+ endlono = "Y003_00" + EndLocat.ToString().Substring(6, 1);
+ tasktype = "D00"; //鐐瑰埌鐐逛换鍔�
+ break;
+ case "2":
+ endlono = "Y138_0" + EndLocat.ToString().Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ case "3":
+ endlono = "Y128_0" + EndLocat.ToString().Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ default:
+ break;
+ }
+ }
+
+ //鐐瑰埌鐐规寚浠ら泦鍚�
+ object[] position = new object[2];
+ position[0] = new
+ {
+ positionCode = stockDetail.LocatNo,
+ type = "00"
+ };
+ position[1] = new
+ {
+ positionCode = endlono,
+ type = "00"
+ };
List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+ Random r = new Random();
+ long ran =DateTime.Now.Ticks;
AgvSchedulingTask agvTask = new AgvSchedulingTask();
- agvTask.ReqCode = taskNo;
- agvTask.TaskTyp = "F01";
- agvTask.WbCode = "";
- agvTask.PositionCodePath = null;
- agvTask.PodCode = "-1";
+ agvTask.TaskCode = taskNo;
+ agvTask.ReqCode = ran.ToString();
+ agvTask.TaskTyp = tasktype;
+ agvTask.PositionCodePath = position;
+ agvTask.CtnrTyp = "1";
+ if (tasktype == "D02")
+ {
+ agvTask.CtnrNum = "10"; //鍙犳墭浠诲姟闇�瑕佷笅鍙戠┖鎵樼洏鏁伴噺
+ }
agvTaskList.Add(agvTask);
- var IsTrue = false;
- while (IsTrue == true)
+
+ // 姝ｅ紡杩愯绋嬪簭鏀惧紑
+ string str = "";
+ var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ jsonData = jsonData.Substring(1, jsonData.Length - 1);
+ jsonData = jsonData.Substring(0, jsonData.Length - 1);
+ string response = "";
+
+ try
{
- // 姝ｅ紡杩愯绋嬪簭鏀惧紑
- string str = "";
- var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
- var jsonData = JsonConvert.SerializeObject(agvTaskList);
- string response = "";
+ var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
+ response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
- try
+ //////瑙ｆ瀽杩斿洖鏁版嵁
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+ if (agvModel.Code == "0")
{
- var time1 = DateTime.Now;//鍙戦�佹椂闂� .ToString("yyyy-MM-dd HH:mm:ss")
- response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
- var time2 = DateTime.Now;//杩斿洖鏃堕棿 .ToString("yyyy-MM-dd HH:mm:ss")
-
- //////瑙ｆ瀽杩斿洖鏁版嵁
- var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
- if (agvModel.Code == "0")
- {
- //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
- new TaskServer().EditTaskIssueOk(list2, time1, time2);
- str += "涓嬪彂鎴愬姛";
- IsTrue = true;
- }
- if (agvModel.Code == "1")
- {
- new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
- throw new Exception(agvModel.Message);
- }
+ //鏇存敼浠诲姟鐨勫彂閫佽繑鍥炴椂闂�//
+ new TaskServer().EditTaskIssueOk(list2, time1, time2);
+ str += "涓嬪彂鎴愬姛";
}
- catch (Exception ex)
+ if (agvModel.Code == "1")
{
- throw new Exception(ex.Message);
+ new TaskServer().EditTaskIssueNo(list2, time1, time2, agvModel.Message);
+ throw new Exception(agvModel.Message);
}
}
+ catch (Exception ex)
+ {
+ throw new Exception(ex.Message);
+ }
+
#endregion
//鎻愪氦浜嬪姟
@@ -1074,7 +1133,7 @@
/// <param name="palletNo"></param>
/// <param name="areaNo"></param>
/// <param name="userId"></param>
- public List<string> AgvTransport2(string soNo, string palletNo, string areaNo, int userId, string url)
+ public List<string> AgvTransport2(string soNo, string palletNo, string areaNo,string ruku, int userId, string url)
{
if (string.IsNullOrEmpty(soNo))
{
@@ -1196,12 +1255,58 @@
};
Db.Insertable(exTask).ExecuteCommand();
+ var endlono = EndLocat;
+ var tasktype = "D00";
+
+ //鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
+ switch (storageLocatEnd.AreaNo)
+ {
+ case "B13":
+ tasktype = "D02"; // 鍙犳墭浠诲姟锛堢洰鐨勫湴鍧�涓虹┖鎵樼洏鏀堕泦鍖猴級
+ break;
+ case "B15":
+ tasktype = "D01"; // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
+ break;
+ }
+
+ //缂撳瓨搴撲綅杞崲 3妤煎師杈呮枡Y003_001锛孻003_002锛孻003_003 1妤糦138_001鍒癥138_021澶栧寘缂撳瓨鍖� 1妤糦128_001鍒癥128_015鍐呭寘缂撳瓨鍖�
+ if (storageLocatEnd.AreaNo == "B12")
+ {
+ switch (EndLocat.ToString().Substring(4, 1))
+ {
+ case "1":
+ endlono = "Y003_00" + EndLocat.ToString().Substring(6, 1);
+ break;
+ case "2":
+ endlono = "Y138_0" + EndLocat.ToString().Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ case "3":
+ endlono = "Y128_0" + EndLocat.ToString().Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ default:
+ break;
+ }
+ }
+
+ //鐐瑰埌鐐规寚浠ら泦鍚�
+ object[] position = new object[2];
+ position[0] = new
+ {
+ positionCode = item.LocatNo,
+ type = "00"
+ };
+ position[1] = new
+ {
+ positionCode = endlono,
+ type = "00"
+ };
+
AgvSchedulingTask agvTask = new AgvSchedulingTask();
agvTask.ReqCode = taskNo;
- agvTask.TaskTyp = "F01";
- agvTask.WbCode = "";
- agvTask.PositionCodePath = null;
- agvTask.PodCode = "-1";
+ agvTask.TaskTyp = tasktype;
+ agvTask.PositionCodePath = position;
agvTaskList.Add(agvTask);
@@ -1249,6 +1354,8 @@
string str = "";
var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ jsonData = jsonData.Substring(1, jsonData.Length - 1);
+ jsonData = jsonData.Substring(0, jsonData.Length - 1);
string response = "";
try
@@ -1290,6 +1397,126 @@
throw new Exception(ex.Message);
}
}
+
+ /// <summary>
+ /// agv璋冨害浠诲姟涓嬪彂
+ /// </summary>
+ /// <param name="type">鎼繍绫诲瀷</param>
+ /// <param name="taskno">浠诲姟鍙�</param>
+ /// <param name="positionStart">璧峰鍦板潃</param>
+ /// <param name="positionEnd">鐩殑鍦板潃</param> 2
+ /// <param name="url">鎺ュ彛URL</param>
+ public OutCommanAgvDto AGVTask(string type, string taskno, string positionStart, string positionEnd ,string url)
+ {
+
+ var endlono = positionEnd;
+ var tasktype = type;
+ var storageLocatEnd = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == endlono && w.Flag == "0" && w.Status == "0");
+ if (storageLocatEnd == null)
+ {
+ throw new Exception("鐢熸垚鐨凙GV浠诲姟鐩殑鍦板潃涓嶆纭�");
+ }
+ //鏍规嵁鐩殑鍦板潃搴撳尯鑾峰彇灏忚溅浠诲姟绫诲瀷
+ switch (storageLocatEnd.AreaNo)
+ {
+ case "B13":
+ tasktype = "D02"; // 鍙犳墭浠诲姟锛堢洰鐨勫湴鍧�涓虹┖鎵樼洏鏀堕泦鍖猴級
+ break;
+ case "B15":
+ tasktype = "D01"; // 鎷嗘墭浠诲姟锛堢洰鐨勫湴鍧�涓烘嫞璐у尯锛�
+ break;
+ }
+
+ // MES鐢宠澶囨枡锛屽鏂欏尯搴撲綅闇�瑕佽浆鎹� 杞﹂棿澶囨枡缂撳瓨浣嶅悕绉帮細3妤煎師杈呮枡Y003_001-->Y003_003 1妤煎鍖呯紦瀛樺尯Y138_001-->Y138_021 1妤煎唴鍖呯紦瀛樺尯Y128_001-->Y128_015
+ if (storageLocatEnd.AreaNo == "B12")
+ {
+ switch (endlono.ToString().Substring(4, 1))
+ {
+ case "1":
+ endlono = "Y003_00" + endlono.Substring(6, 1);
+ break;
+ case "2":
+ endlono = "Y138_0" + endlono.Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ case "3":
+ endlono = "Y128_0" + endlono.Substring(5, 2);
+ tasktype = "F20"; //鐢垫浠诲姟
+ break;
+ default:
+ break;
+ }
+ }
+ List<AgvSchedulingTask> agvTaskList = new List<AgvSchedulingTask>();
+
+ object[] position = new object[2];
+ position[0] = new
+ {
+ positionCode = positionStart,
+ type = "00"
+ };
+ position[1] = new
+ {
+ positionCode = endlono,
+ type = "00"
+ };
+
+ AgvSchedulingTask agvTask = new AgvSchedulingTask();
+ agvTask.ReqCode = taskno; //agv璇锋眰缂栧彿锛岄渶瑕侀殢鏈虹敓鎴� 锛堟渶澶�32浣嶏級
+ agvTask.TaskCode = taskno; //浠诲姟鍙�
+ agvTask.TaskTyp = tasktype; //鎼繍绫诲瀷
+ agvTask.PositionCodePath = position; //璧峰鍜岀洰鐨勪綅闆嗗悎
+ agvTask.CtnrTyp = "1"; //瀹瑰櫒绫诲瀷锛屽�间负1
+ if (tasktype == "D02")
+ {
+ agvTask.CtnrNum = "10"; //鍙犳墭浠诲姟闇�瑕佷笅鍙戠┖鎵樼洏鏁伴噺
+ }
+
+ agvTaskList.Add(agvTask);
+
+ string str = "";
+ var list2 = agvTaskList.Select(m => m.ReqCode).ToList();
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ jsonData = jsonData.Substring(1, jsonData.Length-1);
+ jsonData = jsonData.Substring(0, jsonData.Length - 1);
+ var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
+
+ return agvModel;
+ }
+
+ /// <summary>
+ /// agv浠诲姟鍙栨秷
+ /// </summary>
+ /// <param name="taskno">鍙栨秷浠诲姟缂栧彿</param>
+ /// <param name="url">鎺ュ彛URL</param>
+ public void cancelTask(string taskno,string url)
+ {
+ try
+ {
+ AgvCancelTask agvTaskList = new AgvCancelTask();
+ agvTaskList.ReqCode = "006"; //闅忔満鐢熸垚
+ agvTaskList.TaskCode = taskno.ToString();
+ //agvTaskList.ReqTime = DateTime.Now.ToString();
+
+ var jsonData = JsonConvert.SerializeObject(agvTaskList);
+ var response = HttpHelper.DoPost(url, jsonData, "涓嬪彂缁橝GV杞繍鍛戒护", "AGV");
+ var agvModel = JsonConvert.DeserializeObject<cancelTaskModel>(response);
+
+ if (agvModel.Code != "0")
+ {
+ throw new Exception("涓嬪彂AGV鍙栨秷浠诲姟澶辫触");
+ }
+
+ }
+ catch (Exception ex)
+ {
+
+ throw ex;
+ }
+
+ }
+
/// <summary>
/// 鏍规嵁鍖哄煙鍒嗛厤鍌ㄤ綅
/// </summary>
@@ -1478,12 +1705,28 @@
{
{"Authorization",token }
};
+ var endlono = EndLocat.LocatNo;
+ //缂撳瓨搴撲綅杞崲
+ switch (EndLocat.LocatNo.ToString().Substring(4, 1))
+ {
+ case "1":
+ endlono = "Y003_00" + EndLocat.LocatNo.ToString().Substring(6, 1);
+ break;
+ case "2":
+ endlono = "Y138_0" + EndLocat.LocatNo.ToString().Substring(5, 2);
+ break;
+ case"3":
+ endlono = "Y128_0" + EndLocat.LocatNo.ToString().Substring(5, 2);
+ break;
+ default:
+ break;
+ }
var mescode = Db.Queryable<BllExportNotice>().Where(w => w.SONo == stockDetail.First().SONo).First();
var mesData = new RequertBeiliaoModel()
{
morder_no = mescode.OrderCode,
pallet = stockDetail.First().PalletNo,
- layer_no = EndLocat.LocatNo,
+ layer_no = endlono,
items = data
};
var jsonData = JsonConvert.SerializeObject(mesData);
@@ -1501,7 +1744,7 @@
//娣诲姞鎿嶄綔鏃ュ織璁板綍
- var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "AGV杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
+ var k = new OperationCrServer().AddLogOperationCr("PDA妯″潡", "浜哄伐杞繍", palletNo, "绉诲簱", $"PDA鍛煎彨灏忚溅瀵规墭鐩樺彿锛歿palletNo}鍙戣捣杞繍", userId);
//鎻愪氦浜嬪姟
Db.CommitTran();
--
Gitblit v1.8.0