ZhiHuiQiCe/LongDeLiLiKu.git

liulijun

昨天 209a219fd924ab0bbf88b1fd6b1534421c735666

添加强制结托

添加强制结托

已修改5个文件

	项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob1_CP.cs	15 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob2_CP.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob3_CP.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob4_CP.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob5_CP.cs	17 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob1_CP.cs

@@ -130,6 +130,21 @@
                                var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
                                if (axis != null)
                                {
                                    //寮哄埗缁撴墭
                                    if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
                                    {
                                        WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
                                        if (responseContent.Status)
                                        {
                                            device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
                                            WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
                                        }
                                        else
                                        {
                                            WriteError(item.StationName, $"{responseContent.Message}");
                                        }
                                        continue;
                                    }
                                    //杩涜缁撴墭
                                    if (Convert.ToInt32(PackNum) == axis.PackNum)
                                    {

 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob2_CP.cs

@@ -1,4 +1,4 @@
锘縰sing Autofac.Core;
using Autofac.Core;
using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
@@ -130,6 +130,21 @@
                                var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
                                if (axis != null)
                                {
                                    //寮哄埗缁撴墭
                                    if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
                                    {
                                        WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
                                        if (responseContent.Status)
                                        {
                                            device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
                                            WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
                                        }
                                        else
                                        {
                                            WriteError(item.StationName, $"{responseContent.Message}");
                                        }
                                        continue;
                                    }
                                    //杩涜缁撴墭
                                    if (Convert.ToInt32(PackNum) == axis.PackNum)
                                    {

 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob3_CP.cs

@@ -1,4 +1,4 @@
锘縰sing Autofac.Core;
using Autofac.Core;
using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
@@ -130,6 +130,21 @@
                                var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
                                if (axis != null)
                                {
                                    //寮哄埗缁撴墭
                                    if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
                                    {
                                        WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
                                        if (responseContent.Status)
                                        {
                                            device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
                                            WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
                                        }
                                        else
                                        {
                                            WriteError(item.StationName, $"{responseContent.Message}");
                                        }
                                        continue;
                                    }
                                    //杩涜缁撴墭
                                    if (Convert.ToInt32(PackNum) == axis.PackNum)
                                    {

 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob4_CP.cs

@@ -1,4 +1,4 @@
锘縰sing Autofac.Core;
using Autofac.Core;
using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
@@ -130,6 +130,21 @@
                                var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
                                if (axis != null)
                                {
                                    //寮哄埗缁撴墭
                                    if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
                                    {
                                        WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
                                        if (responseContent.Status)
                                        {
                                            device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
                                            WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
                                        }
                                        else
                                        {
                                            WriteError(item.StationName, $"{responseContent.Message}");
                                        }
                                        continue;
                                    }
                                    //杩涜缁撴墭
                                    if (Convert.ToInt32(PackNum) == axis.PackNum)
                                    {

 项目代码/WCS/WCSServices/WIDESEAWCS_Tasks/码垛/MDJob5_CP.cs

@@ -1,4 +1,4 @@
锘縰sing Autofac.Core;
using Autofac.Core;
using Microsoft.AspNetCore.Components.Routing;
using Newtonsoft.Json;
using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
@@ -130,6 +130,21 @@
                                var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
                                if (axis != null)
                                {
                                    //寮哄埗缁撴墭
                                    if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
                                    {
                                        WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
                                        if (responseContent.Status)
                                        {
                                            device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
                                            WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
                                        }
                                        else
                                        {
                                            WriteError(item.StationName, $"{responseContent.Message}");
                                        }
                                        continue;
                                    }
                                    //杩涜缁撴墭
                                    if (Convert.ToInt32(PackNum) == axis.PackNum)
                                    {

			@@ -130,6 +130,21 @@
			var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
			if (axis != null)
			{
			//寮哄埗缁撴墭
			if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
			{
			WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
			if (responseContent.Status)
			{
			device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
			WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
			}
			else
			{
			WriteError(item.StationName, $"{responseContent.Message}");
			}
			continue;
			}
			//杩涜缁撴墭
			if (Convert.ToInt32(PackNum) == axis.PackNum)
			{

			@@ -1,4 +1,4 @@
			锘縰sing Autofac.Core;
			using Autofac.Core;
			using Microsoft.AspNetCore.Components.Routing;
			using Newtonsoft.Json;
			using OfficeOpenXml.FormulaParsing.Excel.Functions.Math;
			@@ -130,6 +130,21 @@
			var axis = _packaxisRepository.QueryFirst(x => x.DeviceCode == item.StackerCraneCode && x.StationCode == stationPackInfo.StationCode && x.PackType== stationPackInfo.PackType);
			if (axis != null)
			{
			//寮哄埗缁撴墭
			if (PackState == 2 && Convert.ToInt32(PackNum) < axis.PackNum)
			{
			WebResponseContent responseContent = _packaxisTaskService.BoxingInBound(item.StationCode);
			if (responseContent.Status)
			{
			device.Communicator.Write<short>(device.DeviceProDTOs.FirstOrDefault(x => x.DeviceProParamName == GetPackSendEnum(item.StackerCraneStationCode).ToString()).DeviceProDataBlock, 2);
			WriteInfo(item.StationName, $"{item.StationName}鍐欏叆宸ヤ綅寮哄埗缁撴墭淇″彿");
			}
			else
			{
			WriteError(item.StationName, $"{responseContent.Message}");
			}
			continue;
			}
			//杩涜缁撴墭
			if (Convert.ToInt32(PackNum) == axis.PackNum)
			{