From b174ea476eb1afd872985b2c261241a814e0185d Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 12 三月 2026 09:55:27 +0800
Subject: [PATCH] 一次大的提交，涉及，wms，wcs,pda
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA.Job/JobSchedulerForMeasure.cs | 71 ++++++++++++++++++++++++++++-------
1 files changed, 56 insertions(+), 15 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Job/JobSchedulerForMeasure.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Job/JobSchedulerForMeasure.cs"
index 4879781..d4483ee 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Job/JobSchedulerForMeasure.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA.Job/JobSchedulerForMeasure.cs"
@@ -1,24 +1,27 @@
-锘縰sing Quartz;
+锘縰sing Microsoft.Extensions.Caching.Memory;
+using Newtonsoft.Json;
+using Quartz;
using System;
using System.Collections.Generic;
-using System.Threading.Tasks;
using System.Linq;
-using System.Threading;
-using WIDESEA.Core.EFDbContext;
-using WIDESEA.Entity.DomainModels;
-using WIDESEA.Services.Repositories;
-using WIDESEA.Common;
-using WIDESEA.Core.Utilities;
-using WIDESEA_Services;
using System.ServiceModel;
+using System.Threading;
+using System.Threading.Tasks;
using System.Xml;
-using WIDESEA.Core.ManageUser;
-using WIDESEA_Common.LogEnum;
-using Microsoft.Extensions.Caching.Memory;
+using WIDESEA.Common;
+using WIDESEA.Core.EFDbContext;
using WIDESEA.Core.Extensions;
-using WIDESEA.Services.IServices;
-using Newtonsoft.Json;
+using WIDESEA.Core.ManageUser;
using WIDESEA.Core.Services;
+using WIDESEA.Core.Utilities;
+using WIDESEA.Entity.DomainModels;
+using WIDESEA.Services.IServices;
+using WIDESEA.Services.Repositories;
+using WIDESEA_Common.LogEnum;
+using WIDESEA_Entity.CustomModels.RGVModel;
+using WIDESEA_Services;
+using WIDESEA_Services.Services.APIInvoke.RGV;
+using static WIDESEA_Entity.CustomModels.RGVModel.RgvDeviceStatusModel;
namespace WIDESEA.Job
{
@@ -106,7 +109,15 @@
string[] array = null;
foreach (var item in tmpList)
{
- array = item.task_fromlocationid.Split('-');
+ if (item.task_type == TaskType.TaskType_Box_Pallet_Measure_Back.ToString() && item.task_type.Length > 10) // 杩欎釜鍒ゆ柇鑲栦郊鍔犱笂鐨�01-13
+ {
+ array = item.task_tolocationid.Split('-');
+ }
+ else
+ {
+ array = item.task_fromlocationid.Split('-');
+ }
+
currentLayer.Add(int.Parse(array[0]));
}
}
@@ -118,7 +129,32 @@
{
//澧炲姞鍒ゆ柇娌℃湁褰撳墠灞傜殑鎵嶆坊鍔�
if (!currentLayer.Contains(tmpInfo.location_layer) && null == containerInfos.Find(r => r.location_layer == tmpInfo.location_layer))
+ {
+ // 鑲栦郊瑕佸湪杩欓噷鍔犱竴涓� 濡傛灉rgv杞︽湁鏁呴殰 鍒欎笉鑳藉姞鍏ヨ繖灞傜殑
+ List<int> rgvLayer = new List<int>();
+ WebResponseContent resultcontent = RGVAPIInvokeGetRgvInfo.GetRgvInfo();
+ if (resultcontent.Status)
+ {
+ RgvDeviceStatusModel rgvData = (RgvDeviceStatusModel)resultcontent.Data;
+ //0绂荤嚎 1姝ｅ父 2鏁呴殰
+ for (int i = 0; i < rgvData.data.Count(); i++)
+ {
+ Info _info = rgvData.data[i];
+ if (_info.status != 1)
+ {
+ rgvLayer.Add(_info.layer);
+ }
+ }
+ }
+
+ if (rgvLayer.Contains(int.Parse(tmpInfo.location_id.Split('-')[0])))
+ {
+ continue;
+ }
+
containerInfos.Add(tmpInfo);
+ }
+
}
}
@@ -155,6 +191,9 @@
//鍦ㄦ鐢熸垚娴嬮噺鍑哄簱浠诲姟
foreach (VV_ContainerInfo containerInfo in containerInfos)
{
+
+ // 濡傛灉鍚庨潰瑕佸姞涓�涓垽鏂紝濡傛灉鏌愬眰鐨剅gv杞︽晠闅滀簡 閭ｄ箞褰撳墠瀵瑰簲杩欎釜rgv浠诲姟灞傜殑浠诲姟灏辫璺宠繃锛岃繖涓悗闈㈠啀璇村惂
+
//鏇存敼璐т綅鐘舵��
Dt_locationinfo locationinfo = locationinfoRepository.FindFirst(x => x.location_id == containerInfo.location_id);
locationinfo.location_state = LocationState.LocationState_Box_Measure_Out_Wait_Executing.ToString();
@@ -227,6 +266,8 @@
{
Dt_taskinfo sendTask = measureTasks[0];
+
+
content = WCSApi.SendTaskToWCS(new List<Dt_taskinfo>() { sendTask });
if (content.Status)
{
--
Gitblit v1.9.3