duyongjia
2025-01-08 66820281eb452bd79735b03c3175b64cec861699
增加根据重量判断是否是空托盘判断逻辑
已修改2个文件
已添加1个文件
41 ■■■■■ 文件已修改
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
项目资料/接口文档/广西弗迪输送线交互-12-13.xlsx 补丁 | 查看 | 原始文档 | blame | 历史
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs
@@ -481,15 +481,15 @@
                        _unitOfWorkManage.BeginTran();
                        UpdateTaskStatus(task.TaskId, (int)TaskOutStatusEnum.SC_OutFinish);
                        _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机出库完成");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS,任务号:【{taskNum}】");
                        var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                        if(response.Status)
                        {
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS成功");
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS成功,任务号:【{taskNum}】");
                        }
                        else
                        {
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS失败");
                            ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机出库完成状态回写WMS失败,任务号:【{taskNum}】");
                        }
                        _unitOfWorkManage.CommitTran();
                        return content.OK();
@@ -508,33 +508,33 @@
                    _unitOfWorkManage.BeginTran();
                    UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.SC_InFinish);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"堆垛机入库完成");
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS");
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS,任务号:【{taskNum}】");
                    var response= HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "UpdateTaskStatus?taskNum=" + task.TaskNum, "", "更新任务状态");
                    if(response.Status)
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS成功");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS成功,任务号:【{taskNum}】");
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS失败");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"堆垛机入库完成状态回写WMS失败,任务号:【{taskNum}】");
                    }
                    UpdateTaskStatus(task.TaskId, (int)TaskInStatusEnum.InFinish);
                    _taskExecuteDetailService.AddTaskExecuteDetail(task.TaskId, $"入库任务完成");
                    //if (App.User.UserId > 0)
                    //{
                    task.Modifier = "System";
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS");
                    ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS,任务号:【{taskNum}】");
                    var response2 = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + task.TaskNum, "", "任务完成");
                    if (response2.Status)
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS成功");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS成功,任务号:【{taskNum}】");
                        _unitOfWorkManage.CommitTran();
                        return content.OK();
                    }
                    else
                    {
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS失败");
                        ServiceLogger.WriteDebug("StackCraneTaskCompleted", $"入库任务完成回写WMS失败,任务号:【{taskNum}】");
                        _unitOfWorkManage.RollbackTran();
                        return content = WebResponseContent.Instance.Error(response.Message);
                    }
@@ -594,17 +594,17 @@
        public WebResponseContent OutBoundTaskByWMS(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS");
            ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS,任务号:{taskNum}");
            var response = HttpHelpers.Post<WebResponseContent>(url.Replace("PDA", "Task") + "TaskCompleted?taskNum=" + taskNum, "", "任务完成");
            if (response.Status)
            {
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS成功");
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS成功,任务号:{taskNum}");
                _unitOfWorkManage.CommitTran();
                return content.OK();
            }
            else
            {
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS失败");
                ServiceLogger.WriteDebug("OutBoundTaskByWMS", $"出库任务完成回写WMS失败,任务号:{taskNum}");
                _unitOfWorkManage.RollbackTran();
                return content = WebResponseContent.Instance.Error(response.Message);
            }
ÏîÄ¿´úÂë/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -18,6 +18,7 @@
using AutoMapper;
using Quartz;
using System.Data;
using System.Threading.Tasks;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_ITaskInfoRepository;
using WIDESEAWCS_ITaskInfoService;
@@ -29,7 +30,7 @@
namespace WIDESEAWCS_Tasks
{
    [DisallowConcurrentExecution]
    public class CommonConveyorLineJob : IJob
    public class CommonConveyorLineJob :JobBase, IJob
    {
        private readonly ITaskService _taskService;
        private readonly ITaskRepository _taskRepository;
@@ -89,10 +90,18 @@
                            }
                            else//如果根据托盘条码查不到任务,则认为是空托盘,空托盘入库可以不需要组盘,直接新建任务,也可以直接下空托出库任务
                            {
                                if (command.ISInFinish == 1)
                                if (command.ISInFinish == 1)//增加根据重量判断是否是空托盘判断逻辑
                                {
                                    //先不给PLC入库确认信号,调WMS空托入库任务接口
                                    _taskService.GenerateEmptyInBoundTask(command.CL1002Barcode);
                                    if (command.Weight <= 600)
                                    {
                                        //先不给PLC入库确认信号,调WMS空托入库任务接口
                                        _taskService.GenerateEmptyInBoundTask(command.CL1002Barcode);
                                    }
                                    else
                                    {
                                        WriteDebug(nameof(CommonConveyorLineJob), $"生成空托入库任务时,重量超重,生成空托入库任务失败!");
                                    }
                                }
                            }
ÏîÄ¿×ÊÁÏ/½Ó¿ÚÎĵµ/¹ãÎ÷¸¥µÏÊäËÍÏß½»»¥-12-13.xlsx
Binary files differ