1

zxx

3 天以前 d66d362ee6d76f02331e56df1fdec1c2114c9f3e

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

@@ -27,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
@@ -34,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)
@@ -71,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)
@@ -98,7 +119,8 @@
            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 != "")
@@ -143,7 +165,8 @@
            /// <summary>
            /// TS订单参数
            /// </summary>
            public AntsParasModel parameters { get; set; }
            //public AntsParasModel parameters { get; set; }
            public string parameters { get; set; }

            /// <summary>
            /// 订单的全局唯一ID
@@ -186,7 +209,7 @@
            /// <summary>
            /// 订单优先级,通常为1，最大值为20，超过20的当做20处理，按优先级降序排序
            /// </summary>
            public string priority { get; set; }
            public int priority { get; set; }
            /// <summary>
            /// 订单截止时间
            /// </summary>
@@ -194,7 +217,8 @@
            /// <summary>
            /// 订单参数
            /// </summary>
            public PickingParasModel parameters { get; set; }
            //public PickingParasModel parameters { get; set; }
            public string parameters { get; set; }

            /// <summary>
            /// 订单TS名字
@@ -254,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; }
            
        }

@@ -271,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
        {