From 504eb4e5d48557eac2bcf233452e44964f0e0640 Mon Sep 17 00:00:00 2001
From: zs <zhousong@weben-smart.com>
Date: 周三, 07 5月 2025 12:06:51 +0800
Subject: [PATCH] 冲突
---
HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs | 100 +++++++++++++++++++++++++-------------------------
1 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
index 11a88f6..134b62b 100644
--- a/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
+++ b/HIAWms/server/src/CMS.Plugin.HIAWms.Application.Contracts/Dtos/WmsTask/WmsTaskCreateOrUpdateDtoBase.cs
@@ -5,14 +5,29 @@
namespace CMS.Plugin.HIAWms.Application.Contracts.Dtos.WmsTask;
/// <summary>
-/// Wms浠诲姟绠＄悊琛ㄥ垱寤烘垨鏇存柊鍩虹被
+/// Wms浠诲姟绠＄悊鍒涘缓鎴栨洿鏂板熀绫�
/// </summary>
public abstract class WmsTaskCreateOrUpdateDtoBase : ExtensibleEntityDto
{
/// <summary>
- /// 宸烽亾
+ /// 浠诲姟鍙�
/// </summary>
- public int? Aisle { get; set; }
+ public string TaskNo { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绫诲瀷
+ /// </summary>
+ public TaskTypeEnum TaskType { get; set; }
+
+ /// <summary>
+ /// 浠诲姟绛夌骇
+ /// </summary>
+ public int TaskLevel { get; set; }
+
+ /// <summary>
+ /// 浠诲姟鐘舵��
+ /// </summary>
+ public WmsTaskStatus TaskStatus { get; set; }
/// <summary>
/// 鎵樼洏缂栧彿
@@ -20,9 +35,19 @@
public string? ContainerNo { get; set; }
/// <summary>
- ///
+ /// 璧峰搴撲綅
/// </summary>
- public string? CreatorId { get; set; }
+ public string? SourcePlace { get; set; }
+
+ /// <summary>
+ /// 鐩爣搴撲綅
+ /// </summary>
+ public string? ToPlace { get; set; }
+
+ /// <summary>
+ /// 宸烽亾
+ /// </summary>
+ public int? Aisle { get; set; }
/// <summary>
/// 鍫嗗灈鏈篒D
@@ -35,14 +60,9 @@
public int Dodevicetype { get; set; }
/// <summary>
- /// 鏄惁绂佺敤
+ /// 璁惧浠诲姟鐘舵��
/// </summary>
- public bool? IsDisabled { get; set; }
-
- /// <summary>
- /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
- /// </summary>
- public int? IsNextTask { get; set; }
+ public int TaskDodeviceStatus { get; set; }
/// <summary>
/// WCS鏄惁鍙互璇诲彇
@@ -50,9 +70,19 @@
public bool IsRead { get; set; }
/// <summary>
- ///
+ /// 瀛愪换鍔＄被鍨�
/// </summary>
- public string? LastModifierId { get; set; }
+ public SonTaskTypeEnum? SonTaskType { get; set; }
+
+ /// <summary>
+ /// 鏉ユ簮鍗曟嵁鍙�
+ /// </summary>
+ public string? SourceOrderNo { get; set; }
+
+ /// <summary>
+ /// 涓嬩釜浠诲姟鏄惁鐢熸垚鎴愬姛
+ /// </summary>
+ public int? IsNextTask { get; set; }
/// <summary>
/// 鍙彉鍙橀噺1
@@ -70,54 +100,24 @@
public string? MutableParam3 { get; set; }
/// <summary>
- /// 瀛愪换鍔＄被鍨�
- /// </summary>
- public SonTaskTypeEnum? SonTaskType { get; set; }
-
- /// <summary>
/// 鎺掑簭
/// </summary>
public int Sort { get; set; }
/// <summary>
- /// 鏉ユ簮鍗曟嵁鍙�
+ /// 鏄惁绂佺敤
/// </summary>
- public string? SourceOrderNo { get; set; }
+ public bool? IsDisabled { get; set; }
/// <summary>
- /// 璧峰搴撲綅
+ ///
/// </summary>
- public string? SourcePlace { get; set; }
+ public string? CreatorId { get; set; }
/// <summary>
- /// 璁惧浠诲姟鐘舵��
+ ///
/// </summary>
- public int TaskDodeviceStatus { get; set; }
-
- /// <summary>
- /// 浠诲姟绛夌骇
- /// </summary>
- public int TaskLevel { get; set; }
-
- /// <summary>
- /// 浠诲姟鍙�
- /// </summary>
- public string TaskNo { get; set; }
-
- /// <summary>
- /// 浠诲姟鐘舵��
- /// </summary>
- public WmsTaskStatus TaskStatus { get; set; }
-
- /// <summary>
- /// 浠诲姟绫诲瀷
- /// </summary>
- public TaskTypeEnum TaskType { get; set; }
-
- /// <summary>
- /// 鐩爣搴撲綅
- /// </summary>
- public string? ToPlace { get; set; }
+ public string? LastModifierId { get; set; }
--
Gitblit v1.9.3