调整生产退料单同步

ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.dbml

@@ -114,7 +114,6 @@
     <Type Name="ICSMOApplyNeg">
       <Column Name="ID" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
       <Column Name="ApplyNegCode" Type="System.String" DbType="NVarChar(50) NOT NULL" IsPrimaryKey="true" CanBeNull="false" />
-      <Column Name="WHCode" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
       <Column Name="Status" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
       <Column Name="Type" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
       <Column Name="Memo" Type="System.String" DbType="NVarChar(1000)" CanBeNull="true" />
@@ -134,6 +133,7 @@
       <Column Name="Sequence" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
       <Column Name="SourceDetailID" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
       <Column Name="InvCode" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
+      <Column Name="WHCode" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
       <Column Name="Quantity" Type="System.Decimal" DbType="Decimal(18,6) NOT NULL" CanBeNull="false" />
       <Column Name="Amount" Type="System.Decimal" DbType="Decimal(18,6)" CanBeNull="true" />
       <Column Name="IssueNegQuantity" Type="System.Decimal" DbType="Decimal(18,6)" CanBeNull="true" />

ICSSoft.FromERP/ICSSoft.Frame.Data.Entity/Fram.designer.cs

@@ -2690,8 +2690,6 @@ namespace ICSSoft.Frame.Data.Entity
 		
 		private string _ApplyNegCode;
 		
-		private string _WHCode;
-		
 		private string _Status;
 		
 		private string _Type;
@@ -2720,8 +2718,6 @@ namespace ICSSoft.Frame.Data.Entity
     partial void OnIDChanged();
     partial void OnApplyNegCodeChanging(string value);
     partial void OnApplyNegCodeChanged();
-    partial void OnWHCodeChanging(string value);
-    partial void OnWHCodeChanged();
     partial void OnStatusChanging(string value);
     partial void OnStatusChanged();
     partial void OnTypeChanging(string value);
@@ -2789,26 +2785,6 @@ namespace ICSSoft.Frame.Data.Entity
 			}
 		}
 		
-		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WHCode", DbType="NVarChar(50)")]
-		public string WHCode
-		{
-			get
-			{
-				return this._WHCode;
-			}
-			set
-			{
-				if ((this._WHCode != value))
-				{
-					this.OnWHCodeChanging(value);
-					this.SendPropertyChanging();
-					this._WHCode = value;
-					this.SendPropertyChanged("WHCode");
-					this.OnWHCodeChanged();
-				}
-			}
-		}
-		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Status", DbType="NVarChar(50) NOT NULL", CanBeNull=false)]
 		public string Status
 		{
@@ -3046,6 +3022,8 @@ namespace ICSSoft.Frame.Data.Entity
 		
 		private string _InvCode;
 		
+		private string _WHCode;
+		
 		private decimal _Quantity;
 		
 		private System.Nullable<decimal> _Amount;
@@ -3078,6 +3056,8 @@ namespace ICSSoft.Frame.Data.Entity
     partial void OnSourceDetailIDChanged();
     partial void OnInvCodeChanging(string value);
     partial void OnInvCodeChanged();
+    partial void OnWHCodeChanging(string value);
+    partial void OnWHCodeChanged();
     partial void OnQuantityChanging(decimal value);
     partial void OnQuantityChanged();
     partial void OnAmountChanging(System.Nullable<decimal> value);
@@ -3203,6 +3183,26 @@ namespace ICSSoft.Frame.Data.Entity
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_WHCode", DbType="NVarChar(50)")]
+		public string WHCode
+		{
+			get
+			{
+				return this._WHCode;
+			}
+			set
+			{
+				if ((this._WHCode != value))
+				{
+					this.OnWHCodeChanging(value);
+					this.SendPropertyChanging();
+					this._WHCode = value;
+					this.SendPropertyChanged("WHCode");
+					this.OnWHCodeChanged();
+				}
+			}
+		}
+		
 		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Quantity", DbType="Decimal(18,6) NOT NULL")]
 		public decimal Quantity
 		{

ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs

@@ -507,7 +507,7 @@ namespace ICSSoft.FromERP
                                         headline.ID = AppConfig.GetGuid();
                                         headline.ApplyNegCode = Info.DANJU;
                                     }
-                                    headline.WHCode = "";
+                                    //headline.WHCode = "";  仓库字段放到子表中
                                     headline.Status = "1";
                                     headline.Type = "2";
                                     headline.Memo = "";
@@ -578,6 +578,7 @@ namespace ICSSoft.FromERP
                                         }
                                         line.Quantity = Item.LINGYSL;//领用数量
                                         line.SourceDetailID= Item.LGORT;//仓库
+                                        line.WHCode= Item.LGORT;//仓库
                                         line.Amount = 0;
                                         line.ExtensionID = ExtensionID;
                                         line.MUSER = "JOB";