封装部分业务代码，继续优化日志打印流程

kazelee

昨天 f8d23dcf8d6501482db1a5180325194232afe96c

 wms/LocationHelper.cs

@@ -11,7 +11,7 @@

namespace HH.WCS.Mobox3.DSZSH.wms {
    /// <summary>
    /// 货位帮助类（包含货位-容器关系的处理）
    /// 货位帮助类 (包含货位-容器关系的处理) 
    /// </summary>
    public class LocationHelper
    {
@@ -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;
                        //}
                    }
                }
            }
@@ -127,7 +111,7 @@
        }

        /// <summary>
        /// 取货完解锁起点，卸货完解锁终点，可检验锁的来源，也可以不校验
        /// 取货完解锁起点,卸货完解锁终点,可检验锁的来源,也可以不校验
        /// </summary>
        /// <param name="loc"></param>
        /// <returns></returns>
@@ -159,16 +143,15 @@
        /// <param name="loc"></param>
        /// <param name="cntrs"></param>
        /// <returns></returns>
        public static string UnBindingLoc(string loc, List<string> cntrs)
        public static string UnbindLocCntr(string loc, List<string> cntrs)
        {
            var db = new SqlHelper<object>().GetInstance();
            var logs = $"货位：{loc}，容器：{JsonConvert.SerializeObject(cntrs)}";
            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)
                {
                    LogHelper.Info($"货位无需解绑容器，在数据库中未找到{JsonConvert.SerializeObject(cntrs)}相关的货位容器关系表信息");
                if (lcrList.Count == 0) {
                    LogHelper.Info($"货位无需解绑容器,在数据库中未找到{JsonConvert.SerializeObject(cntrs)}相关的货位容器关系表信息");
                }
                cntrs = lcrList.Select(a => a.S_CNTR_CODE).ToList();

@@ -180,70 +163,46 @@
                    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}");
                            LogHelper.Info($"删除货位容器关系表成功,{log}");
                        }
                        else
                        {
                            tran.RollbackTran();

                            LogHelper.Info($"删除货位容器关系表失败，{log}");
                            LogHelper.Info($"删除货位容器关系表失败,{log}");

                            return "货位解绑容器失败，" + logs;
                            return "货位解绑容器失败," + logs;
                        }

                        log = JsonConvert.SerializeObject(location);
                        if (db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0)
                        {
                        if (db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0) {
                            tran.CommitTran();

                            LogHelper.Info($"更新货位表成功，{log}");
                            LogHelper.Info($"更新货位表成功,{log}");
                        }
                        else
                        {
                        else {
                            tran.RollbackTran();

                            LogHelper.Info($"更新货位表失败，{log}");
                            LogHelper.Info($"更新货位表失败,{log}");

                            return "货位解绑容器失败，" + logs;
                            return "货位解绑容器失败," + logs;
                        }
                    }
                }
                else
                {
                    LogHelper.Info($"在数据库中未找到该货位，无需更新，货位：{loc}");
                    LogHelper.Info($"在数据库中未找到该货位,无需更新,货位:{loc}");
                }
                return "货位解绑容器成功，" + logs;
                return "货位解绑容器成功," + logs;
            }
            catch (Exception ex)
            {
                LogHelper.Info($"发生了异常，货位解绑容器失败，{ex.Message}");
                return "货位绑定容器失败，" + logs;
                LogHelper.Info($"发生了异常,货位解绑容器失败,{ex.Message}");
                return "货位绑定容器失败," + logs;
            }
        }

@@ -256,26 +215,22 @@
        public static string BindingLoc(string loc, List<string> cntrs)
        {
            var db = new SqlHelper<object>().GetInstance();
            var logs = $"货位：{loc}，容器：{JsonConvert.SerializeObject(cntrs)}";
            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}没有在容器信息表中查到，不记录容器类型");
                        LogHelper.Info($"货位解绑时,容器{item}没有在容器信息表中查到,不记录容器类型");
                        bindLocCntList.Add(new TN_Loc_Container() { S_LOC_CODE = loc, S_CNTR_CODE = item });
                    }
                    else {
@@ -287,16 +242,12 @@

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

                    var location = db.Queryable<TN_Location>().First(a => a.S_CODE == loc);
                    if (location != null)
@@ -310,29 +261,29 @@
                        {
                            db.CommitTran();

                            LogHelper.Info($"更新货位表成功，{log}");
                            LogHelper.Info($"更新货位表成功,{log}");
                        }
                        else
                        {
                            db.RollbackTran();

                            LogHelper.Info($"更新货位表失败，{log}");
                            LogHelper.Info($"更新货位表失败,{log}");

                            return "货位绑定容器失败，" + logs;
                            return "货位绑定容器失败," + logs;
                        }
                    }
                    else
                    {
                        db.RollbackTran();
                        LogHelper.Info($"未找到该货位{loc}，或者已锁定，{log}");
                        LogHelper.Info($"未找到该货位{loc},或者已锁定,{log}");
                    }
                }
                return "货位绑定容器成功，" + logs;
                return "货位绑定容器成功," + logs;
            }
            catch (Exception ex)
            {
                LogHelper.Info($"发生了异常，货位绑定容器失败，");
                return "货位绑定容器失败，" + ex.Message;
                LogHelper.Info($"发生了异常,货位绑定容器失败,");
                return "货位绑定容器失败," + ex.Message;
            }
        }
    }