blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
海波 张
2 天以前 61ece19b5b178d1b23bed16c733b01af1185f838 
 wms/LocationHelper.cs


@@ -105,6 +105,19 @@


            return result;


        }




        internal static List<string> GetConnectionListNoYN(string S_AREA_CODE)


        {


            var db = new SqlHelper<object>().GetInstance();


            var ConnectionList = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE ).OrderBy(a => a.N_ROW).OrderBy(a => a.N_COL).ToList();


            List<string> result = new List<string>();


            foreach (var item in ConnectionList)


            {


                result.Add(item.S_CODE);


            }


            return result;


        }






        /// <summary>


        /// 获取货位信息,参数库区编号


        /// </summary>


@@ -115,7 +128,12 @@


            List<string> result = new List<string>();


            foreach (var item in ConnectionList)


            {


                result.Add(item.S_CODE);


                var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == S_AREA_CODE && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY== item.CONNEC_ROADWAY).First();


                if (ConnectionY==null)


                {


                    result.Add(item.S_CODE);


                }


               


            }


            return result;


        }


@@ -158,7 +176,17 @@


            var db = new SqlHelper<object>().GetInstance();


            


          return db.Queryable<WMSTask>().Where(a => ( a.S_START_LOC.Contains(jbLoc)&& a.S_SCHEDULE_TYPE.Contains(type)  && a.S_B_STATE != "完成" && a.S_B_STATE != "取消" && a.S_B_STATE != "失败" && a.S_B_STATE != "已完成" && a.S_B_STATE != "未执行")).OrderBy(b=>b.T_CREATE).First();


        


        }




        /// <summary>


        /// 返回出库agv任务


        /// </summary>


        internal static WMSTask GetConnectionTask(string jbLoc, string type,DateTime time)


        {


            var db = new SqlHelper<object>().GetInstance();




            return db.Queryable<WMSTask>().Where(a => (a.S_START_LOC.Contains(jbLoc) && a.S_SCHEDULE_TYPE.Contains(type) && a.S_B_STATE != "完成" && a.S_B_STATE != "取消" && a.S_B_STATE != "失败" && a.S_B_STATE != "已完成" && a.S_B_STATE != "未执行"&&a.T_CREATE<time)).OrderBy(b => b.T_CREATE).First();




        }




        /// <summary>


@@ -320,8 +348,13 @@


                //获取string接驳位集合


                var connectionList = LocationHelper.GetConnectionList(CONNECTION);






                var connectionListNoYN = LocationHelper.GetConnectionListNoYN(CONNECTION); 




                //不可用接驳位集合


                var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);


                var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionListNoYN);








                List<Location> jblist = new List<Location>();




@@ -336,7 +369,7 @@


                    List<Location> difference = flaseConnectionList


    .Where(loc1 => !balanceConnectionList.Any(loc2 => loc2.S_CODE == loc1.S_CODE))


    .ToList();




                    


                    jblist = difference;






@@ -399,8 +432,13 @@


                    {


                        if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)


                        {


                            flag2 = true;


                            break;


                            var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == CONNECTION && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY == item2.CONNEC_ROADWAY).First();


                            if (ConnectionY == null)


                            {


                                flag2 = true;


                                break;


                            }


                            


                        }


                    }




@@ -458,8 +496,10 @@


                //获取string接驳位集合


                var connectionList = LocationHelper.GetConnectionList(CONNECTION);




                var connectionListNoYN = LocationHelper.GetConnectionListNoYN(CONNECTION);




                //不可用接驳位集合


                var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionList);


                var flaseConnectionList = LocationHelper.GetConnectionListByst(connectionListNoYN);




                List<Location> jblist = new List<Location>();




@@ -534,8 +574,12 @@


                    {


                        if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)


                        {


                            flag2 = true;


                            break;


                            var ConnectionY = db.Queryable<Location>().Where(s => s.S_AREA_CODE == CONNECTION && s.C_ENABLE == "Y" && s.CONNEC_ROADWAY == item2.CONNEC_ROADWAY).First();


                            if (ConnectionY == null)


                            {


                                flag2 = true;


                                break;


                            }


                        }


                    }




@@ -677,7 +721,7 @@


            foreach (var item in v)


            {


                //取得巷道列表中可用货位最多的巷道  并获取巷道中所有货位


                location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).ToList();


                location_roadray = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();




                if (location_roadray != null && location_roadray.Count > 0)


                {


@@ -709,7 +753,7 @@


            foreach (var item in v)


            {


                //取得巷道列表中可用货位最多的巷道  并获取巷道中所有货位


                var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).ToList();


                var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.roadWay).OrderBy(b => b.N_ROW).OrderBy(b=>b.N_COL).OrderBy(b => b.N_LAYER).ToList();




                foreach (var item1 in loclist)


                {


@@ -744,7 +788,7 @@


            {


                var ConnectionList = 0;


               


                var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.N_ROADWAY && o.N_CURRENT_NUM>0).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).ToList();


                var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.N_ROADWAY && o.N_CURRENT_NUM>0).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();


                foreach (var item1 in loclist)


                {


                    var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item1.S_CODE).First();


@@ -774,7 +818,7 @@




                foreach (var item in result)


                {


                    var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).ToList();


                    var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 ).OrderBy(b => b.N_ROW).OrderBy(b => b.N_COL).OrderBy(b => b.N_LAYER).ToList();


                    foreach (var item1 in loclist)


                    {


                        location_roadray.Add(item1);


@@ -994,10 +1038,8 @@


            var db = new SqlHelper<object>().GetInstance();


            try


            {


                




               var connectionList = LocationHelper.GetConnectionList(CONNECTION);




                var connectionList = LocationHelper.GetConnectionListByN(CONNECTION);




                var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);




@@ -1006,7 +1048,7 @@




                //查找不可用巷道


                var rowdwa = db.Queryable<RoadWayEnable>().Where(x => x.areaCode == startArea && x.status == "0").ToList();




                LogHelper.Info($"空托自动出库排除不可用货位开始：{locations.Count}", "空托出库");


                for (int i = 0; i < rowsStart.Count; i++)


                {


                    var rowList = locations.Where(r => r.N_ROW == rowsStart[i]).ToList().OrderByDescending(a => a.N_COL);


@@ -1027,7 +1069,7 @@




                    foreach (var item2 in balanceConnectionList)


                    {


                        if (rowList.Count(a => a.N_ROADWAY != item2.CONNEC_ROADWAY) > 0)


                        if (rowList.Count(a => a.N_ROADWAY == item2.CONNEC_ROADWAY) > 0)


                        {


                            flag2 = true;


                            break;


@@ -1037,7 +1079,7 @@




                    if (flag || flag2)


                    {


                        continue;


                        locations.RemoveAll(a => a.N_ROW == rowsStart[i]);


                    }




                    //当前排有锁并且没有满货位，排除


@@ -1046,6 +1088,8 @@


                        locations.RemoveAll(a => a.N_ROW == rowsStart[i]);


                    }


                }


                LogHelper.Info($"空托自动出库排除不可用货位结束：{locations.Count}", "空托出库");


          


                foreach (var item in locations)


                {


                    if (item.N_CURRENT_NUM == 0)


@@ -1053,11 +1097,13 @@


                        continue;


                    }


                    var tp = db.Queryable<LocCntrRel>().Where(s => s.S_LOC_CODE == item.S_CODE).First();


                    LogHelper.Info($"空托自动出库itemCode:{item.S_CODE},itemLock:{item.S_LOCK_STATE} ,tp信息" + JsonConvert.SerializeObject(tp), "空托出库");




                    if (tp != null && item.S_LOCK_STATE == "无")


                    {


                        var tp1 = db.Queryable<Container>().Where(s => s.S_CODE == tp.S_CNTR_CODE).First();




                        LogHelper.Info($"空托自动出库tp1信息"+JsonConvert.SerializeObject(tp1), "空托出库");


                        if (tp1 != null && tp1.N_DETAIL_COUNT==0)


                        {


                            start = item;


@@ -1258,10 +1304,6 @@




                var balanceConnectionList = LocationHelper.GetConnectionListByst(connectionList);






                




                




                LogHelper.Info($"ZCSendTask出库任务排除不可用巷道开始", "Mes任务下发");


                //作业流程的巷道