优化AGV任务部分日志、货位绑定内部方法

kazelee

3 天以前 1b6bf29ff7daa1987de65940af52f452cabd6881

 wms/LocationHelper.cs

@@ -98,22 +98,6 @@
                        {
                            site = Location.S_AGV_SITE;
                        }
                        //if (Location.N_CURRENT_NUM == 1)
                        //{
                        //    site = Location.S_AGV_SITE2;
                        //}
                        //if (Location.N_CURRENT_NUM == 2)
                        //{
                        //    site = Location.S_AGV_SITE3;
                        //}
                        //if (Location.N_CURRENT_NUM == 3)
                        //{
                        //    site = Location.S_AGV_SITE4;
                        //}
                        //if (Location.N_CURRENT_NUM == 4)
                        //{
                        //    site = Location.S_AGV_SITE5;
                        //}
                    }
                }
            }
@@ -180,30 +164,8 @@
                    location.S_LOCK_STATE = "无";
                    location.N_LOCK_STATE = 0;

                    //var containerList = new List<TN_Container>();
                    //foreach (var item in lcrList) {
                    //    // 针对容器类型添加的新逻辑
                    //    var cntr = db.Queryable<TN_Container>()
                    //        .Where(c => c.S_CODE == item.S_CNTR_CODE).First();
                    //    if (cntr == null) {
                    //        LogHelper.Info($"货位解绑时，容器{item.S_CNTR_CODE}没有在容器信息表中查到，这里根据货位容器关系添加");
                    //        containerList.Add(new TN_Container {
                    //            S_CODE = item.S_CNTR_CODE,
                    //            S_TYPE = item.S_CNTR_TYPE,
                    //        });
                    //    }
                    //}

                    using (var tran = db.Ado.UseTran())
                    {
                        //if (containerList.Count > 0) {
                        //    if (db.Insertable<TN_Container>(containerList).ExecuteCommand() <= 0) {
                        //        LogHelper.Info($"插入容器信息表失败" + JsonConvert.SerializeObject(containerList));
                        //        tran.RollbackTran();
                        //        return "货位解绑容器失败，" + logs;
                        //    }
                        //}

                        if (db.Deleteable<TN_Loc_Container>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand() > 0)
                        {
                            LogHelper.Info($"删除货位容器关系表成功，{log}");
@@ -259,20 +221,16 @@
            var logs = $"货位：{loc}，容器：{JsonConvert.SerializeObject(cntrs)}";
            try
            {
                // 删除已经绑定过的容器记录
                var lcrList = db.Queryable<TN_Loc_Container>().Where(a => cntrs.Contains(a.S_CNTR_CODE) && a.S_LOC_CODE == loc).ToList();

                if (lcrList.Count > 0)
                {
                if (lcrList.Count > 0) {
                    cntrs = cntrs.Except(lcrList.Select(a => a.S_CNTR_CODE).ToList()).ToList();
                }

                var bindLocCntList = new List<TN_Loc_Container>();
                foreach (var item in cntrs)
                {
                foreach (var item in cntrs) {
                    // 针对容器类型添加的新逻辑
                    var cntr = db.Queryable<TN_Container>()
                        .Where(c => c.S_CODE == item)
                        .First();
                    var cntr = db.Queryable<TN_Container>().Where(c => c.S_CODE == item).First();

                    if (cntr == null) {
                        LogHelper.Info($"货位解绑时，容器{item}没有在容器信息表中查到，不记录容器类型");
@@ -287,16 +245,12 @@

                using (var tran = db.Ado.UseTran())
                {
                    if (db.Insertable<TN_Loc_Container>(bindLocCntList).ExecuteCommand() > 0)
                    {
                        LogHelper.Info($"插入货位容器关系表成功，{log}");
                    }
                    else
                    {
                    if (db.Insertable<TN_Loc_Container>(bindLocCntList).ExecuteCommand() <= 0) {
                        db.RollbackTran();
                        LogHelper.Info($"插入货位容器关系表失败，{log}");
                        return "货位绑定容器失败，" + logs;
                    }
                    LogHelper.Info($"插入货位容器关系表成功，{log}");

                    var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
                    if (location != null)