HuaYiZhongHeng/BaiBuSanlou.git - Gitblit

HuaYiZhongHeng / BaiBuSanlou

百步三楼

上一版本: 0d9fb655 | 补丁 | 提交 | 忽略空白

Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuS...

wanshenmean

2025-03-27 9c4eacfc93f21873f87346ea6e8e825c8d8815dd

Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/BaiBuSanlou

已删除2个文件

已修改3个文件

	.gitignore	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/分容11线入库输送线/Logs_20250320231918.txt	283 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerJZJob/CommonStackerJZCraneJob.cs	505 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 .gitignore

@@ -55169,6 +55169,3 @@
/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/publish/runtimes/linux-arm/native/libSystem.IO.Ports.Native.so
/é¡¹ç®èµæ/é¡¹ç®å¾çº¸/åæ®µçº¿ä½ç¹ä½å¾/08ä¸æ¥¼è¾éå¸å±ç¹ä½å¾1107.dwl2
*.txt
/é¡¹ç®èµæ/é¡¹ç®å¾çº¸/åæ®µçº¿ä½ç¹ä½å¾/08ä¸æ¥¼è¾éå¸å±ç¹ä½å¾1107.dwg.bak
/é¡¹ç®èµæ/é¡¹ç®å¾çº¸/åæ®µçº¿ä½ç¹ä½å¾/08ä¸æ¥¼è¾éå¸å±ç¹ä½å¾1107.DWG.lck
*.lck

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0/Log_PLCReadWrite/·ÖÈÝ11ÏßÈë¿âÊäËÍÏß/Logs_20250320231918.txt

ÎÄ¼þÒÑÉ¾³ý

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/Task/RequestInbound.cs

@@ -556,7 +556,7 @@
                }
            }
        }

        #region
        //public void ExecuteConveyorLineTask(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, int ProtocalDetailValue ,string childDeviceCode)
        //{
        //    var task = _taskService.QueryBarCodeConveyorLineTask(command.Barcode, childDeviceCode);
@@ -613,7 +613,7 @@
        //        }
        //    }
        //}

        #endregion
        /// <summary>
        /// æ§è¡è¾éçº¿ä»»å¡
        /// </summary>

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs

@@ -502,7 +502,7 @@
                }
                else
                {
                    if ((task.TargetAddress == "002-021-001" || task.TargetAddress == "001-021-001") && task.Roadway.Contains("JZ"))
                    if ((task.TargetAddress == "002-061-001" || task.TargetAddress == "001-061-001") && task.Roadway.Contains("JZ"))
                    {
                        string[] endCodes = task.NextAddress.Split("-");
                        stackerCraneTaskCommand.EndRow = Convert.ToInt16(endCodes[0]);

 CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerJZJob/CommonStackerJZCraneJob.cs

ÎÄ¼þÒÑÉ¾³ý