1

zxx

7 天以前 da7196f0acb1349fe0bc6b3b652093b495416adc

1

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

@@ -38,7 +38,7 @@
                        var db = new SqlHelper<WCSTask>().GetInstance();
                        //存订单号
                        var task = db.Queryable<WCSTask>().Where(a => a.S_CODE == model.ts_name).First();
                        task.S_WORKSHOP_NO = dataResult.data.in_order_id;
                        task.S_WORKSHOP_NO = dataResult.data[0].in_order_id;
                        var res = db.Updateable(task).UpdateColumns(it => it.S_WORKSHOP_NO).ExecuteCommand() > 0;
                        if (res)
                        {
@@ -81,7 +81,17 @@
                    var dataResult = JsonConvert.DeserializeObject<RcsResult>(response);
                    if (dataResult.code == 0)
                    {
                        result = true;
                        var db = new SqlHelper<WCSTask>().GetInstance();
                        //存订单号
                        var task = db.Queryable<WCSTask>().Where(a => a.S_CODE == model.ts_name).First();

                        task.S_WORKSHOP_NO = dataResult.data[0].in_order_id;
                        var res = db.Updateable(task).UpdateColumns(it => it.S_WORKSHOP_NO).ExecuteCommand() > 0;
                        if (res)
                        {
                            result = true;
                        }
                        //result = true;
                    }
                }
                catch (Exception ex)
@@ -197,7 +207,7 @@
            /// <summary>
            /// 订单优先级,通常为1，最大值为20，超过20的当做20处理，按优先级降序排序
            /// </summary>
            public string priority { get; set; }
            public int priority { get; set; }
            /// <summary>
            /// 订单截止时间
            /// </summary>
@@ -283,7 +293,7 @@
            public string version { get; set; }
            public int code { get; set; }
            public string msg { get; set; }
            public RcsData data { get; set; }
            public List<RcsData> data { get; set; }
        }
        public class RcsData
        {

 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/models/LocFrameRel.cs

@@ -26,9 +26,9 @@
        //public int N_BIND_ORDER { get; set; }


        [SugarColumn(IsIgnore = true)]
        [Navigate(NavigateType.OneToMany, nameof(S_LOC_CODE))]
        public List<LocCntrRel> LocCntrRels { get; set; }
        //[SugarColumn(IsIgnore = true)]
        //[Navigate(NavigateType.OneToMany, nameof(S_LOC_CODE))]
        //public List<LocCntrRel> LocCntrRels { get; set; }

       
    }

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

@@ -410,9 +410,9 @@

                        PickingTaskModel model = new PickingTaskModel();
                        model.order_name = mst.S_CODE;
                        model.priority = "1";
                        model.priority = 1;
                        model.dead_line = DateTime.Now.ToString();
                        model.ts_name = mst.S_TYPE;
                        model.ts_name = "p2p";
                        model.parameters = parme;
                        //model.parameters = new AntsParasModel { 
                        //    src = mst.S_START_LOC,
@@ -423,7 +423,10 @@
                    }
                    else if (mst.S_TYPE == "inbound")
                    {
                        string tote_id = $"\"tote_id\":\"{mst.S_FRAME_CODE}\",";
                        //查出货架编码
                        var db = new SqlHelper<Object>().GetInstance();
                        var locFrameRel = db.Queryable<LocFrameRel>().Where(a => a.S_LOC_CODE == mst.S_START_LOC).First();
                        string tote_id = $"\"tote_id\":\"{locFrameRel.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}\",";
@@ -435,15 +438,15 @@
                        string parmeD = "}";
                        string parmezS = "[";
                        string parmezD = "]";
                        string parme = parmeS + src + dst + extra_info + parmeS + parmezS + layer + put + parmeD + parmezD + parmeD;
                        string parme = parmeS + tote_id + task_type + src + dst + extra_info + parmezS+ parmeS  + layer + put + parmeD + parmezD + parmeD;

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

                        PickingTaskModel model = new PickingTaskModel();
                        model.order_name = mst.S_CODE;
                        model.priority = "1";
                        model.priority = 1;
                        model.dead_line = DateTime.Now.ToString();
                        model.ts_name = mst.S_TYPE;
                        model.ts_name = "picking_ts";
                        model.parameters = parme;
                        //model.parameters = new AntsParasModel { 
                        //    src = mst.S_START_LOC,
@@ -1149,9 +1152,12 @@
                {
                    ////创建到缓存区任务
                    //var locCntrRel = db.Queryable<LocCntrRel>().Where(a => a.S_LOC_CODE == startLoc.S_CODE).First();
                    
                    //找p2a的任务编码
                    var order_name = model.taskList.Find(s=>s.ts_name=="p2a").order_name;
                    //创建任务
                    LogHelper.Info($"创建任务 起点:{startLoc.S_CODE}终点:{endLoc.S_CODE}", "小件通用车型");
                    var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "小件通用车型", model.rackNumber, "", 1, 1);
                    var res = TaskProcess.CreateTransportDj(startLoc.S_CODE, endLoc.S_CODE, "小件通用车型", model.rackNumber, order_name, 1, 1);
                    if (!res)
                    {
                        return new TaskResponse
@@ -1166,7 +1172,7 @@
                    if (tasklist.ts_name == "p2p")
                    {
                        //先绑定料架和料箱位
                        ContainerHelper.BindLocCntrsXmLj(tasklist.parameters.src, model.rackNumber);
                        ContainerHelper.BindLocCntrsXmLj(tasklist.rackPosition, model.rackNumber);

                        var startloc = db.Queryable<Location>().Where(a => a.S_CODE == tasklist.rackPosition).First();
                        if (startloc == null || startloc.N_LOCK_STATE != 0)