From 906a6021decf8c7b0cbd745c24d54dd114b08dfe Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 14 三月 2025 11:23:53 +0800
Subject: [PATCH] 增加咋发咋收的尸体，优化了一些已知问题

---
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_SN.cs           |  141 ++++++++
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_DTL.cs         |  151 ++++++++
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs             |  172 ++++++++++
 Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs    |   36 -
 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs     |    4 
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_DTL.cs          |  156 +++++++++
 Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs                |   26 
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_SN.cs          |  161 +++++++++
 Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN.cs              |  161 +++++++++
 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs |    4 
 10 files changed, 980 insertions(+), 32 deletions(-)

diff --git a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
index 815fa5b..69f11c8 100644
--- a/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
+++ b/Tiger.Business.WMS/Transaction/Yada/Count_BIZ_U9_ASN.cs
@@ -598,38 +598,34 @@
 							ASN_NO =asnDtl.ORDER_NO,
 							ASN_LINE_ID = item.SrcASNDocLineId.ToString(),
 							ASN_LINE = asnDtl.LINE_NO,
+                            ERP_CODE = item.ItemCode1,
 						};
                         receipt.Details.Add(receiptDt);
                     }
 
-					foreach (var item in order.SnList)
+					foreach (var sn in order.SnList)
 					{
-                        var dtl = receipt.Details.First(q => q.ASN_LINE == item.LINE_NO);
+                        var dtl = receipt.Details.First(q => q.ASN_LINE == sn.LINE_NO);
                         BIZ_U9_RECEIPT_SN receiptSn = new()
-						{
-
+                        {
+                            AUTH_ORG = dtl.AUTH_ORG,
                             ORDER_NO = dtl.ORDER_NO,
                             LINE_NO = dtl.LINE_NO,
-                            SN = receipt.Details.First().ORDER_NO,
-                            //META_SN
-                            ITEM_CODE = dtl.ITEM_CODE,
-                            STATUS = BIZ_U9_RECEIPT.STATUSs.Imported.GetValue(),
-                            //  QTY
-                            //UNIT 
-                            //IS_OK
-                            // IS_IN
-                            //IS_SCRAP
-                            //LOTNO
-                            //CARTON_NO
-                            //PALLET_NO 
-							AUTH_ORG = dtl.AUTH_ORG,
-                           // REMARK = result.Data[item].Code,
+                            SN = sn.SN,
+                            META_SN = sn.META_SN,
+                            ITEM_CODE = sn.ITEM_CODE,
+                            STATUS = WMS_ITEM.STATUSs.WaitIn.GetValue(),
+                            QTY = sn.QTY,
+                            UNIT = sn.UNIT,
+                            IS_OK = sn.IS_OK,
+                            IS_IN = sn.IS_IN,
+                            LOTNO = sn.LOTNO,
+                            CARTON_NO = sn.CARTON_NO,
+                            PALLET_NO = sn.PALLET_NO,
                         };
                         receipt.SnList.Add(receiptSn);
                     }
-					
 				}
-               // throw new NotImplementedException();
 
 				//鏇存柊搴撳瓨琛ㄤ俊鎭�
 				var items = MainDB.Queryable<WMS_ITEM>().Where(q => SqlFunc.Subqueryable<BIZ_U9_ASN_SN>().Where(s => s.SN == q.SN && s.ORDER_NO == order.ORDER_NO).Any()).ToList();
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs
index 812e456..1d29ff9 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs
@@ -35,6 +35,10 @@
 		/// </summary>
 		public string DocNo { get; set; }
 		/// <summary>
+		/// 行号
+		/// </summary>
+		public int DocLineNo { get; set; }
+		/// <summary>
 		/// 料号
 		/// </summary>
 		public string ItemCode { get; set; }
diff --git a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs
index f08bcaa..dba137c 100644
--- a/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs
+++ b/Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs
@@ -35,6 +35,10 @@
 		/// </summary>
 		public string DocNo { get; set; }
 		/// <summary>
+		/// 行号
+		/// </summary>
+		public int DocLineNo { get; set; }
+		/// <summary>
 		/// 料号
 		/// </summary>
 		public string ItemCode { get; set; }
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN.cs
new file mode 100644
index 0000000..1b389ff
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN.cs
@@ -0,0 +1,161 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂收单(U9)
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂收单(U9)")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_IN")]
+	public class BIZ_U9_MISC_IN : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂收单(U9)
+		/// </summary>
+		public BIZ_U9_MISC_IN() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)
+		/// </summary>
+		[DisplayName("状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 单据类型编码
+		/// </summary>
+		[DisplayName("单据类型编码")]
+		public string TYPE_CODE { get; set; }
+		/// <summary>
+		/// 单据类型名称
+		/// </summary>
+		[DisplayName("单据类型名称")]
+		public string TYPE_NAME { get; set; }
+		/// <summary>
+		/// ERP单据状态
+		/// </summary>
+		[DisplayName("ERP单据状态")]
+		public string ERP_STATUS_CODE { get; set; }
+		/// <summary>
+		/// ERP单据状态名称
+		/// </summary>
+		[DisplayName("ERP单据状态名称")]
+		public string ERP_STATUS_NAME { get; set; }
+		/// <summary>
+		/// 单据日期
+		/// </summary>
+		[DisplayName("单据日期")]
+		public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 收货人
+		/// </summary>
+		[DisplayName("收货人")]
+		public string RECEIVER { get; set; }
+		/// <summary>
+		/// 收货日期
+		/// </summary>
+		[DisplayName("收货日期")]
+		public DateTime RECEIVE_DATE { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		/// <summary>
+		/// -1:未处理，0:同步处理完，>0:同步处理失败次数
+		/// </summary>
+		[DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
+		public int HANDLED { get; set; }
+		/// <summary>
+		/// 最后一次同步处理日期
+		/// </summary>
+		[DisplayName("最后一次同步处理日期")]
+		public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 过账提交的JSON
+		/// </summary>
+		[DisplayName("过账提交的JSON")]
+		public string COMMIT_JSON { get; set; }
+		/// <summary>
+		/// 过账提交的返回信息
+		/// </summary>
+		[DisplayName("过账提交的返回信息")]
+		public string COMMIT_MSG { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_IN类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_INId))]//ClassA表中的BIZ_U9_MISC_INId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_INId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+
+		/// <summary>
+		/// 枚举：状态(0Init初始化|1Imported已导入|2Arrived已送达|3Counting清点中|4InQC检验中|5Storing上架中|6Review待审核|7Finished已完成|8Cancel已作废)
+		/// </summary>
+		public enum STATUSs
+		{
+			[Description("初始化")]
+			Init = 0,
+			[Description("已导入")]
+			Imported = 1,
+			[Description("已送达")]
+			Arrived = 2,
+			[Description("清点中")]
+			Counting = 3,
+			[Description("检验中")]
+			InQC = 4,
+			[Description("上架中")]
+			Storing = 5,
+			[Description("待审核")]
+			Review = 6,
+			[Description("已完成")]
+			Finished = 7,
+			[Description("已作废")]
+			Cancel = 8,
+		}
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_DTL.cs
new file mode 100644
index 0000000..9b48190
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_DTL.cs
@@ -0,0 +1,156 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂收单(U9)明细
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂收单(U9)明细")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_IN_DTL")]
+	public class BIZ_U9_MISC_IN_DTL : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂收单(U9)明细
+		/// </summary>
+		public BIZ_U9_MISC_IN_DTL() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 单据行号
+		/// </summary>
+		[DisplayName("单据行号")]
+		public string LINE_NO { get; set; }
+		/// <summary>
+		/// 状态(同单据状态)
+		/// </summary>
+		[DisplayName("状态(同单据状态)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 物料编码
+		/// </summary>
+		[DisplayName("物料编码")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 单位
+		/// </summary>
+		[DisplayName("单位")]
+		public string UNIT { get; set; }
+		/// <summary>
+		/// 单据数量
+		/// </summary>
+		[DisplayName("单据数量")]
+		public double QTY { get; set; }
+		/// <summary>
+		/// 成本单位
+		/// </summary>
+		[DisplayName("成本单位")]
+		public string UNIT_COST { get; set; }
+		/// <summary>
+		/// 成本数量
+		/// </summary>
+		[DisplayName("成本数量")]
+		public double QTY_GIFT { get; set; }
+		/// <summary>
+		/// 单价
+		/// </summary>
+		[DisplayName("单价")]
+		public double COST_PRICE { get; set; }
+		/// <summary>
+		/// 成本
+		/// </summary>
+		[DisplayName("成本")]
+		public double COST_MNY { get; set; }
+		/// <summary>
+		/// 存储地点
+		/// </summary>
+		[DisplayName("存储地点")]
+		public string WH_CODE { get; set; }
+		/// <summary>
+		/// 存储地点名称
+		/// </summary>
+		[DisplayName("存储地点名称")]
+		public string WH_NAME { get; set; }
+		/// <summary>
+		/// 受益部门编码
+		/// </summary>
+		[DisplayName("受益部门编码")]
+		public string BNF_DEPT_CODE { get; set; }
+		/// <summary>
+		/// 收益部门名称
+		/// </summary>
+		[DisplayName("收益部门名称")]
+		public string BNF_DEPT_NAME { get; set; }
+		/// <summary>
+		/// ERP编码
+		/// </summary>
+		[DisplayName("ERP编码")]
+		public string ERP_CODE { get; set; }
+		/// <summary>
+		/// 退料原因
+		/// </summary>
+		[DisplayName("退料原因")]
+		public string RETURN_REASON { get; set; }
+		/// <summary>
+		/// 入库原因
+		/// </summary>
+		[DisplayName("入库原因")]
+		public string INSTORE_REASON { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_IN_DTL类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_IN_DTLId))]//ClassA表中的BIZ_U9_MISC_IN_DTLId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_IN_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_SN.cs
new file mode 100644
index 0000000..04bd553
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_IN_SN.cs
@@ -0,0 +1,141 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂收单(U9)条码明细
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂收单(U9)条码明细")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_IN_SN")]
+	public class BIZ_U9_MISC_IN_SN : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂收单(U9)条码明细
+		/// </summary>
+		public BIZ_U9_MISC_IN_SN() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 单据行号
+		/// </summary>
+		[DisplayName("单据行号")]
+		public string LINE_NO { get; set; }
+		/// <summary>
+		/// 条码
+		/// </summary>
+		[DisplayName("条码")]
+		public string SN { get; set; }
+		/// <summary>
+		/// 元条码
+		/// </summary>
+		[DisplayName("元条码")]
+		public string META_SN { get; set; }
+		/// <summary>
+		/// 物料编码
+		/// </summary>
+		[DisplayName("物料编码")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 状态(同WMS_ITEM状态)
+		/// </summary>
+		[DisplayName("状态(同WMS_ITEM状态)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 数量
+		/// </summary>
+		[DisplayName("数量")]
+		public double QTY { get; set; }
+		/// <summary>
+		/// 单位
+		/// </summary>
+		[DisplayName("单位")]
+		public string UNIT { get; set; }
+		/// <summary>
+		/// 是否良品(Y/N)
+		/// </summary>
+		[DisplayName("是否良品(Y/N)")]
+		public string IS_OK { get; set; }
+		/// <summary>
+		/// 是否入库(Y/N)
+		/// </summary>
+		[DisplayName("是否入库(Y/N)")]
+		public string IS_IN { get; set; }
+		/// <summary>
+		/// 是否报废(Y/N)
+		/// </summary>
+		[DisplayName("是否报废(Y/N)")]
+		public string IS_SCRAP { get; set; }
+		/// <summary>
+		/// 批次号
+		/// </summary>
+		[DisplayName("批次号")]
+		public string LOTNO { get; set; }
+		/// <summary>
+		/// 箱号
+		/// </summary>
+		[DisplayName("箱号")]
+		public string CARTON_NO { get; set; }
+		/// <summary>
+		/// 栈板号
+		/// </summary>
+		[DisplayName("栈板号")]
+		public string PALLET_NO { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_IN_SN类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_IN_SNId))]//ClassA表中的BIZ_U9_MISC_IN_SNId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_IN_SNId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs
new file mode 100644
index 0000000..a030a1b
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT.cs
@@ -0,0 +1,172 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂发单(U9)
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂发单(U9)")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_OUT")]
+	public class BIZ_U9_MISC_OUT : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂发单(U9)
+		/// </summary>
+		public BIZ_U9_MISC_OUT() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
+		/// </summary>
+		[DisplayName("状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 单据类型编码
+		/// </summary>
+		[DisplayName("单据类型编码")]
+		public string TYPE_CODE { get; set; }
+		/// <summary>
+		/// 单据类型名称
+		/// </summary>
+		[DisplayName("单据类型名称")]
+		public string TYPE_NAME { get; set; }
+		/// <summary>
+		/// ERP单据状态
+		/// </summary>
+		[DisplayName("ERP单据状态")]
+		public string ERP_STATUS_CODE { get; set; }
+		/// <summary>
+		/// ERP单据状态名称
+		/// </summary>
+		[DisplayName("ERP单据状态名称")]
+		public string ERP_STATUS_NAME { get; set; }
+		/// <summary>
+		/// 单据日期
+		/// </summary>
+		[DisplayName("单据日期")]
+		public DateTime ORDER_DATE { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 备料人
+		/// </summary>
+		[DisplayName("备料人")]
+		public string PREP_PERSON { get; set; }
+		/// <summary>
+		/// 备料完成时间
+		/// </summary>
+		[DisplayName("备料完成时间")]
+		public DateTime FINISH_TIME { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 领料人
+		/// </summary>
+		[DisplayName("领料人")]
+		public string REQ_PERSON { get; set; }
+		/// <summary>
+		/// 领料部门
+		/// </summary>
+		[DisplayName("领料部门")]
+		public string REQ_DEPT { get; set; }
+		/// <summary>
+		/// 出库时间
+		/// </summary>
+		[DisplayName("出库时间")]
+		public DateTime DLVY_TIME { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		/// <summary>
+		/// -1:未处理，0:同步处理完，>0:同步处理失败次数
+		/// </summary>
+		[DisplayName("-1:未处理，0:同步处理完，>0:同步处理失败次数")]
+		public int HANDLED { get; set; }
+		/// <summary>
+		/// 最后一次同步处理日期
+		/// </summary>
+		[DisplayName("最后一次同步处理日期")]
+		public DateTime HANDLED_DATE { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 过账提交的JSON
+		/// </summary>
+		[DisplayName("过账提交的JSON")]
+		public string COMMIT_JSON { get; set; }
+		/// <summary>
+		/// 过账提交的返回信息
+		/// </summary>
+		[DisplayName("过账提交的返回信息")]
+		public string COMMIT_MSG { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_OUT类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_OUTId))]//ClassA表中的BIZ_U9_MISC_OUTId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_OUTId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+
+		/// <summary>
+		/// 枚举：状态(0Init初始化|1WaitPick待捡料|2Picking捡料中|3Picked已捡完|4Sended已发料|5Close已关闭|6Cancel作废)
+		/// </summary>
+		public enum STATUSs
+		{
+			[Description("初始化")]
+			Init = 0,
+			[Description("待捡料")]
+			WaitPick = 1,
+			[Description("捡料中")]
+			Picking = 2,
+			[Description("已捡完")]
+			Picked = 3,
+			[Description("已发料")]
+			Sended = 4,
+			[Description("已关闭")]
+			Close = 5,
+			[Description("作废")]
+			Cancel = 6,
+		}
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_DTL.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_DTL.cs
new file mode 100644
index 0000000..875e7b9
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_DTL.cs
@@ -0,0 +1,151 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂发单(U9)明细
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂发单(U9)明细")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_OUT_DTL")]
+	public class BIZ_U9_MISC_OUT_DTL : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂发单(U9)明细
+		/// </summary>
+		public BIZ_U9_MISC_OUT_DTL() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 单据行号
+		/// </summary>
+		[DisplayName("单据行号")]
+		public string LINE_NO { get; set; }
+		/// <summary>
+		/// 状态(同单据状态)
+		/// </summary>
+		[DisplayName("状态(同单据状态)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 物料编码
+		/// </summary>
+		[DisplayName("物料编码")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 单位
+		/// </summary>
+		[DisplayName("单位")]
+		public string UNIT { get; set; }
+		/// <summary>
+		/// 单据数量
+		/// </summary>
+		[DisplayName("单据数量")]
+		public double QTY { get; set; }
+		/// <summary>
+		/// 成本单位
+		/// </summary>
+		[DisplayName("成本单位")]
+		public string UNIT_COST { get; set; }
+		/// <summary>
+		/// 成本数量
+		/// </summary>
+		[DisplayName("成本数量")]
+		public double QTY_GIFT { get; set; }
+		/// <summary>
+		/// 单价
+		/// </summary>
+		[DisplayName("单价")]
+		public double COST_PRICE { get; set; }
+		/// <summary>
+		/// 成本
+		/// </summary>
+		[DisplayName("成本")]
+		public double COST_MNY { get; set; }
+		/// <summary>
+		/// 存储地点
+		/// </summary>
+		[DisplayName("存储地点")]
+		public string WH_CODE { get; set; }
+		/// <summary>
+		/// 存储地点名称
+		/// </summary>
+		[DisplayName("存储地点名称")]
+		public string WH_NAME { get; set; }
+		/// <summary>
+		/// 受益部门编码
+		/// </summary>
+		[DisplayName("受益部门编码")]
+		public string BNF_DEPT_CODE { get; set; }
+		/// <summary>
+		/// 收益部门名称
+		/// </summary>
+		[DisplayName("收益部门名称")]
+		public string BNF_DEPT_NAME { get; set; }
+		/// <summary>
+		/// ERP编码
+		/// </summary>
+		[DisplayName("ERP编码")]
+		public string ERP_CODE { get; set; }
+		/// <summary>
+		/// 出库原因
+		/// </summary>
+		[DisplayName("出库原因")]
+		public string OUTSTORE_REASON { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_OUT_DTL类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_OUT_DTLId))]//ClassA表中的BIZ_U9_MISC_OUT_DTLId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_OUT_DTLId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_SN.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_SN.cs
new file mode 100644
index 0000000..38bd6be
--- /dev/null
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_U9_MISC_OUT_SN.cs
@@ -0,0 +1,161 @@
+using System;
+using SqlSugar;
+using System.Linq;
+using System.ComponentModel;
+using System.Collections.Generic;
+
+namespace Tiger.Model
+{
+	/// <summary>
+	/// 实体：杂发单(U9)条码明细
+	/// </summary>
+	[Description("Primary:ID")]
+	[DisplayName("杂发单(U9)条码明细")]
+	[Serializable]
+	[SugarTable("BIZ_U9_MISC_OUT_SN")]
+	public class BIZ_U9_MISC_OUT_SN : DbEntityWithAuth
+	{
+		#region 构造函数
+		/// <summary>
+		/// 实体：杂发单(U9)条码明细
+		/// </summary>
+		public BIZ_U9_MISC_OUT_SN() {}
+		#endregion
+
+		#region 公共属性
+		/// <summary>
+		/// 单据号
+		/// </summary>
+		[DisplayName("单据号")]
+		public string ORDER_NO { get; set; }
+		/// <summary>
+		/// 单据行号
+		/// </summary>
+		[DisplayName("单据行号")]
+		public string LINE_NO { get; set; }
+		/// <summary>
+		/// 条码
+		/// </summary>
+		[DisplayName("条码")]
+		public string SN { get; set; }
+		/// <summary>
+		/// 元条码
+		/// </summary>
+		[DisplayName("元条码")]
+		public string META_SN { get; set; }
+		/// <summary>
+		/// 物料编码
+		/// </summary>
+		[DisplayName("物料编码")]
+		public string ITEM_CODE { get; set; }
+		/// <summary>
+		/// 状态(同WMS_ITEM状态)
+		/// </summary>
+		[DisplayName("状态(同WMS_ITEM状态)")]
+		public int STATUS { get; set; }
+		/// <summary>
+		/// 数量
+		/// </summary>
+		[DisplayName("数量")]
+		public double QTY { get; set; }
+		/// <summary>
+		/// 单位
+		/// </summary>
+		[DisplayName("单位")]
+		public string UNIT { get; set; }
+		/// <summary>
+		/// 发料仓库
+		/// </summary>
+		[DisplayName("发料仓库")]
+		public string WH_CODE { get; set; }
+		/// <summary>
+		/// 发料储区
+		/// </summary>
+		[DisplayName("发料储区")]
+		public string REGION_CODE { get; set; }
+		/// <summary>
+		/// 发料货架/料车
+		/// </summary>
+		[DisplayName("发料货架/料车")]
+		public string SHELF_CODE { get; set; }
+		/// <summary>
+		/// 发料储位
+		/// </summary>
+		[DisplayName("发料储位")]
+		public string LOCATION_CODE { get; set; }
+		/// <summary>
+		/// 下架时间
+		/// </summary>
+		[DisplayName("下架时间")]
+		public DateTime DOWN_TIME { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 出库时间
+		/// </summary>
+		[DisplayName("出库时间")]
+		public DateTime DLVY_TIME { get; set; } = DateTime.MinValue;
+		/// <summary>
+		/// 是否出库(Y/N)
+		/// </summary>
+		[DisplayName("是否出库(Y/N)")]
+		public string IS_OUT { get; set; }
+		/// <summary>
+		/// 批次号
+		/// </summary>
+		[DisplayName("批次号")]
+		public string LOTNO { get; set; }
+		/// <summary>
+		/// 箱号
+		/// </summary>
+		[DisplayName("箱号")]
+		public string CARTON_NO { get; set; }
+		/// <summary>
+		/// 栈板号
+		/// </summary>
+		[DisplayName("栈板号")]
+		public string PALLET_NO { get; set; }
+		/// <summary>
+		/// 备注
+		/// </summary>
+		[DisplayName("备注")]
+		public string REMARK { get; set; }
+		#endregion
+
+		#region 虚拟属性
+		/*例子
+		[SugarColumn(IsIgnore = true)]
+		public string FieldName { get; set; }
+		*/
+		#endregion
+
+		#region 外键属性
+		/*例子
+		//一对一外键导航
+		[Navigate(NavigateType.OneToOne, nameof(ClassAId))]//一对一 ClassAId是BIZ_U9_MISC_OUT_SN类里面的外键ID字段
+		public ClassA ClassA { get; set; } //注意禁止手动赋值，只能是null
+		//一对多外键导航
+		[Navigate(NavigateType.OneToMany, nameof(ClassA.BIZ_U9_MISC_OUT_SNId))]//ClassA表中的BIZ_U9_MISC_OUT_SNId
+		public List<ClassA> ClassAList { get; set; }//注意禁止手动赋值，只能是null
+		//多对多外键导航
+		[Navigate(typeof(MappingClass), nameof(MappingClass.BIZ_U9_MISC_OUT_SNId), nameof(MappingClass.ClassAId))]//注意顺序
+		public List<ClassA> ClassAList { get; set; } //注意禁止手动赋值，只能是null
+		*/
+		#endregion
+
+		#region 枚举变量
+		/*例子
+		public enum FieldNames
+		{
+			[Description("枚举描述0")]
+			Enum0,
+			[Description("枚举描述1")]
+			Enum1,
+		}
+		*/
+		#endregion
+
+		#region 公共方法
+
+		#endregion
+
+	}//endClass
+}
\ No newline at end of file
diff --git a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
index 702f9d2..903637f 100644
--- a/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
+++ b/Tiger.Model.Net/Entitys/WMS/BIZ_WMS_PREP.cs
@@ -39,9 +39,9 @@
 		[DisplayName("发料方式(0Whole整单发料|1SideA/A面发料|2SideB/B面发料)")]
 		public int DLVY_MODE { get; set; }
 		/// <summary>
-		/// 状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)
+		/// 状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)
 		/// </summary>
-		[DisplayName("状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)")]
+		[DisplayName("状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)")]
 		public int STATUS { get; set; }
 		/// <summary>
 		/// 来源单据编码，多个用“'”分隔
@@ -212,24 +212,26 @@
 		}
 
 		/// <summary>
-		/// 枚举：状态(0WaitCall待叫料|1WaitPick待捡料|2Picking捡料中|3WaitSend待发料|4Sended已发料|5Close已关闭|6Cancel作废)
+		/// 枚举：状态(0Init初始化|1Called已叫料|2WaitPick待捡料|3Picking捡料中|4Picked已捡完|5Sended已发料|6Close已关闭|7Cancel作废)
 		/// </summary>
 		public enum STATUSs
 		{
-			[Description("待叫料")]
-			WaitCall = 0,
+			[Description("初始化")]
+			Init = 0,
+			[Description("已叫料")]
+			Called = 1,
 			[Description("待捡料")]
-			WaitPick = 1,
+			WaitPick = 2,
 			[Description("捡料中")]
-			Picking = 2,
-			[Description("待发料")]
-			WaitSend = 3,
+			Picking = 3,
+			[Description("已捡完")]
+			Picked = 4,
 			[Description("已发料")]
-			Sended = 4,
+			Sended = 5,
 			[Description("已关闭")]
-			Close = 5,
+			Close = 6,
 			[Description("作废")]
-			Cancel = 6,
+			Cancel = 7,
 		}
 		#endregion
 

--
Gitblit v1.9.3