From 1259cc80bb475c2d873d83af80636d3cc03e07c7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周四, 28 11月 2024 15:21:09 +0800
Subject: [PATCH] Merge branch 'master' of http://222.71.245.114:9086/r/LA24030-LuLI_PackageLine
---
LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs | 58 +++++++++++++++++++---------------------------------------
1 files changed, 19 insertions(+), 39 deletions(-)
diff --git a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
index 6ee81d5..6488fce 100644
--- a/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
+++ b/LA24030_LuLiPackageLine_Wms/Admin.NET.Application/Service/WmsOrder/Mes_BatchOrderUPI_New/Dto/Mes_BatchOrderUPI_NewOutput.cs
@@ -11,14 +11,9 @@
public long? Id { get; set; }
/// <summary>
- /// 鎵�鍦ㄥ尯鍩�
+ /// 閮ㄤ欢鏉＄爜
/// </summary>
- public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
-
- /// <summary>
- /// 鏉挎枡鐘舵��
- /// </summary>
- public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
+ public string UPI { get; set; }
/// <summary>
/// 鎵规鍙�
@@ -31,9 +26,19 @@
public string OrderId { get; set; }
/// <summary>
- /// 閮ㄤ欢鏉＄爜
+ /// 鐢熶骇鍗曞彿
/// </summary>
- public string UPI { get; set; }
+ public string Info5 { get; set; }
+
+ /// <summary>
+ /// 鎵�鍦ㄥ尯鍩�
+ /// </summary>
+ public Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }
+
+ /// <summary>
+ /// 鏉挎枡鐘舵��
+ /// </summary>
+ public Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
/// <summary>
/// 閮ㄤ欢鍚嶇О
@@ -56,29 +61,9 @@
public float Thk { get; set; }
/// <summary>
- /// 閮ㄤ欢绾圭悊
- /// </summary>
- public string Matgrid { get; set; }
-
- /// <summary>
- /// 鏄惁灏佽竟
- /// </summary>
- public int? IsEB { get; set; }
-
- /// <summary>
- /// 鎵撳瓟璁惧缂栧彿
- /// </summary>
- public int? DRNum { get; set; }
-
- /// <summary>
/// 鏄惁浼樺寲鍖呰
/// </summary>
public int? IsPA { get; set; }
-
- /// <summary>
- /// 閿垏鍥惧彿
- /// </summary>
- public int? MaterialIndeX { get; set; }
/// <summary>
/// 鍖呰鍙�
@@ -111,11 +96,6 @@
public int? Shelf { get; set; }
/// <summary>
- /// 杞悜瑙掑害
- /// </summary>
- public float? Rotation { get; set; }
-
- /// <summary>
/// 绾哥闀�
/// </summary>
public float? Info1 { get; set; }
@@ -134,11 +114,6 @@
/// 閿�鍞悎鍚屽崟鍙�
/// </summary>
public string Info4 { get; set; }
-
- /// <summary>
- /// 鐢熶骇鍗曞彿
- /// </summary>
- public string Info5 { get; set; }
/// <summary>
/// 绗嚑鍖�
@@ -196,6 +171,11 @@
public string Info16 { get; set; }
/// <summary>
+ /// 鏈烘鑷傛槸鍚︽棆杞�
+ /// </summary>
+ public string Info17 { get; set; }
+
+ /// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
public DateTime? CreateTime { get; set; }
--
Gitblit v1.9.3