1
huangxiaoqiang
2025-04-08 c814a981db2a078a3d1021263ad349e2c1de9188
1
已修改4个文件
11 ■■■■ 文件已修改
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Code Management/WCS/WIDESEAWCS_Client/src/views/ProcessParameters/PlatForm.vue
@@ -33,7 +33,7 @@
      stacker: "",
      executionMethod:"",
      platformType:"",
      plcCode:"",
      deviceCode:"",
      location: "",
      capacity: "",
      status: "",
@@ -59,7 +59,7 @@
      stacker: "",
      executionMethod:"",
      platformType:"",
      plcCode:"",
      deviceCode:"",
      location: "",
      capacity: "",
      status: "",
@@ -99,6 +99,7 @@
        type: "string",
        width: 90,
        align: "left",
        // hidden:true,
      },
      {
        field: "status",
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
@@ -65,7 +65,7 @@
        [ImporterHeader(Name = "对应PLC编号")]
        [ExporterHeader(DisplayName = "对应PLC编号")]
        [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "对应PLC编号")]
        public string PLCCode { get; set; }
        public string DeviceCode { get; set; }
        /// <summary>
        /// 站台位置
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs
@@ -257,7 +257,7 @@
                    }
                    // 查询平台信息
                    Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                    Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                    if (platform != null && !string.IsNullOrEmpty(platform.Location))
                    {
                        var strings = platform.Location.Split(',').ToList();
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_GW/CommonConveyorLine_GWJob.cs
@@ -134,7 +134,7 @@
                        if (childDeviceCode == "1670"||childDeviceCode=="1666"||childDeviceCode=="1548"||childDeviceCode=="1448")
                        {
                            Platform platform = _platFormRepository.QueryFirst(x => x.PLCCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                            Platform platform = _platFormRepository.QueryFirst(x => x.DeviceCode == conveyorLine.DeviceCode && x.PlatCode == childDeviceCode && x.Status == "Active");
                            if (platform != null)
                            {
                                if (command.HasPallet != 1)