From 02dd21ca9a064b98aacfdc8c6ffec5a2b575967d Mon Sep 17 00:00:00 2001
From: xiaojiao <xiaojiao@kaokeziliao.com>
Date: 星期四, 26 三月 2026 09:54:56 +0800
Subject: [PATCH] PDA优化选配确认页面
---
项目代码/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/ConveyorLineDispatchJob.cs | 45 ++++++++++++++++++++++-----------------------
1 files changed, 22 insertions(+), 23 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/ConveyorLineDispatchJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/ConveyorLineDispatchJob.cs"
index c0d6f31..da7accd 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/ConveyorLineDispatchJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEA_WCSServer/WIDESEA_WCS/Jobs/ConveyorLine/ConveyorLineDispatchJob.cs"
@@ -1,30 +1,31 @@
-锘縰sing Quartz;
+锘縰sing HslCommunication;
+using Microsoft.EntityFrameworkCore;
+using Newtonsoft.Json;
+using OfficeOpenXml.FormulaParsing.Excel.Functions.Text;
+using Quartz;
using System;
using System.Collections.Generic;
using System.Linq;
+using System.Threading;
using System.Threading.Tasks;
using WIDESEA_Common;
-using WIDESEA_Core.EFDbContext;
-using WIDESEA_Entity.DomainModels;
-using WIDESEA_Services.Repositories;
-using WIDESEA_Services.IRepositories;
-using WIDESEA_WCS.Jobs;
-using WIDESEA_WCS.WCSClient;
-using static System.Collections.Specialized.BitVector32;
-using System.Threading;
-using Microsoft.EntityFrameworkCore;
-using Newtonsoft.Json;
-using WIDESEA_Core.Extensions;
-using HslCommunication;
-using WIDESEA_Services;
-using WIDESEA_Core.Utilities;
-using WIDESEA_Services.Services;
-using WIDESEA_Common.TaskEnum;
-using WIDESEA_WCS.Jobs.ConveyorLine;
using WIDESEA_Common.LogEnum;
+using WIDESEA_Common.TaskEnum;
using WIDESEA_Common.Tools;
+using WIDESEA_Core.EFDbContext;
+using WIDESEA_Core.Extensions;
+using WIDESEA_Core.Utilities;
+using WIDESEA_Entity.DomainModels;
+using WIDESEA_Services;
+using WIDESEA_Services.IRepositories;
+using WIDESEA_Services.Repositories;
+using WIDESEA_Services.Services;
+using WIDESEA_WCS.Jobs;
+using WIDESEA_WCS.Jobs.ConveyorLine;
using WIDESEA_WCS.Jobs.ConveyorLine.InboundArea;
using WIDESEA_WCS.Jobs.ConveyorLine.OutboundArea;
+using WIDESEA_WCS.WCSClient;
+using static System.Collections.Specialized.BitVector32;
namespace WIDESEA_WCS
{
@@ -47,7 +48,6 @@
public string Run(IJobExecutionContext context)
{
-
using (VOLContext dbCcontext = new VOLContext())
{
IDt_PLCinfoHeadRepository _PLCinfoHeadRepository = new Dt_PLCinfoHeadRepository(dbCcontext);
@@ -79,7 +79,6 @@
InboundAreaDispatch.MeasureStationAction(taskWCSinfoRepository, client, "Measure_B");
//鍏ュ簱绔欏彴纭
InboundAreaDispatch.InboundStationAction(taskWCSinfoRepository, taskRGVinfoRepository, client);
-
//鍑哄簱绔欏彴纭
InboundAreaDispatch.OutboundStationAction(taskWCSinfoRepository, taskRGVinfoRepository, client);
}
@@ -132,8 +131,8 @@
//绉伴噸绔欏彴璋冨害 20201
InboundAreaDispatch.InboundWeighAction(taskWCSinfoRepository, client);
//鍑哄簱RFID纭(娴嬮噺)
- InboundAreaDispatch.CheckBarcodeAction(taskWCSinfoRepository, client, "30301");
- InboundAreaDispatch.CheckBarcodeAction(taskWCSinfoRepository, client, "30302");
+ InboundAreaDispatch.CheckBarcodeAction(taskWCSinfoRepository, client, "30301"); // 涓嬮潰鐨� 浠庤繖閲屽嚭鍘�
+ InboundAreaDispatch.CheckBarcodeAction(taskWCSinfoRepository, client, "30302"); // 涓婇潰鐨� 浠庤繖閲岃繘鍘�
}
//璇存槑鏄嚭搴撳尯鐨勮皟搴︼紝鏌ョ湅鍏ュ簱鍖虹嚎浣撶殑杩愯妯″紡
@@ -144,13 +143,13 @@
{
//鍑哄簱鍖哄煙璋冨害
OutboundAreaDispatch.OutboundAreaDispathAction(taskWCSinfoRepository, taskRGVinfoRepository, client);
+ OutboundAreaDispatch.OutboundAreaJZ(taskWCSinfoRepository, taskRGVinfoRepository, client); // 鍑哄簱鍖哄煙鏍″噯
}
else if (modelResult == 2)
{
client.WriteValue(CLineInfoDBName.W_System_RGVState.ToString(), true);
}
}
-
}
return "";
}
--
Gitblit v1.9.3