Merge branch 'master' of http://119.3.29.177:3000/Luy/NWeiWMS

ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs

@@ -1210,6 +1210,7 @@ namespace ICSSoft.FromERP
                                             {
                                                 ExtensionID = AppConfig.GetGuid();
                                                 Extensionline = new ICSExtension();
+                                                Extensionline.ID = ExtensionID;
                                                 if (Item.SOBKZ == "E")
                                                 {
                                                     Extensionline.BatchCode = "";
@@ -1299,6 +1300,7 @@ namespace ICSSoft.FromERP
                                                 {
                                                     ExtensionID = AppConfig.GetGuid();
                                                     Extensionline = new ICSExtension();
+                                                    Extensionline.ID = ExtensionID;
                                                     if (Item.SOBKZ == "E")
                                                     {
                                                         Extensionline.BatchCode = SubInfo.GERNR;

ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs

@@ -7469,6 +7469,10 @@ WHERE WorkPoint='{0}' AND Quantity>ISNULL(TransferQuantity, 0) order by Transfer
                                 {
                                     throw new Exception("超托入库区域:" + PostionCode + "未维护默认点位，无法入库！");
                                 }
+                                else
+                                {
+                                    PostionCode = chkdt.Rows[0]["F_Define2"].ToString();
+                                }
                                 #endregion
                             }
                         }

WMS-BS/NFine.Application/WMS/PickMaterialApp.cs

@@ -2566,7 +2566,7 @@ a.Sequence,
                         {
                             string ccsql = @"select B.F_Id from ICSInventoryDetail A
                                              INNER JOIN Sys_SRM_ItemsDetail  B ON B.F_Define1=A.WHCode AND B.F_Define2=A.LocationCode AND B.F_Define4=A.WorkPoint
-                                             where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}' AND B.F_ItemCode Like 'ForkLiftAreaConfig%'";
+                                             where INVCode='{0}' and WHCode='{1}' and WorkPoint='{2}' AND B.F_ItemCode Like 'ForkLiftAreaConfig%' AND B.F_EnabledMark='1'";
                             ccsql = string.Format(ccsql, table.Rows[0]["InvCode"].ToString(), table.Rows[0]["WarehouseCode"].ToString()
                                                   , WorkPoint);
                             var ccds = Repository().FindDataSetBySql(ccsql);