调整检验合格单同步数据

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

@@ -256,6 +256,11 @@
       <Column Name="EATTRIBUTE1" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="false" />
       <Column Name="ASNCode" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
       <Column Name="WHCode" Type="System.String" DbType="VarChar(50)" CanBeNull="true" />
+      <Column Name="InspectionType" Type="System.String" DbType="NVarChar(50) NOT NULL" CanBeNull="true" />
+      <Column Name="InvoDescribe" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
+      <Column Name="Unity" Type="System.String" DbType="VarChar(50)" CanBeNull="true" />
+      <Column Name="StockIndicator" Type="System.String" DbType="NVarChar(50)" CanBeNull="true" />
+      <Column Name="DepositArea" Type="System.String" DbType="VarChar(50)" CanBeNull="true" />
     </Type>
   </Table>
   <Table Name="dbo.ICSSDN" Member="ICSSDN">

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

@@ -5258,6 +5258,16 @@ namespace ICSSoft.Frame.Data.Entity
 		
 		private string _WHCode;
 		
+		private string _InspectionType;
+		
+		private string _InvoDescribe;
+		
+		private string _Unity;
+		
+		private string _StockIndicator;
+		
+		private string _DepositArea;
+		
     #region 可扩展性方法定义
     partial void OnLoaded();
     partial void OnValidate(System.Data.Linq.ChangeAction action);
@@ -5316,6 +5326,16 @@ namespace ICSSoft.Frame.Data.Entity
     partial void OnASNCodeChanged();
     partial void OnWHCodeChanging(string value);
     partial void OnWHCodeChanged();
+    partial void OnInspectionTypeChanging(string value);
+    partial void OnInspectionTypeChanged();
+    partial void OnInvoDescribeChanging(string value);
+    partial void OnInvoDescribeChanged();
+    partial void OnUnityChanging(string value);
+    partial void OnUnityChanged();
+    partial void OnStockIndicatorChanging(string value);
+    partial void OnStockIndicatorChanged();
+    partial void OnDepositAreaChanging(string value);
+    partial void OnDepositAreaChanged();
     #endregion
 		
 		public ICSDeliveryNotice()
@@ -5863,6 +5883,106 @@ namespace ICSSoft.Frame.Data.Entity
 			}
 		}
 		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InspectionType", DbType="NVarChar(50) NOT NULL")]
+		public string InspectionType
+		{
+			get
+			{
+				return this._InspectionType;
+			}
+			set
+			{
+				if ((this._InspectionType != value))
+				{
+					this.OnInspectionTypeChanging(value);
+					this.SendPropertyChanging();
+					this._InspectionType = value;
+					this.SendPropertyChanged("InspectionType");
+					this.OnInspectionTypeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_InvoDescribe", DbType="NVarChar(50)")]
+		public string InvoDescribe
+		{
+			get
+			{
+				return this._InvoDescribe;
+			}
+			set
+			{
+				if ((this._InvoDescribe != value))
+				{
+					this.OnInvoDescribeChanging(value);
+					this.SendPropertyChanging();
+					this._InvoDescribe = value;
+					this.SendPropertyChanged("InvoDescribe");
+					this.OnInvoDescribeChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_Unity", DbType="VarChar(50)")]
+		public string Unity
+		{
+			get
+			{
+				return this._Unity;
+			}
+			set
+			{
+				if ((this._Unity != value))
+				{
+					this.OnUnityChanging(value);
+					this.SendPropertyChanging();
+					this._Unity = value;
+					this.SendPropertyChanged("Unity");
+					this.OnUnityChanged();
+				}
+			}
+		}
+		
+		[global::System.Data.Linq.Mapping.ColumnAttribute(Storage="_StockIndicator", DbType="NVarChar(50)")]
+		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="_DepositArea", DbType="VarChar(50)")]
+		public string DepositArea
+		{
+			get
+			{
+				return this._DepositArea;
+			}
+			set
+			{
+				if ((this._DepositArea != value))
+				{
+					this.OnDepositAreaChanging(value);
+					this.SendPropertyChanging();
+					this._DepositArea = value;
+					this.SendPropertyChanged("DepositArea");
+					this.OnDepositAreaChanged();
+				}
+			}
+		}
+		
 		public event PropertyChangingEventHandler PropertyChanging;
 		
 		public event PropertyChangedEventHandler PropertyChanged;

ICSSoft.FromERP/ICSSoft.FromERP/App.config

@@ -13,8 +13,8 @@
     <add key="HGpostUrlStr" value="http://58.210.216.118:8382/api/jobs/CFG-IMP-ORDINI"/>
   </appSettings>
   <connectionStrings>
-    <!--<add name="SysConnectionString" connectionString="Data Source=192.168.21.108;Database=ICS_WMS_NW;Uid=sa;Pwd=Server1neway;"/>-->
-    <add name="SysConnectionString" connectionString="Data Source=192.168.1.218;Database=ICS_WMS_NW;Uid=sa;Pwd=aA123456;"/>
+    <add name="SysConnectionString" connectionString="Data Source=192.168.21.108;Database=ICS_WMS_NW;Uid=sa;Pwd=Server1neway;"/>
+    <!--<add name="SysConnectionString" connectionString="Data Source=192.168.1.218;Database=ICS_WMS_NW;Uid=sa;Pwd=aA123456;"/>-->
     <add name="MailOpen" connectionString="true"/>
     <add name="SendHost" connectionString="mail.huahengweld.com"/>
     <add name="SendPort" connectionString="25"/>

ICSSoft.FromERP/ICSSoft.FromERP/ICSDeliveryNotice.cs

@@ -63,6 +63,7 @@ namespace ICSSoft.FromERP
                             Info.ZCHECK_HEAD = new SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_HEAD[1];
                             Info.ZCHECK_ITEM = new SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM[1];
 
+
                             SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECKResponse result = new SAPGetChkDocInfoVPN.ZWMS_SK_WS_CHECKResponse();
                             result = client.CallZWMS_SK_WS_CHECK(Info);
                             List<SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM> ItemInfoList = new List<SAPGetChkDocInfoVPN.ZWMS_SK_CHECK_ITEM>();
@@ -82,10 +83,10 @@ namespace ICSSoft.FromERP
                                         ExtensionID = AppConfig.GetGuid();
                                         Extensionline = new ICSExtension();
                                         Extensionline.ID = ExtensionID;
-                                        Extensionline.BatchCode = Item.SERNP;
+                                        Extensionline.BatchCode = Item.SERNP;//序列号，批次号
                                         Extensionline.Version = "";
-                                        Extensionline.Brand = Item.KDPOS;
-                                        Extensionline.ProjectCode = Item.KDAUF;
+                                        Extensionline.Brand = Item.KDPOS;//销售凭证项目
+                                        Extensionline.ProjectCode = Item.KDAUF;//销售凭证
                                         Extensionline.cFree1 = "";
                                         Extensionline.cFree2 = "";
                                         Extensionline.cFree3 = "";
@@ -122,10 +123,11 @@ namespace ICSSoft.FromERP
                                         rcvline.InvCode = Item.MATNR;//物料编码
                                         LineNum = (Convert.ToInt32(LineNum) + 10).ToString();
                                     }
+                                    
                                     rcvline.VenCode = HeadInfo.LIFNR;//供应商
                                     rcvline.DepCode = HeadInfo.NAME1;//供应商名称
                                     rcvline.DNType = "1";
-                                    rcvline.WorkPoint = HeadInfo.WERKS;//站点
+                                    rcvline.WorkPoint = HeadInfo.WERKS;//站点//工厂
                                     rcvline.CreatePerson = "JOB";
                                     rcvline.CreateDateTime = Convert.ToDateTime(HeadInfo.VDATUM);//检验时间
                                     rcvline.POID = HeadInfo.AUFNR;//订单号
@@ -133,13 +135,21 @@ namespace ICSSoft.FromERP
                                     rcvline.DNDetailID = HeadInfo.EBELP;//采购凭证的项目
                                     rcvline.Quantity = Item.L_LME;//可入库数量
                                     rcvline.Amount = 0;
-                                    rcvline.WHCode = Item.LGORT;//仓库
+                                    rcvline.WHCode = Item.LGORT;//仓库  //库存地点
                                     rcvline.Status = "2";
                                     rcvline.EATTRIBUTE1 = Item.MEMO;
                                     rcvline.MUSER = "JOB";
                                     rcvline.MUSERName = "JOB";
                                     rcvline.MTIME = DateTime.Now;
                                     rcvline.ExtensionID = ExtensionID;
+                                    //新增字段
+                                    rcvline.InspectionType =HeadInfo.ART;//检验类型
+                                    rcvline.InvoDescribe = Item.MAKTX;//物料描述
+                                    rcvline.Unity = Item.MEINS;//单位
+                                    rcvline.StockIndicator =Item.SOBKZ;//特殊库存标识
+                                    rcvline.DepositArea = Item.LTKZA;//存放区域
+
+
                                     if (isNew == true)
                                     {
                                         db.ICSDeliveryNotice.InsertOnSubmit(rcvline);