1

czw

2025-06-19 b447a2b0dafdaf7e460ca4a73727c81fe820a1ff

 2025Äê6ÔÂ12ÈÕ/AuxAllWCS/Build/Project/´úÂë/ViewModel.cs

@@ -95,10 +95,12 @@
                {
                    Settings.HostToAgvServerUrl = keyValue.Value.ToString();
                }
                if (keyValue.Name == "deviceInfo") {
                            if (keyValue.Name == "deviceInfo")
                            {
                      Settings.deviceInfos = JsonConvert.DeserializeObject<List<deviceInfo>>(keyValue.Value.ToString());
                }
                if (keyValue.Name == "HKbaseUrl") {
                            if (keyValue.Name == "HKbaseUrl")
                            {
                      Settings.HKbaseUrl = keyValue.Value.ToString();
                }
                            if (keyValue.Name == "MESbaseUrl")
@@ -180,7 +182,8 @@
                                       TcpServer.TrayIps.Remove(device.deviceNo[inde ? 0 : 1]);
                                    }
                                }
                                else if(device.deviceType == 2){
                                else if (device.deviceType == 2)
                                {
                           var inde = device.location.ToList().FindIndex(x => x == wcsTask.S_START_LOC) == 0;
                            string V = inde? "D1224" : "D1225";
                            Conn.默认Redis.SetValue(device.deviceName + "." + V, "0", device.deviceName + "Queue");
@@ -282,7 +285,8 @@
                                    endLoc.S_LOCK_STATE = "无";
                                    locrep.Update(startloc);
                                    locrep.Update(endLoc);
                                }else if (tare.Find(x => x.S_ACTION_CODE == "end") == null)
                                }
                                else if (tare.Find(x => x.S_ACTION_CODE == "end") == null)
                                {
                                    endLoc.S_LOCK_STATE = "无";
                                    locrep.Update(endLoc);
@@ -332,7 +336,8 @@
                                }
                            }

                        }else if(mestask!=null && model.method== "cancel")
                        }
                        else if (mestask != null && model.method == "cancel")
                        {
                            if(mestask.S_B_STATE == "MES")
                              Settings.apiHelper.Post(Settings.WMSbaseUrl + "mom-basic/dataTransmission/json/service/201", JsonConvert.SerializeObject(new
@@ -366,7 +371,8 @@
public GZ.DB.Entity.OIDATABASE.TaskEntity Begin(GZ.DB.Entity.OIDATABASE.TaskEntity task)
{
      #region    [自定义指令][20250324170811305][Begin]
 if (task.S_B_STATE.Trim() == "已推送") {
            if (task.S_B_STATE.Trim() == "已推送")
            {
     task.S_B_STATE = "执行中";
     task.T_START_TIME = DateTime.Now;
 }
@@ -376,7 +382,8 @@
public GZ.DB.Entity.OIDATABASE.TaskEntity End(GZ.DB.Entity.OIDATABASE.TaskEntity task)
{
      #region    [自定义指令][20250324170922920][End]
 if (task != null) {
            if (task != null)
            {
     task.S_B_STATE = "完成";
     task.T_END_TIME = DateTime.Now;
 }
@@ -501,19 +508,24 @@
            msg = $"[haikang-CreateOrder] request={request} response={response}";
            
            LogHelper.Info(msg);
            if (response != "") {
                try {
            if (response != "")
            {
                try
                {
                    var dataResult = JsonConvert.DeserializeObject<HKResult>(response);
                    if (dataResult.code == "0") {
                    if (dataResult.code == "0")
                    {
                        result = true;
                    }
                }
                catch (Exception ex) {
                catch (Exception ex)
                {
                    Console.WriteLine(ex.Message);
                    LogHelper.Info(msg,"海康");
                }
            }
            else {
            else
            {
                msg = "[haikang-CreateOrder]创建订单失败";
                Console.WriteLine(msg);
            }
@@ -659,13 +671,16 @@
var response = Settings.apiHelper.Post(Settings.HKbaseUrl + "rcms/services/rest/hikRpcService/continueTask", request);
msg = $"[haikang-CancelOrder] request={request};response={response}";
Console.WriteLine(msg);
if (response != "") {
            if (response != "")
            {
    var dataResult = JsonConvert.DeserializeObject<HKResult>(response);
    if (dataResult.code == "0") {
                if (dataResult.code == "0")
                {
        result = true;
    }
}
else {
            else
            {
    msg = "[haikang-CancelOrder]取消订单失败";
    Console.WriteLine(msg);
}