blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
1
zxx
3 天以前 d66d362ee6d76f02331e56df1fdec1c2114c9f3e 
 HH.WCS.Mobox3/HH.WCS.Mobox3.XiaoMi/dispatch/RcsHelper.cs


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


        private static readonly HttpHelper apiHelper = new HttpHelper();


        private static readonly string baseUrl = Settings.HASeverUrl;






        /// <summary>


        /// 推送Ants订单


        /// </summary>


        /// <param name="model"></param>


        /// <returns></returns>


        public static bool CreateAntsOrder(AntsTaskModel model)


        {


            var msg = "";


@@ -23,6 +27,7 @@


            var response = apiHelper.Post(baseUrl + "/api/om/order", request);


            msg = $"[hanao-CreateAntsOrder] request={request} response={response}";


            Console.WriteLine(msg);


            LogHelper.Info("[hanao-CreateAntsOrder]" + msg);


            if (response != "")


            {


                try


@@ -30,7 +35,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.order_name).First();


                        LogHelper.Info($"CreateAntsOrder task参数==========={JsonConvert.SerializeObject(task)}");


                        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;


                        }




                    }


                }


                catch (Exception ex)


@@ -47,6 +62,11 @@


            return result;


        }




        /// <summary>


        /// 推送Picking订单


        /// </summary>


        /// <param name="model"></param>


        /// <returns></returns>


        public static bool CreatePickingOrder(PickingTaskModel model)


        {


            var msg = "";


@@ -62,7 +82,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)


@@ -79,12 +109,18 @@


            return result;


        }




        public static bool CancelPickingOrder(CancelModel model)


        /// <summary>


        /// 删除订单


        /// </summary>


        /// <param name="model"></param>


        /// <returns></returns>


        public static bool CancelOrder(CancelModel model)


        {


            bool result = false;


            string msg = "";


            var request = JsonConvert.SerializeObject(model);


            var response = apiHelper.Post(baseUrl + ":9002/wcs-admin/api/cancel", request);


            //var response = apiHelper.Post(baseUrl + ":9002/wcs-admin/api/cancel", request);


            var response = apiHelper.Put(baseUrl + ":2000/api/om/order/order-command", request);


            msg = $"[hanao-CancelOrder] request={request};response={response}";


            Console.WriteLine(msg);


            if (response != "")


@@ -129,7 +165,8 @@


            /// <summary>


            /// TS订单参数


            /// </summary>


            public AntsParasModel parameters { get; set; }


            //public AntsParasModel parameters { get; set; }


            public string parameters { get; set; }




            /// <summary>


            /// 订单的全局唯一ID


@@ -172,7 +209,7 @@


            /// <summary>


            /// 订单优先级,通常为1，最大值为20，超过20的当做20处理，按优先级降序排序


            /// </summary>


            public string priority { get; set; }


            public int priority { get; set; }


            /// <summary>


            /// 订单截止时间


            /// </summary>


@@ -180,7 +217,8 @@


            /// <summary>


            /// 订单参数


            /// </summary>


            public PickingParasModel parameters { get; set; }


            //public PickingParasModel parameters { get; set; }


            public string parameters { get; set; }




            /// <summary>


            /// 订单TS名字


@@ -240,11 +278,11 @@


            /// <summary>


            /// 


            /// </summary>


            public string order_id { get; set; }


            public string order_name { get; set; }


            /// <summary>


            /// 


            /// </summary>


            public string order_command_type_id { get; set; }


            public int order_command_type_id { get; set; }


            


        }




@@ -257,7 +295,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


        {