From 70b4bdc6f999c55b75138e013abf436100e9987b Mon Sep 17 00:00:00 2001 From: liudl <673013083@qq.com> Date: 星期一, 23 六月 2025 15:33:16 +0800 Subject: [PATCH] 修改手自动 --- Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs | 117 +++++++++++++++++++++++++++++++++++++++++++--------------- 1 files changed, 86 insertions(+), 31 deletions(-) diff --git a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs index 33dcd35..5a8f9a1 100644 --- a/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs +++ b/Admin.NET/WCS.Application/Service/WcsDevice/Dto/WcsDeviceOutput.cs @@ -1,9 +1,4 @@ -锘�// Admin.NET 椤圭洰鐨勭増鏉冦�佸晢鏍囥�佷笓鍒╁拰鍏朵粬鐩稿叧鏉冨埄鍧囧彈鐩稿簲娉曞緥娉曡鐨勪繚鎶ゃ�備娇鐢ㄦ湰椤圭洰搴旈伒瀹堢浉鍏虫硶寰嬫硶瑙勫拰璁稿彲璇佺殑瑕佹眰銆� -// -// 鏈」鐩富瑕侀伒寰� MIT 璁稿彲璇佸拰 Apache 璁稿彲璇侊紙鐗堟湰 2.0锛夎繘琛屽垎鍙戝拰浣跨敤銆傝鍙瘉浣嶄簬婧愪唬鐮佹爲鏍圭洰褰曚腑鐨� LICENSE-MIT 鍜� LICENSE-APACHE 鏂囦欢銆� -// -// 涓嶅緱鍒╃敤鏈」鐩粠浜嬪嵄瀹冲浗瀹跺畨鍏ㄣ�佹壈涔辩ぞ浼氱З搴忋�佷镜鐘粬浜哄悎娉曟潈鐩婄瓑娉曞緥娉曡绂佹鐨勬椿鍔紒浠讳綍鍩轰簬鏈」鐩簩娆″紑鍙戣�屼骇鐢熺殑涓�鍒囨硶寰嬬籂绾峰拰璐d换锛屾垜浠笉鎵挎媴浠讳綍璐d换锛� - +锘� namespace WCS.Application; /// <summary> @@ -15,102 +10,162 @@ /// 涓婚敭Id /// </summary> public long Id { get; set; } - + + /// <summary> + /// 浜や簰绫诲瀷 + /// </summary> + public DeviceTypeEnum DeviceType { get; set; } + /// <summary> /// PlcId /// </summary> - public long PlcId { get; set; } - + public long PlcId { get; set; } + /// <summary> /// PlcId 鎻忚堪 /// </summary> - public string PlcIdIP { get; set; } - + public string PlcIdIP { get; set; } + + /// <summary> + /// 璁惧绫诲瀷 + /// </summary> + public PLCTypeEnum Type { get; set; } + /// <summary> /// 璁惧绾у埆 /// </summary> public DeviceLevelEnum Level { get; set; } - + /// <summary> /// DB鍖哄煙 /// </summary> public string? DbNumber { get; set; } - + /// <summary> /// 宸ヤ綅鍙� /// </summary> public string? StationNum { get; set; } - + /// <summary> /// PLC鍋忕Щ閲� /// </summary> public string? PlcPos { get; set; } - + /// <summary> /// WCS鍋忕Щ閲� /// </summary> public string? WcsPos { get; set; } - + /// <summary> /// 娴佺▼瀛楃被鍨� /// </summary> - public string? PosType { get; set; } - + public PLCDataTypeEnum PosType { get; set; } + /// <summary> /// 鏄剧ず灞廼p鍦板潃 /// </summary> public string? LedIP { get; set; } - + /// <summary> /// 鎻忚堪 /// </summary> public string? Text { get; set; } - + /// <summary> /// 鍒涘缓鏃堕棿 /// </summary> public DateTime? CreateTime { get; set; } - + /// <summary> /// 鏇存柊鏃堕棿 /// </summary> public DateTime? UpdateTime { get; set; } - + /// <summary> /// 鍒涘缓鑰匢d /// </summary> public long? CreateUserId { get; set; } - + /// <summary> /// 鍒涘缓鑰呭鍚� /// </summary> public string? CreateUserName { get; set; } - + /// <summary> /// 淇敼鑰匢d /// </summary> public long? UpdateUserId { get; set; } - + /// <summary> /// 淇敼鑰呭鍚� /// </summary> public string? UpdateUserName { get; set; } - + /// <summary> /// 鍒涘缓鑰呴儴闂↖d /// </summary> public long? CreateOrgId { get; set; } - + /// <summary> /// 鍒涘缓鑰呴儴闂ㄥ悕绉� /// </summary> public string? CreateOrgName { get; set; } - + /// <summary> /// 杞垹闄� /// </summary> public bool IsDelete { get; set; } - - } - + + /// <summary> + /// 浠诲姟鍙� + /// </summary> + public string TaskNo { get; set; } + /// <summary> + /// 浠诲姟绫诲瀷 + /// </summary> + public TaskTypeEnum? TaskType { get; set; } + /// <summary> + /// 璧峰宸ヤ綅 + /// </summary> + public string StartLocatNo { get; set; } + /// <summary> + /// 缁撴潫宸ヤ綅 + /// </summary> + public string EndLocatNo { get; set; } + /// <summary> + /// 鎵樼洏鐮� + /// </summary> + public string PalletNo { get; set; } + public string Plc { get; set; } + public string Wcs { get; set; } + /// <summary> + /// 杩炴帴鐘舵�� + /// </summary> + public bool Status { get; set; } = false; + /// <summary> + /// 鏀捐揣鎺� + /// </summary> + public int? ReleaseRow { get; set; } + /// <summary> + /// 鏀捐揣鍒� + /// </summary> + public int? ReleaseCol { get; set; } + /// <summary> + /// 鏀捐揣灞� + /// </summary> + public int? ReleaseStorey { get; set; } + /// <summary> + /// 鍙栬揣鎺� + /// </summary> + public int? PickRow { get; set; } + /// <summary> + /// 鍙栬揣鍒� + /// </summary> + public int? PickCol { get; set; } + /// <summary> + /// 鍙栬揣灞� + /// </summary> + public int? PickStorey { get; set; } +} + -- Gitblit v1.8.0