添加CgDetail信息同步字段和锁状态字段，修改相关逻辑

kazelee

5 天以前 656f90b301ba307c909de4ee94b88af817adf0d8

 dispatch/GZRobot.cs

@@ -1,13 +1,18 @@
using System;
using System.Collections.Generic;
using System.IdentityModel.Protocols.WSTrust;
using System.Linq;
using System.Security.Policy;
using System.Threading.Tasks;
using HH.WCS.Mobox3.AnGang.util;

using HH.WCS.Mobox3.AnGang.core;
using HH.WCS.Mobox3.AnGang.models;
using HH.WCS.Mobox3.AnGang.util;

using Newtonsoft.Json;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;

using static System.Net.WebRequestMethods;
using static HH.WCS.Mobox3.AnGang.api.ApiModel;

namespace HH.WCS.Mobox3.AnGang.dispatch {
    /// <summary>
@@ -125,7 +130,7 @@
        /// </summary>
        /// <returns></returns>
        public static GzResult orderStatusReport(orderStatusReportParme model) {
            LogHelper.Info("RCS国自AGV任务状态回报：" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            LogHelper.Info("orderStatusReport：RCS国自AGV任务状态回报：" + JsonConvert.SerializeObject(model), "HosttoagvTask");
            GzResult result = new GzResult();
            AgvTaskState agv = new AgvTaskState();

@@ -141,6 +146,10 @@
                    break;
                case "waiting":
                    agv.state = 1;
                    break;
                case "dispatched":
                    //调度派车（开始取货）NEW ADDED
                    agv.state = 3;
                    break;
                case "source_finish":
                    //取货完成
@@ -248,6 +257,31 @@
            return list;
        }

        /// <summary>
        /// 根据没有interaction_info_name（task.S_CODE）获取interaction_info_id
        /// </summary>
        /// <param name="taskCode"></param>
        /// <param name="infoId"></param>
        /// <returns></returns>
        public static bool TryGetInteractionInfoId(string taskCode, out int infoId) {
            var list = QueryInteractInfo(3);
            if (list.Count == 0) {
                LogHelper.Info($"查交互表失败！没有读取到交互表！");
                infoId = 0;
                return false;
            }
            
            var data = list.Where(i => i.interaction_info_name == taskCode).FirstOrDefault();
            if (data == null) {
                LogHelper.Info($"查交互表失败！没有interaction_info_name='{taskCode}'的值！" + JsonConvert.SerializeObject(list));
                infoId = 0;
                return false;
            }

            infoId = data.interaction_info_id;
            return true;
        }

        // DOC 6.   交互表查询（更新终点货位）
        public static bool UpdateInteractInfo(UpdateInteractInfo interactInfo) {
            string msg = "";
@@ -261,7 +295,8 @@
            }
            else {
                msg = "[guozi-UpdateInteractInfo]更新交互信息失败";
                Console.WriteLine(msg);
                //Console.WriteLine(msg);
                LogHelper.Info(msg);
            }
            return result;
        }
@@ -270,13 +305,18 @@
        // DOC 5.   称重信息查询
        public static List<CustomData> CustomBuf() {
            var res = new List<CustomData>();
            
            string msg = "";
            var result = apiHelper.Get(baseUrl + $"/api/engine/agvs/custom-buf/");
            //var result = apiHelper.Get(baseUrl + $"/api/engine/agvs/custom-buf/", "application/json");
            LogHelper.Info($"正在请求GET: \"/api/engine/agvs/custom-buf/\"", "API");
            var result = apiHelper.GetNew(baseUrl + $"api/engine/agvs/custom-buf/");
            if (!string.IsNullOrEmpty(result)) {
                Console.WriteLine(result);
                
                try {
                    LogHelper.Info($"称重信息：" + result);
                    var data = JsonConvert.DeserializeObject<gzResult<CustomData>>(result);
                    
                    if (data.data != null) {
                        res = data.data;
                    }