wxw
3 天以前 6be6a1e453861fa0beb818236fdd8183024074c4
增加和MES对接接口
6个文件已修改
193 ■■■■ 已修改文件
Wms/Model/InterFaceModel/RCSModel.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllTransServer/RcsServer.cs 153 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.IBLL/IBllTransServer/IRcsServer.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Controllers/DownApiController.cs 20 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/Tools/ApiUrlConfig.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/appsettings.json 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Model/InterFaceModel/RCSModel.cs
@@ -54,9 +54,9 @@
        public class ReMes
        {
            public string Success { get; set; }
            public string Result { get; set; }
            public string Message { get; set; }
            public string state { get; set; }
            public string message { get; set; }
            public string data { get; set; }
        }
        public class TaskDetial
Wms/WMS.BLL/BllTransServer/RcsServer.cs
@@ -38,7 +38,7 @@
        /// <param name="url"></param>
        /// <param name="taskNo"></param>
        /// <exception cref="Exception"></exception>
        public void GetPalletNo(Pallnetmsg model, string url, out string taskNo)
        public void GetPalletNo(Pallnetmsg model, string url,string urlMes, out string taskNo)
        {
            lock (GetPalleLock)
            {
@@ -60,7 +60,6 @@
                    //叫桶设备所在储位信息(目标储位)
                    var endLoction = new SysStorageLocat();
                    var urlMes = "";//回传MES的接口地址
                    var noticeNo = "0";//出入库单据明细ID
                    //所有待分配的桶
@@ -252,36 +251,28 @@
                                foreach (var item in palletList)
                                {
                                    #region 去掉MES
                                    //string jsonReq = JsonConvert.SerializeObject(item.PalletNo);
                                    //var response = HttpHelper.DoPost(urlMes, jsonReq, "回传MES脏桶编号", "RCS").ToString();
                                    //var obj = JsonConvert.DeserializeObject<ReMes>(response);//解析返回数据
                                    //if (obj.Success == "0")
                                    //{
                                    //    if (obj.Result != "1")//不可清洗,将脏桶冻结
                                    //    {
                                    //        item.Status = "5";//异常冻结
                                    //        //修改该桶库存状态
                                    //        Db.Updateable(item).ExecuteCommand();
                                    var reObj = new
                                    {
                                        devive = item.PackagNo
                                    };
                                    string jsonReq = JsonConvert.SerializeObject(reObj);
                                    var response = HttpHelper.DoPost(urlMes, jsonReq, "回传MES脏桶编号判断是否可清洗", "MES").ToString();
                                    var obj = JsonConvert.DeserializeObject<ReMes>(response);//解析返回数据
                                    if (obj.state == "200")
                                    {
                                        if (obj.data != "1")//不可清洗,将脏桶冻结
                                        {
                                            item.Status = "5";//异常冻结
                                            //修改该桶库存状态
                                            Db.Updateable(item).ExecuteCommand();
                                    //        continue;
                                    //    }
                                    //    //下发小车任务
                                    //    var task2 = new TaskDetial
                                    //    {
                                    //        Startport = item.LocatNo,
                                    //        Endport = model.Location,
                                    //        Pallno = item.PalletNo,
                                    //        Type = model.Type,
                                    //        Crtype = "1",
                                    //        Noticedetailno = int.Parse(noticeno),
                                    //    };
                                    //    CreateLotTask(task2);
                                    //    return;
                                    //}
                                    //else
                                    //{
                                    //    throw new Exception("回传MES净桶编号失败!");
                                    //}
                                            continue;
                                        }
                                    }
                                    else
                                    {
                                        throw new Exception("叫脏桶回传MES判断失败!");
                                    }
                                    #endregion
                                    item.Status = "2";//分配状态 0:待分配,1:部分分配 , 2:已分配
@@ -831,22 +822,97 @@
        {
            try
            {
                //桶信息
                var detail = Db.Queryable<DataStockDetail>().First(w => w.PalletNo == pallnetmsg.PalletNo && w.PalletStatus == "3");
                if (detail == null)
                {
                    throw new Exception($"库存中不存在桶号为:{pallnetmsg.PalletNo}的库存!");
                }
                //下发小车任务
                //设备信息
                var deviceInfo = Db.Queryable<SysStorageArea>().First(w => w.IsDel == "0" && w.DeviceCode.Contains(pallnetmsg.Location));
                if (deviceInfo == null)
                {
                    throw new Exception($"不存在设备号为:{pallnetmsg.Location}的设备!");
                }
                //目标储位信息
                var endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == deviceInfo.WareHouseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);// Column=1 清洗储位,Column=2 清洗完料储位
                if (endLoction == null)
                {
                    throw new Exception("叫桶设备目标储位信息不存在");
                }
                detail.Status = "2";//分配状态 0:待分配,1:部分分配 , 2:已分配
                 //更新桶库存明细
                Db.Updateable(detail).ExecuteCommand();
                //起始储位地址信息
                var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == detail.LocatNo);
                if (startLoction == null)
                {
                    throw new Exception($"桶号:{detail.PalletNo}储位信息{detail.LocatNo}不存在");
                }
                var taskNo = new Common().GetMaxNo("TN");//任务号
                var logTaskEntry = new LogTask
                {
                    TaskNo = taskNo,
                    Sender = "WMS",
                    Receiver = "RCS",
                    //IsSuccess = 1, //是否下发成功 0失败 1成功
                    SendDate = DateTime.Now,  //发送时间
                                              //BackDate = DateTime.Now,  //返回时间
                    StartLocat = startLoction.LocatNo,//起始位置
                    EndLocat = endLoction.LocatNo,//目标位置
                    PalletNo = detail.PalletNo,//托盘码
                    IsSend = 1,//是否可再次下发
                    IsCancel = 1,//是否可取消
                    IsFinish = 1,//是否可完成
                    Type = "1",//任务类型 0 入库任务 1 出库任务  2 移库任务
                    OrderType = "3",//单据类型 0 入库 1 出库 3 移库
                    Status = "0",//任务状态0:等待执行1正在执行2执行完成
                    NoticeDetailNo = 0,
                    Msg = $"MES下发清洗指定脏桶,桶号:{pallnetmsg.PalletNo},设备号:{pallnetmsg.Location}", //关键信息
                    LotNo = ""//批次号
                };
                //组织下发小车任务信息
                var task = new TaskDetial
                {
                    Startport = detail.LocatNo,
                    Endport = pallnetmsg.Location,
                    Pallno = detail.PalletNo,
                    Crtype = "1",
                    Taskno = taskNo,//任务号
                    Startport = startLoction.LocatNo,//起始位置
                    Endport = endLoction.LocatNo,//目标位置
                    Pallno = detail.PalletNo,//桶号
                    Crtype = "1",//叫桶
                    WareHouseNo = detail.WareHouseNo//车间编码
                };
                string taskNo = "";
                //给下车下发任务
                logTaskEntry.SendDate = DateTime.Now;//发送时间
                string agvMsg = string.Empty;
                CreateTaskForAgv(task, url, out agvMsg);
                var agvResult = CreateTaskForAgv(task, url, out agvMsg);
                if (agvResult)//成功
                {
                    //请求成功修改任务表相应字段状态
                    logTaskEntry.IsSuccess = 1;
                    logTaskEntry.IsSend = 0;
                    //logTaskEntry.IsCancel = 0;
                    logTaskEntry.BackDate = DateTime.Now;
                    logTaskEntry.Status = "1";//正在执行
                    Db.Insertable(logTaskEntry).ExecuteCommand();
                    startLoction.Status = "3";//出库中
                    Db.Updateable(startLoction).ExecuteCommand();
                    endLoction.Status = "2";//入库中
                    Db.Updateable(endLoction).ExecuteCommand();
                }
                else//失败
                {
                    logTaskEntry.IsSuccess = 0;
                    logTaskEntry.Information = agvMsg;
                    Db.Insertable(logTaskEntry).ExecuteCommand();
                }
                //提交事务
                Db.CommitTran();
            }
            catch (Exception ex)
            {
@@ -1294,7 +1360,14 @@
                agvTask.taskTyp = "Z5";
            }
            // 正式运行程序放开
            if (string.IsNullOrEmpty(url))//测试系统
            {
                result = true;
                agvMsg = "";
            }
            else//正式系统
            {
            var jsonData = JsonConvert.SerializeObject(agvTask);
            string response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运命令", "AGV");
            //解析返回数据 
@@ -1321,6 +1394,8 @@
                agvMsg = agvModel.Message;
            }
            }
            return result;
            #endregion
        }
Wms/WMS.IBLL/IBllTransServer/IRcsServer.cs
@@ -14,7 +14,7 @@
        /// <param name="warehouseno">库区</param>
        /// <param name="type">叫料类型</param>
        /// <returns></returns>
        public void GetPalletNo(Pallnetmsg pallnetmsg, string url, out string taskNo);
        public void GetPalletNo(Pallnetmsg pallnetmsg, string url, string urlMes, out string taskNo);
        /// <summary>
        /// 将净桶改为脏桶并拉到脏桶区
Wms/Wms/Controllers/DownApiController.cs
@@ -21,6 +21,7 @@
using Microsoft.Extensions.Logging;
using ZXing.QrCode.Internal;
using Model.ModelVm.BllCheckVm;
using System.DirectoryServices.Protocols;
namespace Wms.Controllers
{
@@ -683,7 +684,7 @@
                }
                string taskNo = "";
                //具体处理方法
                _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, out taskNo);
                _rcsserver.GetPalletNo(pallmsg, _config.AgvHost + _config.GenAgvSchedulingTask, _config.MesHost + _config.MesPanClearPallet, out taskNo);
                resultModel = new AgvResultModel { code = "0", message = "叫桶成功!", data = taskNo, reqCode = "" };
                var jsonData2 = JsonConvert.SerializeObject(resultModel);
@@ -757,16 +758,20 @@
            }
        }
        /// <summary>
        /// 将净桶改为脏桶并拉到脏桶区
        /// MES将净桶改为脏桶并拉到脏桶区
        /// </summary>
        /// <param name="pallmsg"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult ChangePalletStatus(Pallnetmsg pallmsg)
        {
            var logStr = $@".\log\MES\MES将净桶改为脏桶并拉到脏桶区" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            var result = new ErpModel { Success = -1, Message = "", };
            try
            {
                var jsonData = JsonConvert.SerializeObject(pallmsg);
                LogFile.SaveLogToFile($"MES将净桶改为脏桶并拉到脏桶区-请求报文:( {jsonData} ),", logStr);
                if (string.IsNullOrWhiteSpace(pallmsg.PalletNo))
                {
                    result.Message = "桶编号不能为空!";
@@ -779,22 +784,28 @@
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"MES将净桶改为脏桶并拉到脏桶区异常:( {e.Message} ),", logStr);
                result.Message = e.Message;
                return Ok(result);
            }
        }
        /// <summary>
        /// MES下发清洗锁定脏桶
        /// MES下发清洗指定脏桶
        /// </summary>
        /// <param name="pallmsg"></param>
        /// <returns></returns>
        [HttpPost]
        public IActionResult CleanPallet(Pallnetmsg pallmsg)
        {
            var result = new ErpModel { Success = -1, Message = "", };
            var logStr = $@".\log\MES\MES下发清洗指定脏桶" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
            ErpModel result = new ErpModel { Success = -1, Message = "" };
            try
            {
                var jsonData = JsonConvert.SerializeObject(pallmsg);
                LogFile.SaveLogToFile($"MES下发清洗指定脏桶-请求报文:( {jsonData} ),", logStr);
                if (string.IsNullOrWhiteSpace(pallmsg.Location))
                {
                    result.Message = "叫料位置为空!";
@@ -812,6 +823,7 @@
            }
            catch (Exception e)
            {
                LogFile.SaveLogToFile($"MES下发清洗指定脏桶异常:( {e.Message} ),", logStr);
                result.Message = e.Message;
                return Ok(result);
            }
Wms/Wms/Tools/ApiUrlConfig.cs
@@ -19,6 +19,10 @@
        /// 追溯或赋码的IP
        /// </summary>
        public string BoxHost { get; set; }
        /// <summary>
        /// MES的IP
        /// </summary>
        public string MesHost { get; set; }
        /// <summary>
        /// Agv的IP
@@ -46,6 +50,10 @@
        /// 获取箱码信息--从追溯或赋码系统
        /// </summary>
        public string GetBoxUrl { get; set; }
        /// <summary>
        /// MES判断脏桶是否可清洗
        /// </summary>
        public string MesPanClearPallet { get; set; }
        #endregion
        
Wms/Wms/appsettings.json
@@ -30,6 +30,7 @@
    "WcsHost": "http://localhost:57061", //wcsIPhttp://localhost:57061/
    "BoxHost": "http://10.110.24.30:8081", //boxIP
    "AgvHost": "http://172.15.1.74:8182", //agvIP
    "MesHost": "http://172.16.106.200:5100", //mesIP
    "IssueComApiUrl": "/api/WCSApi/AddTasks", //下发命令(出库、移库)
    "IssueComApiUrl2": "/api/WCSApi/AddTask", //重新下发命令(出库、移库)
@@ -41,7 +42,8 @@
    "EditLocateUrl": "/api/WCSApi/EditLocatStatus", //同步修改储位信息
    //MES
    "MesPanClearPallet": "/ibps/mes/v3/webservice/mes-si/interfaceListener/CHECK_DEVICE_CLEAN_METHOD",
    // AGV
    "GenAgvSchedulingTask": "/rcms/services/rest/hikRpcService/genAgvSchedulingTask", //生成任务单接口
    "ContinueTask": "/rcms/services/rest/hikRpcService/continueTask", //继续执行任务接口