blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
海波 张
昨天 3a56820d028e98ac3c4bd315aa76181d7d6720cd 
 wms/LocationHelper.cs


@@ -12,6 +12,7 @@


using System.Reflection;


using System.Text;


using System.Threading.Tasks;


using System.Web.Services.Description;


using Top.Api;


using WebSocketSharp.Frame;


using static HH.WCS.ZhongCeJinTan.api.ApiModel;


@@ -818,7 +819,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).OrderBy(b => b.N_LAYER).ToList();


                    var loclist = lstTrueLocation.Where(o => o.N_ROADWAY == item.loc.N_ROADWAY && o.N_CURRENT_NUM==0 && o.S_LOCK_STATE=="无").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);


@@ -1034,7 +1035,7 @@


        /// </summary>


        /// <param name="locations"></param>


        /// <returns></returns>


        internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea, string CONNECTION = "") {


        internal static Location FindStartcolByLoclistAndcntr(List<Location> locations,string startArea, string CONNECTION = "",string cntrType="") {


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


            try


            {


@@ -1103,8 +1104,8 @@


                    {


                        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)


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


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


                        {


                            start = item;


                            break;


@@ -1295,6 +1296,8 @@


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


            try


            {




                LogHelper.Info($"ZCSendTask出库任务进入FindStartcolByLoclistAndItem", "Mes任务下发");


                Location start = null;


                var rowsStart = locations.Select(a => a.N_ROW).Distinct().ToList();




@@ -1849,6 +1852,8 @@


            var res = false;


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


            var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();


            LogHelper.Info($"锁货位参数：loc:{loc},lockState:{lockState},lockNo:{lockNo}", "上锁");


            LogHelper.Info($"锁货位信息"+JsonConvert.SerializeObject(model), "上锁");


            if (model != null && model.S_LOCK_STATE.Trim() == "无") {


                model.S_LOCK_STATE = lockState;


                model.N_LOCK_STATE = lockNo;


@@ -1863,7 +1868,8 @@


        /// <param name="loc"></param>


        /// <returns></returns>


        public static bool UnLockLoc(string loc) {


            LogHelper.Info("UnLockLoc:" + loc);




            LogHelper.Info($"UnLockLoc解锁货位参数：loc:{loc},lockState:无,lockNo:0", "解锁");


            var res = false;


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


            var model = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();


@@ -1871,10 +1877,10 @@


                model.S_LOCK_STATE = "无";


                model.N_LOCK_STATE = 0;


                res = db.Updateable(model).UpdateColumns(it => new { it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand() > 0;


                LogHelper.Info("UnLockLoc:解锁结果" + res);


                LogHelper.Info("UnLockLoc:解锁结果" + res, "解锁");


            }


            else {


                LogHelper.Info("UnLockLoc 失败");


                LogHelper.Info($"UnLockLoc，loc:{loc} 失败", "解锁");


            }


            return res;


        }


@@ -2031,7 +2037,7 @@


        /// <returns></returns>


        public static bool UnBindingLoc(string loc, List<string> cntrs)


        {


            LogHelper.Info($"UnBindingLoc信息:loc：{loc},cntrs:{cntrs}");


            LogHelper.Info($"UnBindingLoc信息:loc：{loc},cntrs:{cntrs}","解锁");


            var res = false;


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


            var location = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();


@@ -2041,8 +2047,7 @@


                var lcrList = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == loc).ToList();


                var count = db.Deleteable<LocCntrRel>().Where(it => cntrs.Contains(it.S_CNTR_CODE) && it.S_LOC_CODE == loc).ExecuteCommand();




                LogHelper.Info($"lcrList信息" + JsonConvert.SerializeObject(lcrList));


                LogHelper.Info($"count信息" + JsonConvert.SerializeObject(count));


            




                location.N_CURRENT_NUM = lcrList.Count - count;


                location.S_LOCK_STATE = "无";


@@ -2050,6 +2055,7 @@




                db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE, it.N_LOCK_STATE }).ExecuteCommand();


                db.CommitTran();


                LogHelper.Info($"UnBindingLoc解锁锁货位参数：loc:{loc},lockState:无,lockNo:0", "解锁");


                res = true;


            }


            catch (Exception ex)


@@ -2067,6 +2073,7 @@


        /// <returns></returns>


        public static bool BindingLoc(string loc, List<string> cntrs)


        {


            LogHelper.Info($"BindingLoc信息:loc：{loc},cntrs:{cntrs}", "解锁");


            var res = false;


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


            var location = db.Queryable<Location>().Where(a => a.S_CODE == loc).First();


@@ -2085,10 +2092,12 @@


                location.N_CURRENT_NUM = lcrList.Count + count;


                location.N_LOCK_STATE = 0;


                location.S_LOCK_STATE = "无";




             


                db.Updateable(location).UpdateColumns(it => new { it.N_CURRENT_NUM, it.S_LOCK_STATE }).ExecuteCommand();




                db.CommitTran();


                LogHelper.Info($"BindingLoc解锁锁货位参数：loc:{loc},lockState:无,lockNo:0", "解锁");


                


                res = true;


            }


            catch (Exception ex)