From fbfbc83d25477cf191e327e034ed996f0a2239d0 Mon Sep 17 00:00:00 2001
From: duyongjia <adu_555@163.com>
Date: 星期四, 19 十二月 2024 18:53:32 +0800
Subject: [PATCH] 上游系统对接提交
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 54 insertions(+), 2 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index e01edc6..4b262f6 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -20,18 +20,24 @@
using Quartz;
using System;
using System.Collections.Generic;
+using System.Data;
using System.Linq;
using System.Reflection;
using System.Text;
using System.Threading.Tasks;
+using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
+using WIDESEAWCS_Core.Enums;
using WIDESEAWCS_Core.Helper;
+using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
using WIDESEAWCS_QuartzJob.DTO;
+using WIDESEAWCS_QuartzJob.Models;
using WIDESEAWCS_QuartzJob.Service;
+using WIDESEAWCS_TaskInfoRepository;
using WIDESEAWCS_Tasks.ConveyorLineJob;
namespace WIDESEAWCS_Tasks
@@ -40,21 +46,23 @@
public class CommonConveyorLineJob : IJob
{
private readonly ITaskService _taskService;
+ private readonly ITaskRepository _taskRepository;
private readonly ITaskExecuteDetailService _taskExecuteDetailService;
+
private readonly IRouterService _routerService;
private readonly IMapper _mapper;
- public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper)
+ public CommonConveyorLineJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper,ITaskRepository taskRepository)
{
_taskService = taskService;
_taskExecuteDetailService = taskExecuteDetailService;
_routerService = routerService;
_mapper = mapper;
+ _taskRepository = taskRepository;
}
public Task Execute(IJobExecutionContext context)
{
-
try
{
CommonConveyorLine conveyorLine = (CommonConveyorLine)context.JobDetail.JobDataMap.Get("JobParams");
@@ -91,6 +99,39 @@
_taskExecuteDetailService.AddTaskExecuteDetail(Intask.TaskId, $"杈撻�佺嚎鍏ュ簱瀹屾垚");
}
}
+ else//濡傛灉鏍规嵁鎵樼洏鏉＄爜鏌ヤ笉鍒颁换鍔★紝鍒欒涓烘槸绌烘墭鐩橈紝绌烘墭鐩樺叆搴撲笉闇�瑕佺粍鐩橈紝鐩存帴鏂板缓浠诲姟
+ {
+ if (command.ISInFinish == 1)
+ {
+ //鍏ュ簱纭淇″彿
+ conveyorLine.Communicator.Write<short>("DB800.6.0", 1);
+ Dt_Task task = new Dt_Task();
+ task.TaskNum= GetTaskNo();
+ task.PalletCode = command.CL1002Barcode;
+ task.TaskType =(int)TaskInboundTypeEnum.Inbound;
+ task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
+ task.Roadway = "SC01";
+ task.SourceAddress = "R01-001-023-001";
+ //鍚慦MS鐢宠绌鸿揣浣�
+ task.TargetAddress= WMSApiInvoke.GetAllLocationGroups(task.PalletCode);
+ _taskService.AddData(task);
+ Dt_Router dt_Router = new Dt_Router();
+ //涓存椂璁板綍涓嬫墭鐩樺拰搴撲綅鐨勭粦瀹氬叧绯�
+ dt_Router.StartPosi = task.TargetAddress;
+ dt_Router.NextPosi = task.PalletCode;
+ dt_Router.InOutType = RouterInOutType.Out;
+ dt_Router.ChildPosi = "1";
+ dt_Router.ChildPosiDeviceCode = "1";
+ dt_Router.IsEnd = true;
+ _routerService.AddData(dt_Router);
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"杈撻�佺嚎鍏ュ簱鎵ц涓�");
+ _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskNum, $"杈撻�佺嚎鍏ュ簱瀹屾垚");
+
+
+ }
+
+
+ }
Dt_Task Outtask = _taskService.QueryConveyorLineOutTask(command.Barcode);
if (Outtask != null)
@@ -126,6 +167,17 @@
return Task.CompletedTask;
}
+
+ /// <summary>
+ /// 鑾峰彇浠诲姟缂栧彿
+ /// </summary>
+ /// <returns></returns>
+ public int GetTaskNo()
+ {
+ DataTable dt = _taskRepository.QueryTable("select next value for dbo.seqTaskNum");
+ return int.Parse(dt.Rows[0][0].ToString());
+ }
+
/// <summary>
/// 杈撻�佺嚎璇锋眰鍏ュ簱
/// </summary>
--
Gitblit v1.9.3