1

zxx

7 天以前 44007a5e9ef385346d7ae0e107b9f983109ee479

1

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/api/WmsController.cs

@@ -33,14 +33,14 @@
        }


        //[HttpPost]
        //public TaskResponse smallMaterial(smallMaterial model)
        //{
        //    LogHelper.Info("smallMaterial 参数：" + JsonConvert.SerializeObject(model), "WMSAPI");
        //    var res = TaskProcess.smallMaterial(model);
        //    LogHelper.Info("smallMaterial 返回：" + JsonConvert.SerializeObject(res), "WMSAPI");
        //    return res;
        //}
        [HttpPost]
        public TaskResponse smallMaterial(smallMaterial model)
        {
            LogHelper.Info("smallMaterial 参数：" + JsonConvert.SerializeObject(model), "WMSAPI");
            var res = TaskProcess.smallMaterial(model);
            LogHelper.Info("smallMaterial 返回：" + JsonConvert.SerializeObject(res), "WMSAPI");
            return res;
        }

    }
}

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs

@@ -205,7 +205,8 @@
            /// <summary>
            /// 订单参数
            /// </summary>
            public PickingParasModel parameters { get; set; }
            //public PickingParasModel parameters { get; set; }
            public string parameters { get; set; }

            /// <summary>
            /// 订单TS名字

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/process/TaskProcess.cs

@@ -48,32 +48,14 @@
            {
                Console.WriteLine($"任务{mst.S_CODE} 货位{mst.S_START_LOC}取货完成，起点解绑容器{mst.S_CNTR_CODE}");
                LogHelper.Info($"任务{mst.S_CODE} 货位{mst.S_START_LOC}取货完成，起点解绑容器{mst.S_CNTR_CODE}");
                if (mst.S_FRAME_CODE != null)
                {
                    LocationHelper.UnBindingLocHj(mst.S_START_LOC, mst.S_FRAME_CODE);
                LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());

                }
                else
                {
                    LocationHelper.UnBindingLoc(mst.S_START_LOC, mst.S_CNTR_CODE.Split(',').ToList());

                }
            }
            else
            {
                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)
                {
                    LocationHelper.BindingLocHj(mst.S_END_LOC, mst.S_FRAME_CODE);

                }
                else
                {
                    LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());

                }
                LocationHelper.BindingLoc(mst.S_END_LOC, mst.S_CNTR_CODE.Split(',').ToList());
            }

        }
@@ -389,26 +371,89 @@
                //var endLoc = LocationHelper.GetLoc(mst.S_END_LOC);
                if (mst.S_START_LOC != null && mst.S_END_LOC != null)
                {
                    string src = $"\"src\":\"{mst.S_START_LOC}\",";
                    string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
                    string carrier_type_id = $"\"carrier_type_id\":\"1\"";
                    string parmeS = "{";
                    string parmeD = "}";
                    string parme = parmeS + src + dst + carrier_type_id + parmeD;
                    bool res = false;
                    if (mst.S_TYPE == "大件")
                    {
                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
                        string carrier_type_id = $"\"carrier_type_id\":\"1\"";
                        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;
                    model.priority = 1;
                    model.dead_line = DateTime.Now.ToString();
                    model.ts_name = mst.S_TYPE;
                    model.parameters = parme;
                    //model.parameters = new AntsParasModel { 
                    //    src = mst.S_START_LOC,
                    //    dst = mst.S_END_LOC,
                    //    carrier_type_id="-99"
                    //};
                    var res = RcsHelper.CreateAntsOrder(model);
                        LogHelper.Info($"推送任务参数{parme}", "任务");
                        AntsTaskModel model = new AntsTaskModel();
                        model.order_name = mst.S_CODE;
                        model.priority = 1;
                        model.dead_line = DateTime.Now.ToString();
                        model.ts_name = mst.S_TYPE;
                        model.parameters = parme;
                        //model.parameters = new AntsParasModel { 
                        //    src = mst.S_START_LOC,
                        //    dst = mst.S_END_LOC,
                        //    carrier_type_id="-99"
                        //};
                        res = RcsHelper.CreateAntsOrder(model);
                    }
                    else if (mst.S_TYPE == "小件通用车型")
                    {
                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";
                        string car_type = $"\"car_type\":\"1\",";
                        string src_ort = $"\"src_ort\":\"-1\",";
                        string dst_ort = $"\"dst_ort\":\"-1\"";
                        string parmeS = "{";
                        string parmeD = "}";
                        string parme = parmeS + src + dst + car_type + src_ort + dst_ort + parmeD;

                        LogHelper.Info($"推送任务参数{parme}", "任务");

                        PickingTaskModel model = new PickingTaskModel();
                        model.order_name = mst.S_CODE;
                        model.priority = "1";
                        model.dead_line = DateTime.Now.ToString();
                        model.ts_name = mst.S_TYPE;
                        model.parameters = parme;
                        //model.parameters = new AntsParasModel { 
                        //    src = mst.S_START_LOC,
                        //    dst = mst.S_END_LOC,
                        //    carrier_type_id="-99"
                        //};
                        res = RcsHelper.CreatePickingOrder(model);
                    }
                    else if (mst.S_TYPE == "inbound")
                    {
                        string tote_id = $"\"tote_id\":\"{mst.S_FRAME_CODE}\",";
                        string task_type = $"\"task_type\":\"{mst.S_TYPE}\",";
                        string src = $"\"src\":\"{mst.S_START_LOC}\",";
                        string dst = $"\"dst\":\"{mst.S_END_LOC}\",";

                        string extra_info = $"\"extra_info\":";
                        string layer = $"\"layer\":[1,2,3,4],";
                        string put = $"\"put\":true";
                        string parmeS = "{";
                        string parmeD = "}";
                        string parmezS = "[";
                        string parmezD = "]";
                        string parme = parmeS + src + dst + extra_info + parmeS + parmezS + layer + put + parmeD + parmezD + parmeD;

                        LogHelper.Info($"推送任务参数{parme}", "任务");

                        PickingTaskModel model = new PickingTaskModel();
                        model.order_name = mst.S_CODE;
                        model.priority = "1";
                        model.dead_line = DateTime.Now.ToString();
                        model.ts_name = mst.S_TYPE;
                        model.parameters = parme;
                        //model.parameters = new AntsParasModel { 
                        //    src = mst.S_START_LOC,
                        //    dst = mst.S_END_LOC,
                        //    carrier_type_id="-99"
                        //};
                        res = RcsHelper.CreatePickingOrder(model);
                    }


                    if (res)
                    {
                        //更新任务状态
@@ -1038,8 +1083,8 @@

                var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                //创建任务
                LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLocStr}", model.ts_name);
                var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLocStr, model.ts_name, locCntrRel.S_CNTR_CODE, model.order_name, 1, 1);
                LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLocStr}", "大件");
                var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLocStr, "大件", locCntrRel.S_CNTR_CODE, model.order_name, 1, 1);
                if (!res)
                {
                    return new TaskResponse
@@ -1091,9 +1136,7 @@
                string Message = null;

                //拆分成两条任务，一条是料架到指定的缓存区，二是料架上的托盘到指定的工位（小米wcs传）一对多
                var startFrame = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == model.taskList[0].parameters.src).First();

                var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == startFrame.S_FRAME_CODE).First();
                var startLoc = db.Queryable<Location>().Where(a => a.S_CODE == model.taskList[0].parameters.src).First();
                if (startLoc == null || startLoc.N_LOCK_STATE != 0)
                {
                    return new TaskResponse
@@ -1104,11 +1147,11 @@
                var endLoc = TaskProcess.InWorkTransport(model.shippingRoute);
                if (endLoc != null)
                {
                    //创建到缓存区任务
                    var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                    ////创建到缓存区任务
                    //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);
                    LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", "小件通用车型");
                    var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "小件通用车型", model.rackNumber, "", 1, 1);
                    if (!res)
                    {
                        return new TaskResponse
@@ -1122,6 +1165,9 @@
                {
                    if (tasklist.ts_name == "p2p")
                    {
                        //先绑定料架和料箱位
                        ContainerHelper.BindLocCntrsXmLj(tasklist.parameters.src, model.rackNumber);

                        var startloc = db.Queryable<Location>().Where(a => a.S_CODE == tasklist.rackPosition).First();
                        if (startloc == null || startloc.N_LOCK_STATE != 0)
                        {
@@ -1139,8 +1185,8 @@

                        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);
                        LogHelper.Info($"创建任务 起点:{startloc.S_CODE}终点:{endlocstr}", "inbound");
                        var res = TaskProcess.CreateTransportDj(startloc.S_CODE, endlocstr, "inbound", locCntrRel.S_CNTR_CODE, tasklist.order_name, 1, 1);
                        if (!res)
                        {
                            return new TaskResponse

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/ContainerHelper.cs

@@ -558,8 +558,8 @@
                    string cntrCode = list[i];
                    if (db.Queryable<LocCntrRel>().Count(a => a.S_CNTR_CODE.Trim() == cntrCode) == 0)
                    {
                        var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode};
                        var con = new Container { S_CODE = cntrCode,N_DETAIL_COUNT = 1,C_FULL="2" };//默认满 主动绑定服务用
                        var cir = new LocCntrRel { S_LOC_CODE = loc, S_CNTR_CODE = cntrCode };
                        var con = new Container { S_CODE = cntrCode, N_DETAIL_COUNT = 1, C_FULL = "2" };//默认满 主动绑定服务用
                        db.Insertable<LocCntrRel>(cir).ExecuteCommand();
                        db.Insertable<Container>(con).ExecuteCommand();
                        if (!string.IsNullOrEmpty(itemCode))
@@ -612,11 +612,34 @@
            return result;
        }
        /// <summary>
        /// 小米 绑定料架和料箱位
        /// </summary>
        /// <param name="cntr"></param>
        /// <returns></returns>
        internal static bool BindLocCntrsXmLj(string loc, string frame)
        {
            bool result = true;
            var db = new SqlHelper<object>().GetInstance();

            if (!string.IsNullOrEmpty(frame))
            {
                string cntrCode = frame;
                if (db.Queryable<LocFrameRel>().Count(a => a.S_LOC_CODE.Trim() == loc&& a.S_FRAME_CODE.Trim() == frame) == 0)
                {
                    var cir = new LocFrameRel { S_LOC_CODE = loc, S_FRAME_CODE = frame };
                    db.Insertable<LocFrameRel>(cir).ExecuteCommand();
                }
            }
            return result;
        }


        /// <summary>
        /// 绑定货位容器表
        /// </summary>
        /// <param name="cntr"></param>
        /// <returns></returns>
        internal static bool BindLocCntrs(string loc, string cntr, string itemCode, string itemName,int S_CK)
        internal static bool BindLocCntrs(string loc, string cntr, string itemCode, string itemName, int S_CK)
        {
            bool result = true;
            List<string> list = new List<string>(cntr.Split(','));

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/wms/LocationHelper.cs

@@ -469,42 +469,7 @@
            }
            return res;
        }
        /// <summary>
        /// 货位绑定货架 小米
        /// </summary>
        /// <param name="loc"></param>
        /// <param name="cntrs"></param>
        /// <returns></returns>
        public static bool BindingLocHj(string loc, string frame)
        {
            var res = false;
            var db = new SqlHelper<object>().GetInstance();
            var location = db.Queryable<Location>().Where(a => a.S_CODE.Trim() == loc).First();
            try
            {
                var lcrList = db.Queryable<LocCntrRel>().Includes(a => a.Container).Where(a => a.S_LOC_CODE.Trim() == loc).ToList();
                db.BeginTran();
                int count = 0;
                if (lcrList.Count(b => b.S_CNTR_CODE.Trim() == frame) == 0)
                {
                    db.Insertable<LocCntrRel>(new LocCntrRel { S_LOC_CODE = loc, S_FRAME_CODE = frame }).ExecuteCommand();
                    count++;
                }
                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, it.N_LOCK_STATE }).ExecuteCommand();

                db.CommitTran();
                res = true;
            }
            catch (Exception ex)
            {
                Console.WriteLine(ex.Message);
                db.RollbackTran();
            }
            return res;
        }
        
        /// <summary>
        /// 判断逻辑库区是否有可用货位
        /// </summary>