LA24030-LuLI_PackageLine.git

			@@ -9,14 +9,9 @@
			public class Mes_BatchOrderUPI_NewBaseInput
			{
			/// <summary>
			/// 所在区域
			/// 部件条码
			/// </summary>
			public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }

			/// <summary>
			/// 板料状态
			/// </summary>
			public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
			public virtual string UPI { get; set; }

			/// <summary>
			/// 批次号
			@@ -29,9 +24,19 @@
			public virtual string OrderId { get; set; }

			/// <summary>
			/// 部件条码
			/// 生产单号
			/// </summary>
			public virtual string UPI { get; set; }
			public virtual string Info5 { get; set; }

			/// <summary>
			/// 所在区域
			/// </summary>
			public virtual Admin.NET.Application.AreaCodeEnum? AreaCode { get; set; }

			/// <summary>
			/// 板料状态
			/// </summary>
			public virtual Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }

			/// <summary>
			/// 部件名称
			@@ -54,29 +59,9 @@
			public virtual float Thk { get; set; }

			/// <summary>
			/// 部件纹理
			/// </summary>
			public virtual string Matgrid { get; set; }

			/// <summary>
			/// 是否封边
			/// </summary>
			public virtual int? IsEB { get; set; }

			/// <summary>
			/// 打孔设备编号
			/// </summary>
			public virtual int? DRNum { get; set; }

			/// <summary>
			/// 是否优化包装
			/// </summary>
			public virtual int? IsPA { get; set; }

			/// <summary>
			/// 锯切图号
			/// </summary>
			public virtual int? MaterialIndeX { get; set; }

			/// <summary>
			/// 包装号
			@@ -109,11 +94,6 @@
			public virtual int? Shelf { get; set; }

			/// <summary>
			/// 转向角度
			/// </summary>
			public virtual float? Rotation { get; set; }

			/// <summary>
			/// 纸箱长
			/// </summary>
			public virtual float? Info1 { get; set; }
			@@ -127,6 +107,71 @@
			/// 纸箱高
			/// </summary>
			public virtual float? Info3 { get; set; }

			/// <summary>
			/// 销售合同单号
			/// </summary>
			public virtual string Info4 { get; set; }

			/// <summary>
			/// 第几包
			/// </summary>
			public virtual string Info6 { get; set; }

			/// <summary>
			/// 经销店名称
			/// </summary>
			public virtual string Info7 { get; set; }

			/// <summary>
			/// 产品名称
			/// </summary>
			public virtual string Info8 { get; set; }

			/// <summary>
			/// 客户名称
			/// </summary>
			public virtual string Info10 { get; set; }

			/// <summary>
			/// 包装编码
			/// </summary>
			public virtual string Info9 { get; set; }

			/// <summary>
			/// 自提or发货
			/// </summary>
			public virtual string Info11 { get; set; }

			/// <summary>
			/// 包装部件总数量
			/// </summary>
			public virtual string Info12 { get; set; }

			/// <summary>
			/// 包装面积
			/// </summary>
			public virtual string Info13 { get; set; }

			/// <summary>
			/// 部件名称
			/// </summary>
			public virtual string Info14 { get; set; }

			/// <summary>
			/// 部件数量
			/// </summary>
			public virtual int? Info15 { get; set; }

			/// <summary>
			/// 部件尺寸
			/// </summary>
			public virtual string Info16 { get; set; }

			/// <summary>
			/// 机械臂是否旋转
			/// </summary>
			public virtual string Info17 { get; set; }

			/// <summary>
			/// 创建时间
			@@ -163,6 +208,11 @@
			/// </summary>
			public virtual bool IsDelete { get; set; }

			/// <summary>
			/// 标记
			/// </summary>
			public virtual Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }

			}

			/// <summary>
			@@ -176,14 +226,9 @@
			public string? SearchKey { 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>
			/// 批次号
			@@ -196,9 +241,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>
			/// 部件名称
			@@ -221,29 +276,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>
			/// 包装号
			@@ -276,11 +311,6 @@
			public int? Shelf { get; set; }

			/// <summary>
			/// 转向角度
			/// </summary>
			public float? Rotation { get; set; }

			/// <summary>
			/// 纸箱长
			/// </summary>
			public float? Info1 { get; set; }
			@@ -295,6 +325,76 @@
			/// </summary>
			public float? Info3 { get; set; }

			/// <summary>
			/// 销售合同单号
			/// </summary>
			public string? Info4 { get; set; }

			/// <summary>
			/// 第几包
			/// </summary>
			public string? Info6 { get; set; }

			/// <summary>
			/// 经销店名称
			/// </summary>
			public string? Info7 { get; set; }

			/// <summary>
			/// 产品名称
			/// </summary>
			public string? Info8 { get; set; }

			/// <summary>
			/// 客户名称
			/// </summary>
			public string? Info10 { get; set; }

			/// <summary>
			/// 包装编码
			/// </summary>
			public string? Info9 { get; set; }

			/// <summary>
			/// 自提or发货
			/// </summary>
			public string? Info11 { get; set; }

			/// <summary>
			/// 包装部件总数量
			/// </summary>
			public string? Info12 { get; set; }

			/// <summary>
			/// 包装面积
			/// </summary>
			public string? Info13 { get; set; }

			/// <summary>
			/// 部件名称
			/// </summary>
			public string? Info14 { get; set; }

			/// <summary>
			/// 部件数量
			/// </summary>
			public int? Info15 { get; set; }

			/// <summary>
			/// 部件尺寸
			/// </summary>
			public string? Info16 { get; set; }

			/// <summary>
			/// 机械臂是否旋转
			/// </summary>
			public string? Info17 { get; set; }

			/// <summary>
			/// 标记
			/// </summary>
			public Admin.NET.Application.UpiFlagEnum? UpiFlag { get; set; }

			}

			/// <summary>
			@@ -303,10 +403,10 @@
			public class AddMes_BatchOrderUPI_NewInput : Mes_BatchOrderUPI_NewBaseInput
			{
			/// <summary>
			/// 板料状态
			/// 部件条码
			/// </summary>
			[Required(ErrorMessage = "板料状态不能为空")]
			public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }
			[Required(ErrorMessage = "部件条码不能为空")]
			public override string UPI { get; set; }

			/// <summary>
			/// 批次号
			@@ -321,10 +421,10 @@
			public override string OrderId { get; set; }

			/// <summary>
			/// 部件条码
			/// 板料状态
			/// </summary>
			[Required(ErrorMessage = "部件条码不能为空")]
			public override string UPI { get; set; }
			[Required(ErrorMessage = "板料状态不能为空")]
			public override Admin.NET.Application.UpiStatusEnum UpiStatus { get; set; }

			/// <summary>
			/// 部件名称