From 959aa7cefa8f416452444160cdd4edbea2cadae7 Mon Sep 17 00:00:00 2001
From: wanshenmean <cathay_xy@163.com>
Date: 星期四, 07 十一月 2024 16:53:45 +0800
Subject: [PATCH] 合并冲突
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs | 74 +++++++++++++++++++++++++++++++++++-
1 files changed, 71 insertions(+), 3 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs
index 29851d1..0f1ba4f 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/MOM/ResultTrayCellsStatus.cs
@@ -2,15 +2,83 @@
{
public class ResultTrayCellsStatus : BasicResult
{
+ /// <summary>
+ /// 鎵樼洏缂栧彿
+ /// </summary>
public string TrayBarcode { get; set; }
- public string BindCode { get; set; }
- public List<TrayCellsSerialNos> SerialNos { get; set; }
+
+ /// <summary>
+ /// 鐢佃姱鍒楄〃
+ /// </summary>
+ public List<SerialNoDto> SerialNos { get; set; } = new List<SerialNoDto>();
+
+ public string TrayStatus { get; set; }
+ /// <summary>
+ /// 鏂欐灞炴�у垪琛�
+ /// </summary>
+ public List<TrayBarcodePropertyDto> TrayBarcodePropertys { get; set; } = new List<TrayBarcodePropertyDto>();
}
- public class TrayCellsSerialNos
+ /// <summary>
+ /// 鐢佃姱淇℃伅妯″瀷
+ /// </summary>
+ public class SerialNoDto
{
+ /// <summary>
+ /// 鐢佃姱鍙�
+ /// </summary>
public string SerialNo { get; set; }
+
+ /// <summary>
+ /// 閫氶亾鍙�
+ /// </summary>
public int PositionNo { get; set; }
+
+ public string BindCode { get; set; }
+
+ /// <summary>
+ /// 鐢佃姱鐘舵��
+ /// </summary>
public int SerialNoStatus { get; set; }
}
+
+ /// <summary>
+ /// 鏂欐灞炴�фā鍨�
+ /// </summary>
+ public class TrayBarcodePropertyDto
+ {
+ /// <summary>
+ /// 鏂欐灞炴��
+ /// </summary>
+ public string TrayBarcodeProperty { get; set; }
+
+ /// <summary>
+ /// 宸ュ簭
+ /// </summary>
+ public List<ProcessCodes> ProcessCodes { get; set; } = new List<ProcessCodes>();
+
+ public double Capacity { get; set; }
+
+
+ /// <summary>
+ /// 閫傜敤鐗╂枡缂栫爜/宸ヨ壓鍨嬪彿
+ /// </summary>
+ public List<ProductTypes> ProductType { get; set; } = new List<ProductTypes>();
+ }
+
+ public class ProcessCodes
+ {
+
+ /// <summary>
+ /// 宸ュ簭
+ /// </summary>
+ public string ProcessCode { get; set; }
+ }
+
+ public class ProductTypes
+ {
+
+ public string ProductType { get; set; }
+
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3