From cfea43fe783cdb99faa14f59845e41cfcda7d974 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 16 五月 2024 17:22:48 +0800
Subject: [PATCH] AGV任务删除功能,取空托任务逻辑优化,检测上料任务下发逻辑优化(AGV备料两个)
---
代码管理/WMS/WMS_Server/WIDESEA_WMS/Common/Gantry/QueryData.cs | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Gantry/QueryData.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Gantry/QueryData.cs"
index b31c90b..7e576c3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Gantry/QueryData.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WMS_Server/WIDESEA_WMS/Common/Gantry/QueryData.cs"
@@ -3,8 +3,11 @@
using System.Linq;
using System.Text;
using System.Threading.Tasks;
+using WIDESEA_Core.EFDbContext;
using WIDESEA_Core.FreeDB;
using WIDESEA_Entity.DomainModels;
+using WIDESEA_WMS.IRepositories;
+using WIDESEA_WMS.Repositories;
namespace WIDESEA_WMS.Common
{
@@ -18,7 +21,18 @@
/// <returns></returns>
public static dt_geometry_data QueryMateriel(string type)
{
- var materielinfo = freeDB.Select<dt_geometry_data>().Where(x => x.Description == type).First();
+ VOLContext Context = new VOLContext();
+ Idt_geometry_dataRepository dataRepository = new dt_geometry_dataRepository(Context);
+ var materielinfo = dataRepository.Find(x => x.Description == type).OrderBy(x => x.TypeId).FirstOrDefault();
+ //var materielinfo = freeDB.Select<dt_geometry_data>().Where(x => x.Description == type).First();
+ return materielinfo;
+ }
+ public static dt_geometry_data_detectionline QueryMateriel1(string type)
+ {
+ VOLContext Context = new VOLContext();
+ Idt_geometry_data_detectionlineRepository data_DetectionlineRepository = new dt_geometry_data_detectionlineRepository(Context);
+ //var materielinfo = freeDB.Select<dt_geometry_data_detectionline>().Where(x => x.Description == type).First();
+ var materielinfo = data_DetectionlineRepository.Find(x => x.Description == type).OrderBy(x => x.TypeId).FirstOrDefault();
return materielinfo;
}
/// <summary>
--
Gitblit v1.9.3