1
zxx
7 天以前 9aa12613873326b0d07ec7b6335b1fa6f5261849
1
2个文件已修改
242 ■■■■ 已修改文件
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs 236 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/smallMaterial.cs
@@ -34,15 +34,15 @@
        //料架库位
        public string rackPosition { get; set; }
        //TS订单参数
        public List<Parameters> parameters { get; set; }
        public Parameters parameters { get; set; }
        //public string routeType { get; set; }
        ////任务类型 自动,人工
        //public string taskType { get; set; }
        ////料架编码
        //public string rackCode { get; set; }
        ////任务明细号
        //public string order_name { get; set; }
        //任务明细号
        public string order_name { get; set; }
    }
    public class Parameters
    {
HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs
@@ -64,7 +64,7 @@
                Console.WriteLine($"任务{mst.S_CODE} 货位{mst.S_END_LOC}卸货完成,终点绑定容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_END_LOC}卸货完成,终点绑定容器{mst.S_CNTR_CODE}");
                //如果货架有值则绑货架
                if (mst.S_FRAME_CODE!=null)
                if (mst.S_FRAME_CODE != null)
                {
                    LocationHelper.BindingLocHj(mst.S_END_LOC, mst.S_FRAME_CODE);
@@ -148,7 +148,7 @@
            }
        }
        private static object locLocker = new object();
        /// <summary>
@@ -395,7 +395,7 @@
                    string parmeS = "{";
                    string parmeD = "}";
                    string parme = parmeS + src + dst + carrier_type_id + parmeD;
                    LogHelper.Info($"推送任务参数{parme}", "任务");
                    AntsTaskModel model = new AntsTaskModel();
                    model.order_name = mst.S_CODE;
@@ -462,7 +462,7 @@
            return result;
        }
        //小米大件
        public static bool CreateTransportDj(string start, string end, string taskType, string cntrs,string orderName, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1)
        public static bool CreateTransportDj(string start, string end, string taskType, string cntrs, string orderName, int startLayer, int endLayer, int trayCarryCount = 1, int priority = 1)
        {
            var result = false;
            var trayCodes = cntrs;
@@ -470,7 +470,7 @@
            var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName,trayCarryCount, startLayer, endLayer);
            var res = WCSHelper.CreateTaskDj(taskNo, start.Trim(), end.Trim(), taskType, priority, trayCodes, orderName, trayCarryCount, startLayer, endLayer);
            if (res)
            {
                result = true;
@@ -795,7 +795,7 @@
                        result = list.OrderBy(s => s.N_ROW).ThenBy(x => x.N_COL).FirstOrDefault();
                    }
                }
            }
@@ -981,7 +981,7 @@
                            Message = $"{model.parameters.src}库位已被锁定!";
                        }
                        endLocStr = model.parameters.dst;
                        break;
                    case "p2a":
                        startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.parameters.src).First();
@@ -990,7 +990,7 @@
                            Message = $"{model.parameters.src}库位已被锁定!";
                        }
                        var endLoc = InWorkTransport(model.parameters.dst_area);
                        if (endLoc==null)
                        if (endLoc == null)
                        {
                            //如果没找到就等第一条
                            endLocStr = db.Queryable<Location>().Where(a => a.S_AREA_CODE.Trim() == model.parameters.dst).OrderByDescending(a => a.N_ROW).ToList()[0].S_CODE;
@@ -999,7 +999,7 @@
                        break;
                    case "a2p":
                        startLoc = OutWorkTransport(model.parameters.src_area);
                        if (startLoc==null)
                        if (startLoc == null)
                        {
                            Message = $"{model.parameters.dst}库区没有可出货位!";
                        }
@@ -1030,7 +1030,7 @@
                        break;
                }
                LogHelper.Info($"bigMaterial  接收参数{JsonConvert.SerializeObject(model) }");
                LogHelper.Info($"bigMaterial  接收参数{JsonConvert.SerializeObject(model)}");
                //创建托盘货位绑定关系
                string trayCode = ContainerHelper.GenerateCntrNo();
                //绑定起点货位(产线)和物料
@@ -1082,126 +1082,112 @@
        }
        //public static TaskResponse smallMaterial(smallMaterial model) {
        //    var db = new SqlHelper<Location>().GetInstance();
        //小件
        public static TaskResponse smallMaterial(smallMaterial model)
        {
            var db = new SqlHelper<Location>().GetInstance();
            try
            {
                string Message = null;
        //    string Message = null;
                //拆分成两条任务,一条是料架到指定的缓存区,二是料架上的托盘到指定的工位(小米wcs传)一对多
                var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.taskList[0].parameters.src).First();
        //    //拆分成两条任务,一条是料架到指定的缓存区,二是料架上的托盘到指定的工位(小米wcs传)一对多
        //    var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.taskList[0].parameters[0].src).First();
                var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
                if (startLoc == null || startLoc.N_LOCK_STATE != 0)
                {
                    return new TaskResponse
                    {
                        header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters.src}库位已被锁定!" }
                    };
                }
                var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
                if (endLoc != null)
                {
                    //创建到缓存区任务
                    var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                    //创建任务
                    LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", "料架到缓存区");
                    var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, "料架到缓存区", locCntrRel.S_FRAME_CODE, 1, 1);
                    if (!res)
                    {
                        return new TaskResponse
                        {
                            header = new ResponseHead { code = 0, desc = "自动上线任务创建失败" }
                        };
                    }
                }
                //料架上的托盘到指定的工位
                foreach (var tasklist in model.taskList)
                {
                    if (tasklist.ts_name == "p2p")
                    {
                        var startloc = db.Queryable<Location>().Where(a => a.S_CODE == tasklist.rackPosition).First();
                        if (startloc == null || startloc.N_LOCK_STATE != 0)
                        {
                            return new TaskResponse
                            {
                                header = new ResponseHead { code = 0, desc = $"{startloc.S_CODE}库位已被锁定!" }
                            };
                        }
                        var endlocstr = tasklist.parameters.dst;
        //    var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
        //    if (startLoc == null || startLoc.N_LOCK_STATE != 0)
        //    {
        //        return new TaskResponse
        //        {
        //            header = new ResponseHead { code = 0, desc = $"{model.taskList[0].parameters[0].src}库位已被锁定!" }
        //        };
        //    }
        //    var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
        //    if (endLoc != null)
        //    {
        //        //创建到缓存区任务
        //        var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
        //        //创建任务
        //        LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", model.ts_name);
        //        var res = TaskProcess.CreateTransportHj(startLoc.S_CODE, endLoc.S_CODE, model.ts_name, locCntrRel.S_FRAME_CODE, 1, 1);
        //        if (!res)
        //        {
        //            return new TaskResponse
        //            {
        //                header = new ResponseHead { code = 0, desc = "自动上线任务创建失败" }
        //            };
        //        }
        //    }
        //    //料架上的托盘到指定的工位
        //    foreach (var parameter in model.parameters)
        //    {
        //        var startLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.src).First();
        //        if (startLocHj == null || startLocHj.N_LOCK_STATE != 0)
        //        {
        //             Message = Message==null? $"{model.parameters[0].src}库位已被锁定!": Message+ $"{model.parameters[0].src}库位已被锁定!";
        //        }
        //        else
        //        {
        //            //货架上的货判断一下货架有没有锁
        //            var startFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.src).First();
        //            if (startFrameParent != null)
        //            {
        //                var startLocParent = db.Queryable<Location>().Where(a => a.S_CODE == startFrameParent.S_FRAME_CODE).First();
        //                if (startLocParent == null || startLocParent.N_LOCK_STATE != 0)
        //                {
        //                    return new TaskResponse
        //                    {
        //                        header = new ResponseHead { code = 0, desc = $"{startFrameParent.S_FRAME_CODE}货架已被锁定!" }
        //                    };
        //                }
        //            }
        //            var endLocHj = db.Queryable<Location>().Where(a => a.S_CODE == parameter.dst).First();
        //            if (endLocHj == null || endLocHj.N_LOCK_STATE != 0 || endLocHj.C_ENABLE != "Y")
        //            {
        //                //应该绕路
                        //创建托盘货位绑定关系
                        string trayCode = ContainerHelper.GenerateCntrNo();
                        //绑定起点货位(产线)和物料
                        ContainerHelper.BindLocCntrsXm(startloc.S_CODE, trayCode, tasklist.parameters.sku, "", tasklist.parameters.BatchNo, tasklist.parameters.issueMode, tasklist.parameters.num);
        //                Message = Message == null ? $"{parameter.dst}库位已被锁定!" : Message + $"{parameter.dst}库位已被锁定!";
        //            }
        //            else
        //            {
        //                //货架上的货判断一下货架有没有锁
        //                var endFrameParent = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == parameter.dst).First();
        //                if (endFrameParent != null)
        //                {
        //                    var endLocParent = db.Queryable<Location>().Where(a => a.S_CODE == endFrameParent.S_FRAME_CODE).First();
        //                    if (endLocParent == null || endLocParent.N_LOCK_STATE != 0)
        //                    {
        //                        return new TaskResponse
        //                        {
        //                            header = new ResponseHead { code = 0, desc = $"{endFrameParent.S_FRAME_CODE}货架已被锁定!" }
        //                        };
        //                    }
        //                }
        //                //创建到缓存区任务
        //                var locCntrRel1 = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLocHj.S_CODE).First();
        //                //创建任务
        //                LogHelper.Info($"创建任务 起点:{startLocHj.S_CODE}终点:{endLocHj.S_CODE}", model.ts_name);
        //                var res = TaskProcess.CreateTransport(startLocHj.S_CODE, endLocHj.S_CODE, model.ts_name, locCntrRel1.S_CNTR_CODE, 1, 1);
        //                if (!res)
        //                {
        //                    return new TaskResponse
        //                    {
        //                        header = new ResponseHead { code = 0, desc = "自动上线任务2创建失败" }
        //                    };
        //                }
                        var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startloc.S_CODE).First();
                        //创建任务
                        LogHelper.Info($"创建任务 起点:{startloc.S_CODE}终点:{endlocstr}", tasklist.ts_name);
                        var res = TaskProcess.CreateTransportDj(startloc.S_CODE, endlocstr, tasklist.ts_name, locCntrRel.S_CNTR_CODE, tasklist.order_name, 1, 1);
                        if (!res)
                        {
                            return new TaskResponse
                            {
                                header = new ResponseHead { code = 1, desc = Message }
                            };
        //            }
        //        }
        //    }
        //    var result = new TaskResponse();
        //    if (Message != null)
        //    {
        //        result = new TaskResponse
        //        {
        //            header = new ResponseHead { code = 0, desc = Message }
        //        };
        //    }
        //    else
        //    {
        //        result = new TaskResponse
        //        {
        //            header = new ResponseHead { code = 200, desc = "SUCCESS" },
        //            body = new ResponseBody
        //            {
        //                msg = "success",
        //                app_name = "Guozi client",
        //                data = new List<ResponseData> { new ResponseData { in_order_id = model.taskID } },
        //                version = ""
        //            }
        //        };
        //    }
        //    return result;
        //}
                        }
                    }
                }
                var result = new TaskResponse();
                if (Message != null)
                {
                    result = new TaskResponse
                    {
                        header = new ResponseHead { code = 0, desc = Message }
                    };
                }
                else
                {
                    result = new TaskResponse
                    {
                        header = new ResponseHead { code = 200, desc = "SUCCESS" },
                        body = new ResponseBody
                        {
                            msg = "success",
                            app_name = "Guozi client",
                            data = new List<ResponseData> { new ResponseData { in_order_id = model.taskList[0].taskID } },
                            version = ""
                        }
                    };
                }
                return result;
            }
            catch (Exception ex)
            {
                Console.WriteLine("smallMaterial:" + ex.Message + ex.StackTrace);
                LogHelper.Error("smallMaterial:" + ex.Message, ex);
                throw;
            }
        }
    }