优化叫脏桶处理逻辑

wxw

3 天以前 34971d1815420aab6548d1603fee08c787d53a23

 Wms/WMS.BLL/BllTransServer/RcsServer.cs

@@ -14,6 +14,7 @@
using WMS.BLL.LogServer;
using WMS.DAL;
using WMS.Entity.BllAsnEntity;
using WMS.Entity.BllQualityEntity;
using WMS.Entity.BllSoEntity;
using WMS.Entity.Context;
using WMS.Entity.DataEntity;
@@ -27,7 +28,8 @@
{
    public class RcsServer:IRcsServer
    {
        private readonly object RcsLock = new object();
        private static readonly object GetPalleLock = new object();
        private static readonly object ApplyLocatLock = new object();

        private static readonly SqlSugarScope Db = DataContext.Db;
        /// <summary>
@@ -37,9 +39,9 @@
        /// <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 (RcsLock)
            lock (GetPalleLock)
            {
                try
                {
@@ -59,7 +61,6 @@
                    //叫桶设备所在储位信息（目标储位）
                    var endLoction = new SysStorageLocat();

                    var urlMes = "";//回传MES的接口地址
                    var noticeNo = "0";//出入库单据明细ID

                    //所有待分配的桶
@@ -115,6 +116,24 @@
                                Db.Updateable(pallet).ExecuteCommand();

                                taskMsg = "设备叫净桶任务";

                                try
                                {
                                    #region 请求MES接口发送净桶编号
                                    var reObj = new
                                    {
                                        deviceCode = pallet.PackagNo,
                                        reqType = "1"
                                    };
                                    string jsonReq = JsonConvert.SerializeObject(reObj);
                                    var response = HttpHelper.DoPost(urlMes, jsonReq, "回传MES净桶编号接料设备", "MES").ToString();
                                    var obj = JsonConvert.DeserializeObject<ReMes>(response);//解析返回数据                                   
                                    #endregion
                                }
                                catch
                                { 
                                
                                }
                            }
                            break;
                        case "1"://混料设备叫料桶（混料）
@@ -216,7 +235,7 @@
                            }
                            break;
                        case "3"://清洗设备叫脏桶
                            {
                            {                               
                                //叫桶目标储位地址信息
                                endLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.WareHouseNo == houseNo && w.AreaNo == deviceInfo.AreaNo && w.Column == 1);// Column=1 清洗储位，Column=2 清洗完料储位 
                                if (endLoction == null)
@@ -247,113 +266,55 @@
                                    throw new Exception("暂无脏桶可分配");
                                }
                                taskMsg = "设备叫脏桶任务";
                                int callResult = 0;//是否叫脏桶成功
                                //遍历库存脏桶，返回MES验证
                                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();
                                    #region 请求MES接口验证该桶是否支持小清洗
                                    var reObj = new
                                    {
                                        deviceCode = item.PalletNo,
                                        reqType = "0"
                                    };
                                    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.status != "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净桶编号失败！");
                                    //}
                                            callResult = 1;
                                            continue;
                                        }
                                    }
                                    else
                                    {
                                        throw new Exception("叫脏桶回传MES判断失败！");
                                    }
                                    #endregion

                                    item.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                                                      //更新桶库存明细
                                    //更新桶库存明细
                                    Db.Updateable(item).ExecuteCommand();
                                    //起始储位地址信息
                                    var startLoction2 = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == item.LocatNo);
                                    if (startLoction2 == null)
                                    {
                                        throw new Exception($"起始目标储位信息不存在，桶号：{item.LocatNo}");
                                    }

                                    taskNo = new Common().GetMaxNo("TN");//任务号
                                    var logTaskEntry2 = new LogTask
                                    {
                                        TaskNo = taskNo,
                                        Sender = "WMS",
                                        Receiver = "RCS",
                                        //IsSuccess = 1, //是否下发成功 0失败 1成功
                                        SendDate = DateTime.Now,  //发送时间
                                                                  //BackDate = DateTime.Now,  //返回时间
                                        StartLocat = item.LocatNo,//起始位置
                                        EndLocat = endLoction.LocatNo,//目标位置
                                        PalletNo = item.PalletNo,//托盘码
                                        IsSend = 1,//是否可再次下发
                                        IsCancel = 1,//是否可取消
                                        IsFinish = 1,//是否可完成
                                        Type = "1",//任务类型 0 入库任务 1 出库任务  2 移库任务
                                        OrderType = "3",//单据类型 0 入库 1 出库 3 移库
                                        Status = "0",//任务状态0：等待执行1正在执行2执行完成
                                        NoticeDetailNo = int.Parse(noticeNo),
                                        Msg = taskMsg, //关键信息
                                        LotNo = item.LotNo//批次号
                                    };
                                    //组织下发小车任务信息
                                    var task2 = new TaskDetial
                                    {
                                        Taskno = taskNo,//任务号
                                        Startport = item.LocatNo,
                                        Endport = model.Location,//endLoction.LocatNo,
                                        Pallno = item.PalletNo,
                                        Crtype = "1",//叫桶
                                        WareHouseNo = houseNo
                                    };
                                    //给下车下发任务
                                    logTaskEntry2.SendDate = DateTime.Now;//发送时间
                                    var agvResult2 = CreateTaskForAgv(task2, url, out agvMsg);
                                    if (agvResult2)//成功
                                    {
                                        //请求成功修改任务表相应字段状态
                                        logTaskEntry2.IsSuccess = 1;
                                        logTaskEntry2.IsSend = 0;
                                        //logTaskEntry2.IsCancel = 0;
                                        logTaskEntry2.BackDate = DateTime.Now;
                                        logTaskEntry2.Status = "1";
                                        Db.Insertable(logTaskEntry2).ExecuteCommand();

                                        startLoction2.Status = "3";//出库中
                                        Db.Updateable(startLoction2).ExecuteCommand();

                                        endLoction.Status = "2";//入库中
                                        Db.Updateable(endLoction).ExecuteCommand();
                                    }
                                    else//失败
                                    {
                                        logTaskEntry2.IsSuccess = 0;
                                        logTaskEntry2.Information = agvMsg;
                                        Db.Insertable(logTaskEntry2).ExecuteCommand();

                                    }
                                    pallet = item;
                                    
                                    callResult = 2;
                                    break;
                                }
                                if (callResult == 1)
                                {
                                    //提交事务
                                    Db.CommitTran();
                                    return;
                                    throw new Exception("暂无脏桶可分配");
                                }
                                else if (callResult == 0)
                                {
                                    throw new Exception("暂无脏桶可分配");
                                }
                            }
                            break;
@@ -364,7 +325,7 @@
                    var startLoction = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == pallet.LocatNo);
                    if (startLoction == null)
                    {
                        throw new Exception($"起始目标储位信息不存在，桶号：{pallet.LocatNo}");
                        throw new Exception($"起始目标储位信息不存在，桶号：{pallet.PalletNo}");
                    }

                    taskNo = new Common().GetMaxNo("TN");//任务号
@@ -448,7 +409,7 @@
        /// <exception cref="Exception"></exception>
        public void ApplyLocatNo(Pallnetmsg model, string url, out string taskNo)
        {
            lock (RcsLock)
            lock (ApplyLocatLock)
            {
                try
                {
@@ -782,7 +743,7 @@
                Db.BeginTran();

                //查找是否有空余脏桶位
                var endLocat = Db.Queryable<SysStorageLocat>().First(w => w.WareHouseNo == detail.WareHouseNo && w.AreaNo.Contains("04") && w.Status == "0" && w.Flag=="0");
                var endLocat = GetLocatModel(detail.WareHouseNo, "3");
                if (endLocat == null)
                {
                    detail.Status = "5";//异常锁定
@@ -792,27 +753,71 @@
                }
                else
                {
                    //生成调度小车净桶去脏桶区任务
                    var ztask = new TaskDetial
                    var taskNo = new Common().GetMaxNo("TN");//任务号
                    //任务信息
                    var logTaskEntry = new LogTask
                    {
                        Startport = detail.LocatNo,
                        Endport = endLocat.LocatNo,
                        Pallno = PalletNo,
                        Crtype = "2",
                        TaskNo = taskNo,
                        Sender = "WMS",
                        Receiver = "RCS",
                        //IsSuccess = 1, //是否下发成功 0失败 1成功
                        SendDate = DateTime.Now,  //发送时间
                        //BackDate = DateTime.Now,  //返回时间
                        StartLocat = statrtLocat.LocatNo,//起始位置
                        EndLocat = endLocat.LocatNo,//目标位置
                        PalletNo = detail.PalletNo,//桶号
                        IsSend = 1,//是否可再次下发
                        IsCancel = 1,//是否可取消
                        IsFinish = 1,//是否可完成
                        Type = "0",//任务类型 0 入库任务 1 出库任务  2 移库任务
                        OrderType = "3",//单据类型 0 入库 1 出库 3 移库
                        Status = "0",//任务状态0：等待执行1正在执行2执行完成
                        NoticeDetailNo = 0,
                        Msg = "MES下发将净桶改为脏桶并拉到脏桶区", //关键信息
                        LotNo = ""//批次号
                    };
                    string taskNo = "";
                    var task = new TaskDetial
                    {
                        Taskno = taskNo,//任务号
                        Startport = statrtLocat.LocatNo,//起始位置
                        Endport = endLocat.LocatNo,//目标位置
                        Pallno = detail.PalletNo,
                        Crtype = "2",//平层搬运
                        WareHouseNo = detail.WareHouseNo
                    };
                    string agvMsg = string.Empty;
                    CreateTaskForAgv(ztask, url, out agvMsg);
                    //给下车下发任务
                    logTaskEntry.SendDate = DateTime.Now;//发送时间
                    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();

                    statrtLocat.Status = "3";//出库中
                    //修改起始储位状态
                    Db.Updateable(statrtLocat).ExecuteCommand();
                        statrtLocat.Status = "3";//出库中
                        Db.Updateable(statrtLocat).ExecuteCommand();

                    detail.Status = "5";//异常锁定
                    detail.PalletStatus = "3";//脏桶
                    //修改库存状态
                    Db.Updateable(detail).ExecuteCommand();
                        endLocat.Status = "2";//入库中
                        Db.Updateable(endLocat).ExecuteCommand();

                        detail.Status = "2";//分配状态 0:待分配，1：部分分配 ， 2:已分配
                        //更新桶库存明细
                        Db.Updateable(detail).ExecuteCommand();

                    }
                    else//失败
                    {
                        logTaskEntry.IsSuccess = 0;
                        logTaskEntry.Information = agvMsg;
                        Db.Insertable(logTaskEntry).ExecuteCommand();
                    }                  
                }
                //提交事务
                Db.CommitTran();
            }
            catch (Exception ex)
@@ -830,22 +835,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 = pallnetmsg.Location,//目标位置
                    Pallno = detail.PalletNo,//桶号
                    Crtype = "1",//叫桶
                    WareHouseNo = detail.WareHouseNo//车间编码
                };
                string taskNo = "";
                string agvMsg = string.Empty;
                CreateTaskForAgv(task, url, out agvMsg);
                //给下车下发任务
                logTaskEntry.SendDate = DateTime.Now;//发送时间
                string agvMsg=string.Empty;
                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)
            {
@@ -1293,33 +1373,42 @@
                agvTask.taskTyp = "Z5";
            }

            // 正式运行程序放开
            var jsonData = JsonConvert.SerializeObject(agvTask);
            string response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运命令", "AGV");
            //解析返回数据 
            var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
            if (agvModel.Code == "0")
            
            if (string.IsNullOrEmpty(url))//测试系统
            {
                result = true;//给下车下发任务成功

                result = true;
                agvMsg = "";
            }
            else
            else//正式系统
            {
                string logMsg = "";
                if (taskDetial.Crtype == "1")//叫桶（桶出库）
                var jsonData = JsonConvert.SerializeObject(agvTask);
                string response = HttpHelper.DoPost(url, jsonData, "下发给AGV转运命令", "AGV");
                //解析返回数据 
                var agvModel = JsonConvert.DeserializeObject<OutCommanAgvDto>(response);
                if (agvModel.Code == "0")
                {
                    logMsg = "申请叫桶";
                }
                else if (taskDetial.Crtype == "0")//申请储位（桶入库）
                {
                    logMsg = "申请储位";
                }
                var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                LogFile.SaveLogToFile($"AGV{logMsg}异常：( {agvModel.Message} ),", logStr);
                    result = true;//给下车下发任务成功

                agvMsg = agvModel.Message;
                    agvMsg = "";
                }
                else
                {
                    string logMsg = "";
                    if (taskDetial.Crtype == "1")//叫桶（桶出库）
                    {
                        logMsg = "申请叫桶";
                    }
                    else if (taskDetial.Crtype == "0")//申请储位（桶入库）
                    {
                        logMsg = "申请储位";
                    }
                    var logStr = $@".\log\AGV\AGV{logMsg}" + DateTime.Now.ToString("yyyyMMdd") + ".txt";
                    LogFile.SaveLogToFile($"AGV{logMsg}异常：( {agvModel.Message} ),", logStr);

                    agvMsg = agvModel.Message;
                }
            }
            
            return result;
            #endregion
        }
@@ -1345,7 +1434,7 @@
                var taskIng= Db.Queryable<LogTask>().First(w => w.IsDel == "0" && (w.Status == "0" || w.Status == "1") && w.PalletNo == palletNo);
                if (taskIng != null)
                {
                    throw new Exception("分配的桶有正在执行的任务，请稍后再试");
                    throw new Exception($"分配的桶{palletNo}有正在执行的任务，请稍后再试");
                }
                //分配桶的储位信息
                var locatInfo = Db.Queryable<SysStorageLocat>().First(w => w.IsDel == "0" && w.LocatNo == palletInfo.LocatNo);
@@ -1482,5 +1571,59 @@
                throw new Exception(e.Message);
            }
        }

        /// <summary>
        /// 质量结果下发
        /// </summary>
        /// <param name="model"></param>
        /// <returns></returns>
        /// <exception cref="Exception"></exception>
        public void QualityResult(QualityResultVm model)
        {
            try
            {
                //验证批次号是否为空
                if (string.IsNullOrEmpty(model.LotNo))
                {
                    throw new Exception("批次号不可为空，请核查！");
                }
                //开启事务
                Db.BeginTran();

                BllQualityInspect inspectModel = new BllQualityInspect();
                inspectModel.InspectNo = "";
                inspectModel.ASNNo = "";
                inspectModel.LotNo = model.LotNo;
                inspectModel.IsQualified = model.IsQualified;
                inspectModel.Origin = "LIMS"; //来源
                inspectModel.CreateTime = Db.GetDate(); //创建日期
                inspectModel.SkuNo = ""; //物料号
                inspectModel.SkuName = ""; //物料名称
                inspectModel.PassQty = 0; //合格数量
                inspectModel.FailQty = 0; //不合格数量
                inspectModel.Standard = ""; //规格
                inspectModel.CreateUser = 0;
                //插入质检信息
                Db.Insertable(inspectModel).ExecuteCommand();

                //查找库存明细信息
                List<DataStockDetail> detail = Db.Queryable<DataStockDetail>().Where(m => m.IsDel == "0" && m.LotNo == model.LotNo).ToList();
                foreach (var item in detail)
                {
                    item.InspectStatus = model.IsQualified == "1" ? "1" : "2";//0:待检验，1：合格，2：不合格

                    Db.Updateable(item).ExecuteCommand();
                }

                //提交事务
                Db.CommitTran();
            }
            catch (Exception ex)
            {
                //回滚事务
                Db.RollbackTran();
                throw new Exception(ex.Message);
            }
        }
    }
}