From bb8b689c2922ff7d819e512887539f1680689c11 Mon Sep 17 00:00:00 2001
From: zhaowc <526854230@qq.com>
Date: 星期六, 22 六月 2024 15:50:11 +0800
Subject: [PATCH] Merge branch 'zwc' of http://47.95.120.53:8083/r/JC23WMS-2 into zwc
---
Wms/WMS.BLL/BllTransServer/RcsServer.cs | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/Wms/WMS.BLL/BllTransServer/RcsServer.cs b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
index 9e5242b..930861c 100644
--- a/Wms/WMS.BLL/BllTransServer/RcsServer.cs
+++ b/Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -10,11 +10,12 @@
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
using WMS.Entity.SysEntity;
+using WMS.IBLL.IBllTransServer;
using static Model.InterFaceModel.RCSModel;
namespace WMS.BLL.BllTransServer
{
- public class RcsServer
+ public class RcsServer:IRcsServer
{
private static readonly SqlSugarScope Db = DataContext.Db;
/// <summary>
@@ -185,18 +186,18 @@
/// <param name="agvCode"></param>
/// <param name="url">RCS鍦板潃</param>
/// <returns></returns>
- public string genAgvSchedulingTask(string taskCode, string taskType, string startPos, string endPos, string agvCode,string url, ref genAgvSchedulingTaskRep cbrep)
+ public string genAgvSchedulingTask(AgvTask agv,string url, ref genAgvSchedulingTaskRep cbrep)
{
try
{
PositionCodePath pcd1 = new PositionCodePath()
{
- positionCode = startPos.ToString(),
+ positionCode = agv.startPos.ToString(),
type = "00",
};
PositionCodePath pcd2 = new PositionCodePath()
{
- positionCode = endPos.ToString(),
+ positionCode = agv.endPos.ToString(),
type = "00",
};
List<PositionCodePath> lst = new List<PositionCodePath>();
@@ -204,17 +205,17 @@
lst.Add(pcd2);
genAgvSchedulingTaskReq cbreq = new genAgvSchedulingTaskReq()
{
- reqCode = taskCode.ToString(),
- taskCode = taskCode.ToString(),
- taskTyp = taskType,
+ reqCode = agv.taskCode.ToString(),
+ taskCode = agv.taskCode.ToString(),
+ taskTyp = agv.taskType,
positionCodePath = lst,
podCode = "",
- agvCode = agvCode,
+ agvCode = agv.agvCode,
ctnrTyp = "1",
//ctnrCode="2",
};
- if (startPos == "50")
+ if (agv.startPos == "50")
{
cbreq.ctnrTyp = "4";
}
--
Gitblit v1.8.0