diff --git a/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml b/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml
index 1db47f2..bb19099 100644
--- a/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml
+++ b/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml
@@ -108,6 +108,26 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -171,6 +191,20 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -225,6 +259,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -282,14 +326,22 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -423,8 +475,8 @@
-
-
+
+
@@ -433,6 +485,15 @@
+
+
+
+
+
+
+
+
+
@@ -448,8 +509,8 @@
-
-
+
+
@@ -458,6 +519,15 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs b/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs
index 7a30552..747d350 100644
--- a/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs
+++ b/ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs
@@ -2164,6 +2164,46 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE;
+ private string _OrderNumber;
+
+ private System.Nullable _Sets;
+
+ private string _OrderInvCode;
+
+ private string _OrderInvDescribe;
+
+ private string _BillType;
+
+ private string _Remarks;
+
+ private string _Desks;
+
+ private string _DispatchNumber;
+
+ private string _DispatcherName;
+
+ private string _ReceiverNumber;
+
+ private string _ReceiverName;
+
+ private string _Urgency;
+
+ private string _NeedDate;
+
+ private string _NeedTime;
+
+ private string _RemarksTerm;
+
+ private string _TextNumber;
+
+ private string _InvDescribe;
+
+ private string _Unit;
+
+ private string _StockIndicator;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -2212,6 +2252,46 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTEChanging(string value);
partial void OnEATTRIBUTEChanged();
+ partial void OnOrderNumberChanging(string value);
+ partial void OnOrderNumberChanged();
+ partial void OnSetsChanging(System.Nullable value);
+ partial void OnSetsChanged();
+ partial void OnOrderInvCodeChanging(string value);
+ partial void OnOrderInvCodeChanged();
+ partial void OnOrderInvDescribeChanging(string value);
+ partial void OnOrderInvDescribeChanged();
+ partial void OnBillTypeChanging(string value);
+ partial void OnBillTypeChanged();
+ partial void OnRemarksChanging(string value);
+ partial void OnRemarksChanged();
+ partial void OnDesksChanging(string value);
+ partial void OnDesksChanged();
+ partial void OnDispatchNumberChanging(string value);
+ partial void OnDispatchNumberChanged();
+ partial void OnDispatcherNameChanging(string value);
+ partial void OnDispatcherNameChanged();
+ partial void OnReceiverNumberChanging(string value);
+ partial void OnReceiverNumberChanged();
+ partial void OnReceiverNameChanging(string value);
+ partial void OnReceiverNameChanged();
+ partial void OnUrgencyChanging(string value);
+ partial void OnUrgencyChanged();
+ partial void OnNeedDateChanging(string value);
+ partial void OnNeedDateChanged();
+ partial void OnNeedTimeChanging(string value);
+ partial void OnNeedTimeChanged();
+ partial void OnRemarksTermChanging(string value);
+ partial void OnRemarksTermChanged();
+ partial void OnTextNumberChanging(string value);
+ partial void OnTextNumberChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnUnitChanging(string value);
+ partial void OnUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSMOApply()
@@ -2659,6 +2739,406 @@ namespace ICSSoft.Frame.Data.Entity
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderNumber", DbType="NVarChar(12)")]
+ public string OrderNumber
+ {
+ get
+ {
+ return this._OrderNumber;
+ }
+ set
+ {
+ if ((this._OrderNumber != value))
+ {
+ this.OnOrderNumberChanging(value);
+ this.SendPropertyChanging();
+ this._OrderNumber = value;
+ this.SendPropertyChanged("OrderNumber");
+ this.OnOrderNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Sets", DbType="Decimal(4,0)")]
+ public System.Nullable Sets
+ {
+ get
+ {
+ return this._Sets;
+ }
+ set
+ {
+ if ((this._Sets != value))
+ {
+ this.OnSetsChanging(value);
+ this.SendPropertyChanging();
+ this._Sets = value;
+ this.SendPropertyChanged("Sets");
+ this.OnSetsChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInvCode", DbType="NVarChar(18)")]
+ public string OrderInvCode
+ {
+ get
+ {
+ return this._OrderInvCode;
+ }
+ set
+ {
+ if ((this._OrderInvCode != value))
+ {
+ this.OnOrderInvCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInvCode = value;
+ this.SendPropertyChanged("OrderInvCode");
+ this.OnOrderInvCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInvDescribe", DbType="NVarChar(40)")]
+ public string OrderInvDescribe
+ {
+ get
+ {
+ return this._OrderInvDescribe;
+ }
+ set
+ {
+ if ((this._OrderInvDescribe != value))
+ {
+ this.OnOrderInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInvDescribe = value;
+ this.SendPropertyChanged("OrderInvDescribe");
+ this.OnOrderInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BillType", DbType="NVarChar(1)")]
+ public string BillType
+ {
+ get
+ {
+ return this._BillType;
+ }
+ set
+ {
+ if ((this._BillType != value))
+ {
+ this.OnBillTypeChanging(value);
+ this.SendPropertyChanging();
+ this._BillType = value;
+ this.SendPropertyChanged("BillType");
+ this.OnBillTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(40)")]
+ public string Remarks
+ {
+ get
+ {
+ return this._Remarks;
+ }
+ set
+ {
+ if ((this._Remarks != value))
+ {
+ this.OnRemarksChanging(value);
+ this.SendPropertyChanging();
+ this._Remarks = value;
+ this.SendPropertyChanged("Remarks");
+ this.OnRemarksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Desks", DbType="NVarChar(20)")]
+ public string Desks
+ {
+ get
+ {
+ return this._Desks;
+ }
+ set
+ {
+ if ((this._Desks != value))
+ {
+ this.OnDesksChanging(value);
+ this.SendPropertyChanging();
+ this._Desks = value;
+ this.SendPropertyChanged("Desks");
+ this.OnDesksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DispatchNumber", DbType="NVarChar(20)")]
+ public string DispatchNumber
+ {
+ get
+ {
+ return this._DispatchNumber;
+ }
+ set
+ {
+ if ((this._DispatchNumber != value))
+ {
+ this.OnDispatchNumberChanging(value);
+ this.SendPropertyChanging();
+ this._DispatchNumber = value;
+ this.SendPropertyChanged("DispatchNumber");
+ this.OnDispatchNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DispatcherName", DbType="NVarChar(20)")]
+ public string DispatcherName
+ {
+ get
+ {
+ return this._DispatcherName;
+ }
+ set
+ {
+ if ((this._DispatcherName != value))
+ {
+ this.OnDispatcherNameChanging(value);
+ this.SendPropertyChanging();
+ this._DispatcherName = value;
+ this.SendPropertyChanged("DispatcherName");
+ this.OnDispatcherNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiverNumber", DbType="NVarChar(20)")]
+ public string ReceiverNumber
+ {
+ get
+ {
+ return this._ReceiverNumber;
+ }
+ set
+ {
+ if ((this._ReceiverNumber != value))
+ {
+ this.OnReceiverNumberChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiverNumber = value;
+ this.SendPropertyChanged("ReceiverNumber");
+ this.OnReceiverNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiverName", DbType="NVarChar(20)")]
+ public string ReceiverName
+ {
+ get
+ {
+ return this._ReceiverName;
+ }
+ set
+ {
+ if ((this._ReceiverName != value))
+ {
+ this.OnReceiverNameChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiverName = value;
+ this.SendPropertyChanged("ReceiverName");
+ this.OnReceiverNameChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Urgency", DbType="NVarChar(20)")]
+ public string Urgency
+ {
+ get
+ {
+ return this._Urgency;
+ }
+ set
+ {
+ if ((this._Urgency != value))
+ {
+ this.OnUrgencyChanging(value);
+ this.SendPropertyChanging();
+ this._Urgency = value;
+ this.SendPropertyChanged("Urgency");
+ this.OnUrgencyChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NeedDate", DbType="NVarChar(20)")]
+ public string NeedDate
+ {
+ get
+ {
+ return this._NeedDate;
+ }
+ set
+ {
+ if ((this._NeedDate != value))
+ {
+ this.OnNeedDateChanging(value);
+ this.SendPropertyChanging();
+ this._NeedDate = value;
+ this.SendPropertyChanged("NeedDate");
+ this.OnNeedDateChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_NeedTime", DbType="NVarChar(20)")]
+ public string NeedTime
+ {
+ get
+ {
+ return this._NeedTime;
+ }
+ set
+ {
+ if ((this._NeedTime != value))
+ {
+ this.OnNeedTimeChanging(value);
+ this.SendPropertyChanging();
+ this._NeedTime = value;
+ this.SendPropertyChanged("NeedTime");
+ this.OnNeedTimeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarksTerm", DbType="NVarChar(120)")]
+ public string RemarksTerm
+ {
+ get
+ {
+ return this._RemarksTerm;
+ }
+ set
+ {
+ if ((this._RemarksTerm != value))
+ {
+ this.OnRemarksTermChanging(value);
+ this.SendPropertyChanging();
+ this._RemarksTerm = value;
+ this.SendPropertyChanged("RemarksTerm");
+ this.OnRemarksTermChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TextNumber", DbType="NVarChar(7)")]
+ public string TextNumber
+ {
+ get
+ {
+ return this._TextNumber;
+ }
+ set
+ {
+ if ((this._TextNumber != value))
+ {
+ this.OnTextNumberChanging(value);
+ this.SendPropertyChanging();
+ this._TextNumber = value;
+ this.SendPropertyChanged("TextNumber");
+ this.OnTextNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(40)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(50)")]
+ public string Unit
+ {
+ get
+ {
+ return this._Unit;
+ }
+ set
+ {
+ if ((this._Unit != value))
+ {
+ this.OnUnitChanging(value);
+ this.SendPropertyChanging();
+ this._Unit = value;
+ this.SendPropertyChanged("Unit");
+ this.OnUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
+ this.SendPropertyChanging();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -3458,6 +3938,34 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE1;
+ private string _OrderType;
+
+ private string _TypeDescribe;
+
+ private string _Remarks;
+
+ private string _PersonNumber;
+
+ private string _InvDescribe;
+
+ private string _Unit;
+
+ private string _StockIndicator;
+
+ private string _ReceiveInvCode;
+
+ private string _ReceiveInvDescribe;
+
+ private string _ReceiveStock;
+
+ private string _ReceiveSales;
+
+ private string _ReceiveSequence;
+
+ private string _Remark2;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -3510,6 +4018,34 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTE1Changing(string value);
partial void OnEATTRIBUTE1Changed();
+ partial void OnOrderTypeChanging(string value);
+ partial void OnOrderTypeChanged();
+ partial void OnTypeDescribeChanging(string value);
+ partial void OnTypeDescribeChanged();
+ partial void OnRemarksChanging(string value);
+ partial void OnRemarksChanged();
+ partial void OnPersonNumberChanging(string value);
+ partial void OnPersonNumberChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnUnitChanging(string value);
+ partial void OnUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnReceiveInvCodeChanging(string value);
+ partial void OnReceiveInvCodeChanged();
+ partial void OnReceiveInvDescribeChanging(string value);
+ partial void OnReceiveInvDescribeChanged();
+ partial void OnReceiveStockChanging(string value);
+ partial void OnReceiveStockChanged();
+ partial void OnReceiveSalesChanging(string value);
+ partial void OnReceiveSalesChanged();
+ partial void OnReceiveSequenceChanging(string value);
+ partial void OnReceiveSequenceChanged();
+ partial void OnRemark2Changing(string value);
+ partial void OnRemark2Changed();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSTransfer()
@@ -3988,11 +4524,291 @@ namespace ICSSoft.Frame.Data.Entity
{
if ((this._EATTRIBUTE1 != value))
{
- this.OnEATTRIBUTE1Changing(value);
+ this.OnEATTRIBUTE1Changing(value);
+ this.SendPropertyChanging();
+ this._EATTRIBUTE1 = value;
+ this.SendPropertyChanged("EATTRIBUTE1");
+ this.OnEATTRIBUTE1Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderType", DbType="NVarChar(2)")]
+ public string OrderType
+ {
+ get
+ {
+ return this._OrderType;
+ }
+ set
+ {
+ if ((this._OrderType != value))
+ {
+ this.OnOrderTypeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderType = value;
+ this.SendPropertyChanged("OrderType");
+ this.OnOrderTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeDescribe", DbType="NVarChar(20)")]
+ public string TypeDescribe
+ {
+ get
+ {
+ return this._TypeDescribe;
+ }
+ set
+ {
+ if ((this._TypeDescribe != value))
+ {
+ this.OnTypeDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._TypeDescribe = value;
+ this.SendPropertyChanged("TypeDescribe");
+ this.OnTypeDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(40)")]
+ public string Remarks
+ {
+ get
+ {
+ return this._Remarks;
+ }
+ set
+ {
+ if ((this._Remarks != value))
+ {
+ this.OnRemarksChanging(value);
+ this.SendPropertyChanging();
+ this._Remarks = value;
+ this.SendPropertyChanged("Remarks");
+ this.OnRemarksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonNumber", DbType="NVarChar(10)")]
+ public string PersonNumber
+ {
+ get
+ {
+ return this._PersonNumber;
+ }
+ set
+ {
+ if ((this._PersonNumber != value))
+ {
+ this.OnPersonNumberChanging(value);
+ this.SendPropertyChanging();
+ this._PersonNumber = value;
+ this.SendPropertyChanged("PersonNumber");
+ this.OnPersonNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(40)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(10)")]
+ public string Unit
+ {
+ get
+ {
+ return this._Unit;
+ }
+ set
+ {
+ if ((this._Unit != value))
+ {
+ this.OnUnitChanging(value);
+ this.SendPropertyChanging();
+ this._Unit = value;
+ this.SendPropertyChanged("Unit");
+ this.OnUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveInvCode", DbType="NVarChar(18)")]
+ public string ReceiveInvCode
+ {
+ get
+ {
+ return this._ReceiveInvCode;
+ }
+ set
+ {
+ if ((this._ReceiveInvCode != value))
+ {
+ this.OnReceiveInvCodeChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiveInvCode = value;
+ this.SendPropertyChanged("ReceiveInvCode");
+ this.OnReceiveInvCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveInvDescribe", DbType="NVarChar(40)")]
+ public string ReceiveInvDescribe
+ {
+ get
+ {
+ return this._ReceiveInvDescribe;
+ }
+ set
+ {
+ if ((this._ReceiveInvDescribe != value))
+ {
+ this.OnReceiveInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiveInvDescribe = value;
+ this.SendPropertyChanged("ReceiveInvDescribe");
+ this.OnReceiveInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveStock", DbType="NVarChar(1)")]
+ public string ReceiveStock
+ {
+ get
+ {
+ return this._ReceiveStock;
+ }
+ set
+ {
+ if ((this._ReceiveStock != value))
+ {
+ this.OnReceiveStockChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiveStock = value;
+ this.SendPropertyChanged("ReceiveStock");
+ this.OnReceiveStockChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveSales", DbType="NVarChar(10)")]
+ public string ReceiveSales
+ {
+ get
+ {
+ return this._ReceiveSales;
+ }
+ set
+ {
+ if ((this._ReceiveSales != value))
+ {
+ this.OnReceiveSalesChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiveSales = value;
+ this.SendPropertyChanged("ReceiveSales");
+ this.OnReceiveSalesChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_ReceiveSequence", DbType="NVarChar(10)")]
+ public string ReceiveSequence
+ {
+ get
+ {
+ return this._ReceiveSequence;
+ }
+ set
+ {
+ if ((this._ReceiveSequence != value))
+ {
+ this.OnReceiveSequenceChanging(value);
+ this.SendPropertyChanging();
+ this._ReceiveSequence = value;
+ this.SendPropertyChanged("ReceiveSequence");
+ this.OnReceiveSequenceChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remark2", DbType="NVarChar(40)")]
+ public string Remark2
+ {
+ get
+ {
+ return this._Remark2;
+ }
+ set
+ {
+ if ((this._Remark2 != value))
+ {
+ this.OnRemark2Changing(value);
+ this.SendPropertyChanging();
+ this._Remark2 = value;
+ this.SendPropertyChanged("Remark2");
+ this.OnRemark2Changed();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
this.SendPropertyChanging();
- this._EATTRIBUTE1 = value;
- this.SendPropertyChanged("EATTRIBUTE1");
- this.OnEATTRIBUTE1Changed();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
}
}
}
@@ -4682,6 +5498,26 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE;
+ private string _InvDescribe;
+
+ private string _OrderNumber;
+
+ private string _OrderInvCode;
+
+ private string _OrderInvDescribe;
+
+ private string _BillType;
+
+ private string _Remarks;
+
+ private string _Unit;
+
+ private string _StockIndicator;
+
+ private string _RemarksTerm;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -4730,6 +5566,26 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTEChanging(string value);
partial void OnEATTRIBUTEChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnOrderNumberChanging(string value);
+ partial void OnOrderNumberChanged();
+ partial void OnOrderInvCodeChanging(string value);
+ partial void OnOrderInvCodeChanged();
+ partial void OnOrderInvDescribeChanging(string value);
+ partial void OnOrderInvDescribeChanged();
+ partial void OnBillTypeChanging(string value);
+ partial void OnBillTypeChanged();
+ partial void OnRemarksChanging(string value);
+ partial void OnRemarksChanged();
+ partial void OnUnitChanging(string value);
+ partial void OnUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnRemarksTermChanging(string value);
+ partial void OnRemarksTermChanged();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSManufactureReceive()
@@ -5177,6 +6033,206 @@ namespace ICSSoft.Frame.Data.Entity
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(40)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderNumber", DbType="NVarChar(12)")]
+ public string OrderNumber
+ {
+ get
+ {
+ return this._OrderNumber;
+ }
+ set
+ {
+ if ((this._OrderNumber != value))
+ {
+ this.OnOrderNumberChanging(value);
+ this.SendPropertyChanging();
+ this._OrderNumber = value;
+ this.SendPropertyChanged("OrderNumber");
+ this.OnOrderNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInvCode", DbType="NVarChar(18)")]
+ public string OrderInvCode
+ {
+ get
+ {
+ return this._OrderInvCode;
+ }
+ set
+ {
+ if ((this._OrderInvCode != value))
+ {
+ this.OnOrderInvCodeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInvCode = value;
+ this.SendPropertyChanged("OrderInvCode");
+ this.OnOrderInvCodeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderInvDescribe", DbType="NVarChar(40)")]
+ public string OrderInvDescribe
+ {
+ get
+ {
+ return this._OrderInvDescribe;
+ }
+ set
+ {
+ if ((this._OrderInvDescribe != value))
+ {
+ this.OnOrderInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderInvDescribe = value;
+ this.SendPropertyChanged("OrderInvDescribe");
+ this.OnOrderInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_BillType", DbType="NVarChar(1)")]
+ public string BillType
+ {
+ get
+ {
+ return this._BillType;
+ }
+ set
+ {
+ if ((this._BillType != value))
+ {
+ this.OnBillTypeChanging(value);
+ this.SendPropertyChanging();
+ this._BillType = value;
+ this.SendPropertyChanged("BillType");
+ this.OnBillTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(40)")]
+ public string Remarks
+ {
+ get
+ {
+ return this._Remarks;
+ }
+ set
+ {
+ if ((this._Remarks != value))
+ {
+ this.OnRemarksChanging(value);
+ this.SendPropertyChanging();
+ this._Remarks = value;
+ this.SendPropertyChanged("Remarks");
+ this.OnRemarksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(10)")]
+ public string Unit
+ {
+ get
+ {
+ return this._Unit;
+ }
+ set
+ {
+ if ((this._Unit != value))
+ {
+ this.OnUnitChanging(value);
+ this.SendPropertyChanging();
+ this._Unit = value;
+ this.SendPropertyChanged("Unit");
+ this.OnUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_RemarksTerm", DbType="NVarChar(120)")]
+ public string RemarksTerm
+ {
+ get
+ {
+ return this._RemarksTerm;
+ }
+ set
+ {
+ if ((this._RemarksTerm != value))
+ {
+ this.OnRemarksTermChanging(value);
+ this.SendPropertyChanging();
+ this._RemarksTerm = value;
+ this.SendPropertyChanged("RemarksTerm");
+ this.OnRemarksTermChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
+ this.SendPropertyChanging();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -6060,6 +7116,22 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE1;
+ private string _Points;
+
+ private string _DeliveryType;
+
+ private string _DeliveryDescribe;
+
+ private string _InvDescribe;
+
+ private string _OtherDescribe;
+
+ private string _SalesUnit;
+
+ private string _StockIndicator;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -6114,6 +7186,22 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTE1Changing(string value);
partial void OnEATTRIBUTE1Changed();
+ partial void OnPointsChanging(string value);
+ partial void OnPointsChanged();
+ partial void OnDeliveryTypeChanging(string value);
+ partial void OnDeliveryTypeChanged();
+ partial void OnDeliveryDescribeChanging(string value);
+ partial void OnDeliveryDescribeChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnOtherDescribeChanging(string value);
+ partial void OnOtherDescribeChanged();
+ partial void OnSalesUnitChanging(string value);
+ partial void OnSalesUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSSDN()
@@ -6461,7 +7549,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SDNID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SDNID", DbType="NVarChar(50)")]
public string SDNID
{
get
@@ -6481,7 +7569,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SDNDetailID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SDNDetailID", DbType="NVarChar(50)")]
public string SDNDetailID
{
get
@@ -6621,6 +7709,166 @@ namespace ICSSoft.Frame.Data.Entity
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Points", DbType="NVarChar(4)")]
+ public string Points
+ {
+ get
+ {
+ return this._Points;
+ }
+ set
+ {
+ if ((this._Points != value))
+ {
+ this.OnPointsChanging(value);
+ this.SendPropertyChanging();
+ this._Points = value;
+ this.SendPropertyChanged("Points");
+ this.OnPointsChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeliveryType", DbType="NVarChar(4)")]
+ public string DeliveryType
+ {
+ get
+ {
+ return this._DeliveryType;
+ }
+ set
+ {
+ if ((this._DeliveryType != value))
+ {
+ this.OnDeliveryTypeChanging(value);
+ this.SendPropertyChanging();
+ this._DeliveryType = value;
+ this.SendPropertyChanged("DeliveryType");
+ this.OnDeliveryTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_DeliveryDescribe", DbType="NVarChar(20)")]
+ public string DeliveryDescribe
+ {
+ get
+ {
+ return this._DeliveryDescribe;
+ }
+ set
+ {
+ if ((this._DeliveryDescribe != value))
+ {
+ this.OnDeliveryDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._DeliveryDescribe = value;
+ this.SendPropertyChanged("DeliveryDescribe");
+ this.OnDeliveryDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(40)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OtherDescribe", DbType="NVarChar(80)")]
+ public string OtherDescribe
+ {
+ get
+ {
+ return this._OtherDescribe;
+ }
+ set
+ {
+ if ((this._OtherDescribe != value))
+ {
+ this.OnOtherDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._OtherDescribe = value;
+ this.SendPropertyChanged("OtherDescribe");
+ this.OnOtherDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_SalesUnit", DbType="NVarChar(10)")]
+ public string SalesUnit
+ {
+ get
+ {
+ return this._SalesUnit;
+ }
+ set
+ {
+ if ((this._SalesUnit != value))
+ {
+ this.OnSalesUnitChanging(value);
+ this.SendPropertyChanging();
+ this._SalesUnit = value;
+ this.SendPropertyChanged("SalesUnit");
+ this.OnSalesUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
+ this.SendPropertyChanging();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -9174,6 +10422,24 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE1;
+ private string _OrderType;
+
+ private string _TypeDescribe;
+
+ private string _CostCenter;
+
+ private string _Remarks;
+
+ private string _PersonNumber;
+
+ private string _InvDescribe;
+
+ private string _Unit;
+
+ private string _StockIndicator;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -9220,6 +10486,24 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTE1Changing(string value);
partial void OnEATTRIBUTE1Changed();
+ partial void OnOrderTypeChanging(string value);
+ partial void OnOrderTypeChanged();
+ partial void OnTypeDescribeChanging(string value);
+ partial void OnTypeDescribeChanged();
+ partial void OnCostCenterChanging(string value);
+ partial void OnCostCenterChanged();
+ partial void OnRemarksChanging(string value);
+ partial void OnRemarksChanged();
+ partial void OnPersonNumberChanging(string value);
+ partial void OnPersonNumberChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnUnitChanging(string value);
+ partial void OnUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSOtherOut()
@@ -9447,7 +10731,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutID", DbType="NVarChar(50)")]
public string OutID
{
get
@@ -9467,7 +10751,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutDetailID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OutDetailID", DbType="NVarChar(50)")]
public string OutDetailID
{
get
@@ -9647,6 +10931,186 @@ namespace ICSSoft.Frame.Data.Entity
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderType", DbType="NVarChar(2)")]
+ public string OrderType
+ {
+ get
+ {
+ return this._OrderType;
+ }
+ set
+ {
+ if ((this._OrderType != value))
+ {
+ this.OnOrderTypeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderType = value;
+ this.SendPropertyChanged("OrderType");
+ this.OnOrderTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeDescribe", DbType="NVarChar(20)")]
+ public string TypeDescribe
+ {
+ get
+ {
+ return this._TypeDescribe;
+ }
+ set
+ {
+ if ((this._TypeDescribe != value))
+ {
+ this.OnTypeDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._TypeDescribe = value;
+ this.SendPropertyChanged("TypeDescribe");
+ this.OnTypeDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostCenter", DbType="NVarChar(10)")]
+ public string CostCenter
+ {
+ get
+ {
+ return this._CostCenter;
+ }
+ set
+ {
+ if ((this._CostCenter != value))
+ {
+ this.OnCostCenterChanging(value);
+ this.SendPropertyChanging();
+ this._CostCenter = value;
+ this.SendPropertyChanged("CostCenter");
+ this.OnCostCenterChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(40)")]
+ public string Remarks
+ {
+ get
+ {
+ return this._Remarks;
+ }
+ set
+ {
+ if ((this._Remarks != value))
+ {
+ this.OnRemarksChanging(value);
+ this.SendPropertyChanging();
+ this._Remarks = value;
+ this.SendPropertyChanged("Remarks");
+ this.OnRemarksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonNumber", DbType="NVarChar(10)")]
+ public string PersonNumber
+ {
+ get
+ {
+ return this._PersonNumber;
+ }
+ set
+ {
+ if ((this._PersonNumber != value))
+ {
+ this.OnPersonNumberChanging(value);
+ this.SendPropertyChanging();
+ this._PersonNumber = value;
+ this.SendPropertyChanged("PersonNumber");
+ this.OnPersonNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(18)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(10)")]
+ public string Unit
+ {
+ get
+ {
+ return this._Unit;
+ }
+ set
+ {
+ if ((this._Unit != value))
+ {
+ this.OnUnitChanging(value);
+ this.SendPropertyChanging();
+ this._Unit = value;
+ this.SendPropertyChanged("Unit");
+ this.OnUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
+ this.SendPropertyChanging();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
@@ -9716,6 +11180,24 @@ namespace ICSSoft.Frame.Data.Entity
private string _EATTRIBUTE1;
+ private string _OrderType;
+
+ private string _TypeDescribe;
+
+ private string _CostCenter;
+
+ private string _Remarks;
+
+ private string _PersonNumber;
+
+ private string _InvDescribe;
+
+ private string _Unit;
+
+ private string _StockIndicator;
+
+ private string _IsSerialNumber;
+
#region 可扩展性方法定义
partial void OnLoaded();
partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -9762,6 +11244,24 @@ namespace ICSSoft.Frame.Data.Entity
partial void OnWorkPointChanged();
partial void OnEATTRIBUTE1Changing(string value);
partial void OnEATTRIBUTE1Changed();
+ partial void OnOrderTypeChanging(string value);
+ partial void OnOrderTypeChanged();
+ partial void OnTypeDescribeChanging(string value);
+ partial void OnTypeDescribeChanged();
+ partial void OnCostCenterChanging(string value);
+ partial void OnCostCenterChanged();
+ partial void OnRemarksChanging(string value);
+ partial void OnRemarksChanged();
+ partial void OnPersonNumberChanging(string value);
+ partial void OnPersonNumberChanged();
+ partial void OnInvDescribeChanging(string value);
+ partial void OnInvDescribeChanged();
+ partial void OnUnitChanging(string value);
+ partial void OnUnitChanged();
+ partial void OnStockIndicatorChanging(string value);
+ partial void OnStockIndicatorChanged();
+ partial void OnIsSerialNumberChanging(string value);
+ partial void OnIsSerialNumberChanged();
#endregion
public ICSOtherIn()
@@ -9989,7 +11489,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InID", DbType="NVarChar(50)")]
public string InID
{
get
@@ -10009,7 +11509,7 @@ namespace ICSSoft.Frame.Data.Entity
}
}
- [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InDetailID", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InDetailID", DbType="NVarChar(50)")]
public string InDetailID
{
get
@@ -10189,6 +11689,186 @@ namespace ICSSoft.Frame.Data.Entity
}
}
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_OrderType", DbType="NVarChar(2)")]
+ public string OrderType
+ {
+ get
+ {
+ return this._OrderType;
+ }
+ set
+ {
+ if ((this._OrderType != value))
+ {
+ this.OnOrderTypeChanging(value);
+ this.SendPropertyChanging();
+ this._OrderType = value;
+ this.SendPropertyChanged("OrderType");
+ this.OnOrderTypeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_TypeDescribe", DbType="NVarChar(20)")]
+ public string TypeDescribe
+ {
+ get
+ {
+ return this._TypeDescribe;
+ }
+ set
+ {
+ if ((this._TypeDescribe != value))
+ {
+ this.OnTypeDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._TypeDescribe = value;
+ this.SendPropertyChanged("TypeDescribe");
+ this.OnTypeDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_CostCenter", DbType="NVarChar(10)")]
+ public string CostCenter
+ {
+ get
+ {
+ return this._CostCenter;
+ }
+ set
+ {
+ if ((this._CostCenter != value))
+ {
+ this.OnCostCenterChanging(value);
+ this.SendPropertyChanging();
+ this._CostCenter = value;
+ this.SendPropertyChanged("CostCenter");
+ this.OnCostCenterChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Remarks", DbType="NVarChar(40)")]
+ public string Remarks
+ {
+ get
+ {
+ return this._Remarks;
+ }
+ set
+ {
+ if ((this._Remarks != value))
+ {
+ this.OnRemarksChanging(value);
+ this.SendPropertyChanging();
+ this._Remarks = value;
+ this.SendPropertyChanged("Remarks");
+ this.OnRemarksChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_PersonNumber", DbType="NVarChar(10)")]
+ public string PersonNumber
+ {
+ get
+ {
+ return this._PersonNumber;
+ }
+ set
+ {
+ if ((this._PersonNumber != value))
+ {
+ this.OnPersonNumberChanging(value);
+ this.SendPropertyChanging();
+ this._PersonNumber = value;
+ this.SendPropertyChanged("PersonNumber");
+ this.OnPersonNumberChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvDescribe", DbType="NVarChar(18)")]
+ public string InvDescribe
+ {
+ get
+ {
+ return this._InvDescribe;
+ }
+ set
+ {
+ if ((this._InvDescribe != value))
+ {
+ this.OnInvDescribeChanging(value);
+ this.SendPropertyChanging();
+ this._InvDescribe = value;
+ this.SendPropertyChanged("InvDescribe");
+ this.OnInvDescribeChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unit", DbType="NVarChar(10)")]
+ public string Unit
+ {
+ get
+ {
+ return this._Unit;
+ }
+ set
+ {
+ if ((this._Unit != value))
+ {
+ this.OnUnitChanging(value);
+ this.SendPropertyChanging();
+ this._Unit = value;
+ this.SendPropertyChanged("Unit");
+ this.OnUnitChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(1)")]
+ public string StockIndicator
+ {
+ get
+ {
+ return this._StockIndicator;
+ }
+ set
+ {
+ if ((this._StockIndicator != value))
+ {
+ this.OnStockIndicatorChanging(value);
+ this.SendPropertyChanging();
+ this._StockIndicator = value;
+ this.SendPropertyChanged("StockIndicator");
+ this.OnStockIndicatorChanged();
+ }
+ }
+ }
+
+ [global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_IsSerialNumber", DbType="NVarChar(4)")]
+ public string IsSerialNumber
+ {
+ get
+ {
+ return this._IsSerialNumber;
+ }
+ set
+ {
+ if ((this._IsSerialNumber != value))
+ {
+ this.OnIsSerialNumberChanging(value);
+ this.SendPropertyChanging();
+ this._IsSerialNumber = value;
+ this.SendPropertyChanged("IsSerialNumber");
+ this.OnIsSerialNumberChanged();
+ }
+ }
+ }
+
public event PropertyChangingEventHandler PropertyChanging;
public event PropertyChangedEventHandler PropertyChanged;
diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs
index 664b95b..b4250c7 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSDispatchDoc.cs
@@ -115,7 +115,7 @@ namespace ICSSoft.FromERP
rcvline = new Frame.Data.Entity.ICSSDN();
rcvline.ID = AppConfig.GetGuid();
rcvline.SDNQuantity = 0;
- rcvline.SDNCode = Item.VBELN;//销售出/退货单
+ rcvline.SDNCode = Item.VBELN;//销售出/退货单（交货单）
rcvline.Sequence = Item.POSNR;//行号
rcvline.InvCode = Item.MATNR;//物料编码
rcvline.SOCode = Item.KDAUF;//销售订单
@@ -143,6 +143,27 @@ namespace ICSSoft.FromERP
rcvline.MUSERName = "JOB";
rcvline.MTIME = DateTime.Now;
rcvline.WorkPoint = Item.WERKS;//站点
+
+ //新增字段
+ //装运点
+ rcvline.Points = HeadInfo.VSTEL;
+ //交货类型
+ rcvline.DeliveryType = HeadInfo.LFART;
+ //交货描述
+ rcvline.DeliveryDescribe = HeadInfo.VTEXT;
+ //物料描述
+ rcvline.InvDescribe = Item.MAKTX;
+ //辅助描述
+ rcvline.OtherDescribe = Item.DESCR;
+ //销售单位
+ rcvline.SalesUnit = Item.VRKME;
+ //特殊库存标识
+ rcvline.StockIndicator = Item.SOBKZ;
+ //序列号参数
+ rcvline.IsSerialNumber = Item.SERAIL;
+
+
+
if (isNew == true)
{
db.ICSSDN.InsertOnSubmit(rcvline);
diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
index f9a95f3..42c454b 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
+++ b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
@@ -425,7 +425,7 @@ namespace ICSSoft.FromERP
line.InvCode = Item.MATNR;//物料编码
}
line.Type = "1";
- line.WorkPoint = Info.WERKS;//站点
+ line.WorkPoint = Info.WERKS;//站点（工厂）
line.CreatePerson = Info.XINGMING;
line.CreateDateTime = Convert.ToDateTime(Info.DATE_C);//检验时间
line.SourceCode = Item.EBELN;//采购凭证号
@@ -438,7 +438,51 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
- line.EATTRIBUTE = Info.LEIXING;
+ line.EATTRIBUTE = Info.LEIXING;//单据类型
+
+ //订单号
+ line.OrderNumber = Info.AUFNR;
+ //套数
+ line.Sets = Info.TAOSHU;
+ //物料号 父项生产订单物料
+ line.OrderInvCode = Info.MATNR_FAT;
+ //物料描述 父项 生产订单主物料
+ line.OrderInvDescribe = Info.MAKTX_FAT;
+ //出入库 1.出库 2.入库 3.转移 4.盘点
+ line.BillType = Info.CHURU;
+ //备注
+ line.Remarks = Info.BEIZHU;
+ //工位
+ line.Desks = Info.P_GW;
+ //调度工号
+ line.DispatchNumber = Info.P_DD;
+ //调度姓名
+ line.DispatcherName = Info.P_DDNAME;
+ //收料人工号
+ line.ReceiverNumber = Info.P_SL;
+ //收料人姓名
+ line.ReceiverName = Info.P_SLNAME;
+ //紧急程度
+ line.Urgency = Info.P_JJ;
+ //需求日期
+ line.NeedDate = Info.ZXQRQ;
+ //需求时间
+ line.NeedTime = Info.ZXQSJ.ToString();
+ //备注项
+ line.RemarksTerm = Info.ZBEIZ;
+ //工艺文本码
+ line.TextNumber =Info.KTSCH;
+ //物料描述
+ line.InvDescribe = Item.MAKTX;
+ //基本计量单位
+ line.Unit = Item.MEINS;
+ //特殊库存标识
+ line.StockIndicator = Item.SOBKZ;
+ //序列号参数
+ line.IsSerialNumber = Item.SERNP;
+
+
+
if (isNew == true)
{
db.ICSMOApply.InsertOnSubmit(line);
@@ -688,6 +732,30 @@ namespace ICSSoft.FromERP
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
line.EATTRIBUTE = Info.LEIXING;
+
+
+ //物料描述
+ line.InvDescribe = Item.MAKTX;
+ //订单号
+ line.OrderNumber = Info.AUFNR;
+ //物料号 父项生产订单主物料
+ line.OrderInvCode = Info.MATNR_FAT;
+ //物料描述 父项生产订单主物料
+ line.OrderInvDescribe = Info.MAKTX_FAT;
+ //出入库
+ line.BillType = Info.CHURU;
+ //备注
+ line.Remarks = Info.BEIZHU;
+ //基本计量单位
+ line.Unit = Item.MEINS;
+ //接受特殊库存标识
+ line.StockIndicator = Item.SOBKZ;
+ //备注项
+ line.RemarksTerm = Info.ZBEIZ;
+ //序列号参数
+ line.IsSerialNumber = Item.SERNP;
+
+
if (isNew == true)
{
db.ICSManufactureReceive.InsertOnSubmit(line);
@@ -784,6 +852,41 @@ namespace ICSSoft.FromERP
line.MTIME = DateTime.Now;
line.WorkPoint = Info.WERKS;//站点
line.EATTRIBUTE1 = Item.WERKS_JS;//接收站点
+
+ //单据类型
+ line.OrderType = Info.LEIXING;
+ //类型描述
+ line.TypeDescribe = Info.MIAOSHU;
+ //备注
+ line.Remarks = Info.BEIZHU;
+ //人员号
+ line.PersonNumber = Info.PERNR;
+ //物料描述
+ line.InvDescribe = Item.MAKTX;
+ //基本计量单位
+ line.Unit = Item.MEINS;
+ //特殊库存标识
+ line.StockIndicator = Item.SOBKZ;
+ //接收物料号
+ line.ReceiveInvCode = Item.MATNR_JS;
+ //接受物料描述
+ line.ReceiveInvDescribe = Item.MAKTX_JS;
+ //接受库存标识
+ line.ReceiveStock = Item.SOBKZ_JS;
+ //接受销售订单
+ line.ReceiveSales = Item.VBELN_JS;
+ //接受行号
+ line.ReceiveSequence = Item.POSNR_JS;
+ //备注2
+ line.Remark2 = Item.BEIZHU2;
+ //序列号参数
+ line.IsSerialNumber = Item.SERNP;
+
+
+
+
+
+
if (isNew == true)
{
db.ICSTransfer.InsertOnSubmit(line);
@@ -1173,6 +1276,29 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
+
+
+ //单据类型
+ line.OrderType = Info.LEIXING;
+ //类型描述
+ line.TypeDescribe = Info.MIAOSHU;
+ //成本中心
+ line.CostCenter = Info.KOSTL;
+ //备注
+ line.Remarks = Info.BEIZHU;
+ //人员号
+ line.PersonNumber = Info.PERNR;
+ //物料描述
+ line.InvDescribe = Item.MAKTX;
+ //基本计量单位
+ line.Unit = Item.MEINS;
+ //特殊库存标识
+ line.StockIndicator = Item.SOBKZ;
+ //序列号参数
+ line.IsSerialNumber = Item.SERNP;
+
+
+
if (isNew == true)
{
db.ICSOtherOut.InsertOnSubmit(line);
@@ -1203,6 +1329,26 @@ namespace ICSSoft.FromERP
line.MUSERName = "JOB";
line.MTIME = DateTime.Now;
line.ExtensionID = ExtensionID;
+
+ //单据类型
+ line.OrderType = Info.LEIXING;
+ //类型描述
+ line.TypeDescribe = Info.MIAOSHU;
+ //成本中心
+ line.CostCenter = Info.KOSTL;
+ //备注
+ line.Remarks = Info.BEIZHU;
+ //人员号
+ line.PersonNumber = Info.PERNR;
+ //物料描述
+ line.InvDescribe = Item.MAKTX;
+ //基本计量单位
+ line.Unit = Item.MEINS;
+ //特殊库存标识
+ line.StockIndicator = Item.SOBKZ;
+ //序列号参数
+ line.IsSerialNumber = Item.SERNP;
+
if (isNew == true)
{
db.ICSOtherIn.InsertOnSubmit(line);
diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
index e2225da..fb0405f 100644
Binary files a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll and b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll differ
diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index 3fce521..04c618d 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -1129,7 +1129,13 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
}
if (Type == "2")
{
- return GetICSMOPickMergeByWorkorder(ID, WorkPoint);
+ sqls = @"select
+ a.ApplyCode as Code, a.InvCode, b.InvName, b.InvStd, b.InvUnit, SUM(ISNULL(a.Quantity, 0)) AS iQuantity, a.WhCode,a.ExtensionID
+ FROM
+ ICSMOApply a
+ LEFT JOIN ICSINVENTORY b ON a.InvCode = b.InvCode AND a.WorkPoint=b.WorkPoint
+ WHERE a.ApplyCode in ({0}) AND a.WorkPoint = '{1}'
+ GROUP BY a.ApplyCode,a.InvCode,b.InvName,b.InvStd,b.InvUnit,a.WhCode,a.ExtensionID";
}
if (Type == "3")
{
@@ -1304,14 +1310,14 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
}
sqls = string.Format(sqls, ID, WorkPoint);
- string sql = $@"SELECT row_number() over (order by c.Code,c.InvCode,d.MTIME,d.LotNO) AS rowNo,
+ string sql = $@"SELECT row_number() over ( order by c.Code,c.InvCode,d.MTIME,d.LotNO) AS rowNo,
c.Code,
c.InvCode,
c.InvName,
c.InvStd,
c.InvUnit,
FLOOR(c.iQuantity) AS iQuantity,
- d.WarehouseCode,
+ c.WHCode AS WarehouseCode,
d.LotNO,
FLOOR(ISNULL(d.Quantity, 0)) AS QTY,
d.LocationCode AS LocationCode,
@@ -1324,7 +1330,7 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
where d.LotNo=m.LotNo and d.WorkPoint=m.WorkPoint
and d.WorkPoint='{WorkPoint}' AND d.Quantity>0 ) d
on c.InvCode=d.INVCode AND c.WhCode=d.WarehouseCode and d.ExtensionID=c.ExtensionID
- LEFT JOIN (SELECT INVCode,WarehouseCode,SUM(Quantity) AS QTYTotal FROM ICSWareHouseLotInfo WHERE WorkPoint='1701' GROUP BY INVCode,WarehouseCode) f ON c.InvCode=f.INVCode AND c.WhCode=f.WarehouseCode
+ LEFT JOIN (SELECT INVCode,WarehouseCode,SUM(Quantity) AS QTYTotal FROM ICSWareHouseLotInfo WHERE WorkPoint='{WorkPoint}' GROUP BY INVCode,WarehouseCode) f ON c.InvCode=f.INVCode AND c.WhCode=f.WarehouseCode
order by c.Code,c.InvCode,d.MTIME ";
var dataset = Repository().FindDataSetBySql(sql);
@@ -1334,11 +1340,13 @@ where a.IssueCode='{0}' and a.WorkPoint='{1}'";
decimal qtyCount = 0;
bool remove = false;
List removeList = new List();
-
for (int i = 0; i < table.Rows.Count; i++)
{
+
if (i != 0
- && !table.Rows[i]["InvCode"].ToString().Equals(table.Rows[i - 1]["InvCode"].ToString()))
+ && (!table.Rows[i]["InvCode"].ToString().Equals(table.Rows[i - 1]["InvCode"].ToString())
+ || !table.Rows[i]["Code"].ToString().Equals(table.Rows[i - 1]["Code"].ToString()))
+ )
{
qtyCount = 0;
remove = false;
diff --git a/WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml b/WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml
index efeea66..01735be 100644
--- a/WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml
+++ b/WMS-BS/NFine.Web/Properties/PublishProfiles/NFine.Framework.Release.pubxml
@@ -7,11 +7,11 @@
FileSystem
- D:\Send\SHZS
- False
- Release
+ D:\智合诚公司文件\项目\纽威\代码发布\BS
+ false
+ Debug
Any CPU
- True
- False
+ true
+ false
\ No newline at end of file