From b5b206551db9d0b3089b3e76732d25ea6219a5f3 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周二, 20 5月 2025 14:26:09 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/HIA24016N_PipeLineDemo
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
index 4f0f127..cbfc3e1 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskExportModel.cs
@@ -52,10 +52,16 @@
[ExcelColumn(Name = "鐩爣搴撲綅", Width = 25)]
public string ToPlace { get; set; }
- /// <summary>
- /// 宸烽亾
- /// </summary>
- [ExcelColumn(Name = "宸烽亾", Width = 25)]
+ /// <summary>
+ /// PLC浠诲姟鍙�
+ /// </summary>
+ [ExcelColumn(Name = "PLC浠诲姟鍙�", Width = 25)]
+ public int PlcTaskId { get; set; }
+
+ /// <summary>
+ /// 宸烽亾
+ /// </summary>
+ [ExcelColumn(Name = "宸烽亾", Width = 25)]
public int? Aisle { get; set; }
/// <summary>
@@ -68,13 +74,13 @@
/// 璁惧绫诲瀷
/// </summary>
[ExcelColumn(Name = "璁惧绫诲瀷", Width = 25)]
- public int Dodevicetype { get; set; }
+ public DodevicetypeEnum Dodevicetype { get; set; }
/// <summary>
/// 璁惧浠诲姟鐘舵��
/// </summary>
[ExcelColumn(Name = "璁惧浠诲姟鐘舵��", Width = 25)]
- public int TaskDodeviceStatus { get; set; }
+ public TaskDodeviceStatus TaskDodeviceStatus { get; set; }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
--
Gitblit v1.9.3