Tiger.Business.WMS/Transaction/Yada/In_BIZ_U9_RECEIPT.cs
@@ -11,7 +11,6 @@ using Tiger.IBusiness; using Tiger.Model.Sharetronic.Shelf; using Tiger.Business.WMS.Sharetronic.Shelf; using static IronPython.Modules._ast; namespace Tiger.Business.WMS.Transaction { @@ -375,7 +374,7 @@ action.LocaleMsg = Biz.L("WMS.Default.ScanItem.PutOnSucceeded", CurInvItem.SN, CurInvItem.Location.LOCATION_CODE); //重置工序 ResetScan(); ResetScanInfo(); return action; } @@ -387,9 +386,17 @@ public override void ResetScan() { base.ResetScan(); ResetScanInfo(); CurScanShelf = null; } /// <summary> /// 重置扫码信息 /// </summary> public void ResetScanInfo() { Command = null; CurInvItem = null; CurScanShelf = null; } public override bool Close(bool needSaveHistoryLog = false) Tiger.Model.Net/Entitys/MES/YadaU9/mes_AsnDocInfo.cs
@@ -8,126 +8,126 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_AsnDocInfo /// 实体：mes_AsnDocInfo /// </summary> [Serializable] [SugarTable("mes_AsnDocInfo")] public class mes_AsnDocInfo : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_AsnDocInfo /// 实体：mes_AsnDocInfo /// </summary> public mes_AsnDocInfo() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// 组织 /// 组织 /// </summary> public long Org { get; set; } /// <summary> /// 单ID /// 单ID /// </summary> public long AsnId { get; set; } /// <summary> /// 单号 /// 单号 /// </summary> public string DocNo { get; set; } /// <summary> /// 供应商编码 /// 供应商编码 /// </summary> public string SupplierCode { get; set; } /// <summary> /// 供应商名字 /// 供应商名字 /// </summary> public string SupplierName { get; set; } /// <summary> /// 发货日期 /// 发货日期 /// </summary> public DateTime ShipDate { get; set; } = DateTime.MinValue; /// <summary> /// 预计送达日期 /// 预计送达日期 /// </summary> public DateTime PlanArriveDate { get; set; } = DateTime.MinValue; /// <summary> /// 状态 /// ״̬ /// </summary> public int Status { get; set; } /// <summary> /// 行ID /// 行ID /// </summary> public long LineID { get; set; } /// <summary> /// 行号 /// 行号 /// </summary> public int DocLineNo { get; set; } /// <summary> /// 料号 /// 料号 /// </summary> public string ItemCode { get; set; } /// <summary> /// sap料号 /// sap料号 /// </summary> public string ItemCode1 { get; set; } /// <summary> /// 品名 /// 品名 /// </summary> public string ItemName { get; set; } /// <summary> /// 料品描述 /// 料品描述 /// </summary> public string ItemDescription { get; set; } /// <summary> /// 采购数量 /// 采购数量 /// </summary> public double POQtyTU { get; set; } /// <summary> /// 最小包装数量 /// 最小包装数量 /// </summary> public string PackQty { get; set; } /// <summary> /// 生产批号(供应商) /// 生产批号(供应商) /// </summary> public string SupplierLot { get; set; } /// <summary> /// 批号 /// 批号 /// </summary> public string LotMater { get; set; } /// <summary> /// 更新人 /// 更新人 /// </summary> public string ModifiedBy { get; set; } /// <summary> /// 更新时间 /// 更新时间 /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; /// <summary> /// 单位ID /// 单位ID /// </summary> public long TradeUOM { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_BomComponent /// 实体：mes_BomComponent /// </summary> [Serializable] [SugarTable("mes_BomComponent")] public class mes_BomComponent : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_BomComponent /// 实体：mes_BomComponent /// </summary> public mes_BomComponent() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -64,26 +64,26 @@ public DateTime ModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_BomDetail /// 实体：mes_BomDetail /// </summary> [Serializable] [SugarTable("mes_BomDetail")] public class mes_BomDetail : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_BomDetail /// 实体：mes_BomDetail /// </summary> public mes_BomDetail() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -160,26 +160,26 @@ public DateTime BomComponentModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_MOPickList /// 实体：mes_MOPickList /// </summary> [Serializable] [SugarTable("mes_MOPickList")] public class mes_MOPickList : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_MOPickList /// 实体：mes_MOPickList /// </summary> public mes_MOPickList() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -148,26 +148,26 @@ public string DemandCode { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_MaterialBarCode /// 实体：mes_MaterialBarCode /// </summary> [Serializable] [SugarTable("mes_MaterialBarCode")] public class mes_MaterialBarCode : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_MaterialBarCode /// 实体：mes_MaterialBarCode /// </summary> public mes_MaterialBarCode() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -64,26 +64,26 @@ public string CreateEntity_EntityType { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -25,6 +25,30 @@ /// <summary> /// /// </summary> public long Org { get; set; } /// <summary> /// /// </summary> public long MiscRcvTransID { get; set; } /// <summary> /// /// </summary> public string DocNo { get; set; } /// <summary> /// /// </summary> public string MiscRcvDocType { get; set; } /// <summary> /// /// </summary> public string MiscRcvDocTypeName { get; set; } /// <summary> /// /// </summary> public DateTime BusinessDate { get; set; } = DateTime.MinValue; /// <summary> /// /// </summary> public int Status { get; set; } /// <summary> /// Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscRcvTransLine.cs
@@ -25,27 +25,27 @@ /// <summary> /// /// </summary> public double CostMny { get; set; } public long MiscRcvTransID { get; set; } /// <summary> /// /// </summary> public string WhCode { get; set; } public long MiscRcvTransLineID { get; set; } /// <summary> /// /// </summary> public string WhName { get; set; } public string DocNo { get; set; } /// <summary> /// /// </summary> public string BenefitDept { get; set; } public string ItemCode { get; set; } /// <summary> /// /// </summary> public string BenefitDeptName { get; set; } public string ItemName { get; set; } /// <summary> /// /// </summary> public string ReturnStorageReason { get; set; } public string ItemDescription { get; set; } /// <summary> /// /// </summary> @@ -73,27 +73,47 @@ /// <summary> /// /// </summary> public long MiscRcvTransID { get; set; } public double CostMny { get; set; } /// <summary> /// /// </summary> public long MiscRcvTransLineID { get; set; } public string WhCode { get; set; } /// <summary> /// /// </summary> public string DocNo { get; set; } public string WhName { get; set; } /// <summary> /// /// </summary> public string ItemCode { get; set; } public string BenefitDept { get; set; } /// <summary> /// /// </summary> public string ItemName { get; set; } public string BenefitDeptName { get; set; } /// <summary> /// /// </summary> public string ItemDescription { get; set; } public string ReturnStorageReason { get; set; } /// <summary> /// /// </summary> public string InStorageReason { get; set; } /// <summary> /// /// </summary> public string CreatedBy { get; set; } /// <summary> /// /// </summary> public DateTime CreatedOn { get; set; } = DateTime.MinValue; /// <summary> /// /// </summary> public string ModifiedBy { get; set; } /// <summary> /// /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShip.cs
@@ -26,6 +26,50 @@ /// /// </summary> public long Org { get; set; } /// <summary> /// /// </summary> public long MiscShipID { get; set; } /// <summary> /// /// </summary> public string DocNo { get; set; } /// <summary> /// /// </summary> public string MiscShipDocType { get; set; } /// <summary> /// /// </summary> public string MiscShipDocTypeName { get; set; } /// <summary> /// /// </summary> public DateTime BusinessDate { get; set; } = DateTime.MinValue; /// <summary> /// /// </summary> public int Status { get; set; } /// <summary> /// /// </summary> public string StatusName { get; set; } /// <summary> /// /// </summary> public string CreatedBy { get; set; } /// <summary> /// /// </summary> public DateTime CreatedOn { get; set; } = DateTime.MinValue; /// <summary> /// /// </summary> public string ModifiedBy { get; set; } /// <summary> /// /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 Tiger.Model.Net/Entitys/MES/YadaU9/mes_MiscShipLine.cs
@@ -26,6 +26,90 @@ /// /// </summary> public long MiscShipID { get; set; } /// <summary> /// /// </summary> public long MiscShipLineID { get; set; } /// <summary> /// /// </summary> public string DocNo { get; set; } /// <summary> /// /// </summary> public string ItemCode { get; set; } /// <summary> /// /// </summary> public string ItemName { get; set; } /// <summary> /// /// </summary> public string ItemDescription { get; set; } /// <summary> /// /// </summary> public string SapCode { get; set; } /// <summary> /// /// </summary> public double StoreUOMQty { get; set; } /// <summary> /// /// </summary> public string StoreUOM { get; set; } /// <summary> /// /// </summary> public double CostUOMQty { get; set; } /// <summary> /// /// </summary> public string CostUOM { get; set; } /// <summary> /// /// </summary> public double CostPrice { get; set; } /// <summary> /// /// </summary> public double CostMny { get; set; } /// <summary> /// /// </summary> public string WhCode { get; set; } /// <summary> /// /// </summary> public string WhName { get; set; } /// <summary> /// /// </summary> public string BenefitDept { get; set; } /// <summary> /// /// </summary> public string BenefitDeptName { get; set; } /// <summary> /// /// </summary> public string OutStorageReason { get; set; } /// <summary> /// /// </summary> public string CreatedBy { get; set; } /// <summary> /// /// </summary> public DateTime CreatedOn { get; set; } = DateTime.MinValue; /// <summary> /// /// </summary> public string ModifiedBy { get; set; } /// <summary> /// /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 Tiger.Model.Net/Entitys/MES/YadaU9/mes_Mo.cs
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_Mo /// 实体：mes_Mo /// </summary> [Serializable] [SugarTable("mes_Mo")] public class mes_Mo : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_Mo /// 实体：mes_Mo /// </summary> public mes_Mo() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -120,26 +120,26 @@ public int BusinessType { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_RcvRptDocLine /// 实体：mes_RcvRptDocLine /// </summary> [Serializable] [SugarTable("mes_RcvRptDocLine")] public class mes_RcvRptDocLine : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_RcvRptDocLine /// 实体：mes_RcvRptDocLine /// </summary> public mes_RcvRptDocLine() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -72,26 +72,26 @@ public string StoreUOM { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,122 +8,122 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_ReturnedDocInfo /// 实体：mes_ReturnedDocInfo /// </summary> [Serializable] [SugarTable("mes_ReturnedDocInfo")] public class mes_ReturnedDocInfo : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_ReturnedDocInfo /// 实体：mes_ReturnedDocInfo /// </summary> public mes_ReturnedDocInfo() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// 收货类型(0-收货，1-退货) /// 收货类型(0-收货，1-退货) /// </summary> public int ReceivementType { get; set; } /// <summary> /// 收货单ID /// 收货单ID /// </summary> public long RcvId { get; set; } /// <summary> /// 收货单号 /// 收货单号 /// </summary> public string DocNo { get; set; } /// <summary> /// 组织 /// 组织 /// </summary> public long Org { get; set; } /// <summary> /// 供应商编码 /// 供应商编码 /// </summary> public string SupplierCode { get; set; } /// <summary> /// 供应商名称 /// 供应商名称 /// </summary> public string SupplierName { get; set; } /// <summary> /// 行ID /// 行ID /// </summary> public long RcvLineId { get; set; } /// <summary> /// 行号 /// 行号 /// </summary> public int DocLineNo { get; set; } /// <summary> /// 料号 /// 料号 /// </summary> public string ItemCode { get; set; } /// <summary> /// sap料号 /// sap料号 /// </summary> public string ItemCode1 { get; set; } /// <summary> /// 品名 /// 品名 /// </summary> public string ItemName { get; set; } /// <summary> /// 料品描述 /// 料品描述 /// </summary> public string ItemDescription { get; set; } /// <summary> /// 退补数量 /// 退补数量 /// </summary> public double RtnFillQtyTU { get; set; } /// <summary> /// 拆分标记：0-原始行,1-拆前行,2-拆后行，拆前有一行记录，拆后审核完有另一条记录 /// 拆分标记：0-原始行,1-拆前行,2-拆后行，拆前有一行记录，拆后审核完有另一条记录 /// </summary> public int SplitFlag { get; set; } /// <summary> /// ASN单ID，不是ASN单为0 /// ASN单ID，不是ASN单为0 /// </summary> public long SrcASNDocId { get; set; } /// <summary> /// ASN单行ID /// ASN单行ID /// </summary> public long SrcASNDocLineId { get; set; } /// <summary> /// 创建时间 /// 创建时间 /// </summary> public DateTime CreatedOn { get; set; } = DateTime.MinValue; /// <summary> /// 创建人 /// 创建人 /// </summary> public string CreatedBy { get; set; } /// <summary> /// 更新时间 /// 更新时间 /// </summary> public DateTime ModifiedOn { get; set; } = DateTime.MinValue; /// <summary> /// 更新人 /// 更新人 /// </summary> public string ModifiedBy { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_SCMPickList /// 实体：mes_SCMPickList /// </summary> [Serializable] [SugarTable("mes_SCMPickList")] public class mes_SCMPickList : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_SCMPickList /// 实体：mes_SCMPickList /// </summary> public mes_SCMPickList() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -108,26 +108,26 @@ public DateTime ModifiedOn { get; set; } = DateTime.MinValue; #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
@@ -8,20 +8,20 @@ namespace Tiger.Model.MES.Yada { /// <summary> /// 实体：mes_ShipList /// 实体：mes_ShipList /// </summary> [Serializable] [SugarTable("mes_ShipList")] public class mes_ShipList : iViewEntity { #region 构造函数 #region 构造函数 /// <summary> /// 实体：mes_ShipList /// 实体：mes_ShipList /// </summary> public mes_ShipList() {} #endregion #region 公共属性 #region 公共属性 /// <summary> /// /// </summary> @@ -52,26 +52,26 @@ public double ShipQty { get; set; } #endregion #region 虚拟属性 /*例子 #region 虚拟属性 /*例子 [SugarColumn(IsIgnore = true)] public string FieldName { get; set; } */ #endregion #region 枚举变量 /*例子 #region 枚举变量 /*例子 public enum FieldNames { [Description("枚举描述0")] [Description("枚举描述0")] Enum0, [Description("枚举描述1")] [Description("枚举描述1")] Enum1, } */ #endregion #region 公共方法 #region 公共方法 #endregion
