From 99f7d48ce5e324912b85a62262f0144f64cdbdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=86=E6=99=94?= <luy@valueics.com>
Date: Fri, 22 Sep 2023 10:37:03 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99=E5=90=8C?=
 =?UTF-8?q?=E6=AD=A5=E4=BF=AE=E6=94=B9=20=E7=AA=84=E5=B7=B7=E9=81=93?=
 =?UTF-8?q?=E5=87=BA=E5=BA=93=E5=8C=BA=E5=9F=9F=E5=A2=9E=E5=8A=A0=E7=94=9F?=
 =?UTF-8?q?=E6=95=88=E5=A4=B1=E6=95=88=E6=A0=8F=E4=BD=8D=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ICSSoft.FromERP/ICSSAPDocGet.cs           |   2 ++
 .../Root/ICSSoft.Frame.Data.Entity.dll        | Bin 143360 -> 143360 bytes
 .../ICSSoft.DataProject/ICSSubmitService.cs   |   4 ++++
 .../NFine.Application/WMS/PickMaterialApp.cs  |   2 +-
 4 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs b/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
index c3ad8ca..e02912a 100644
--- a/ICSSoft.FromERP/ICSSoft.FromERP/ICSSAPDocGet.cs
+++ b/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;
diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll
index bcf4c26f01b3ed7d00cc8bcd5c85fcfdebe1d430..56ebfa489cafc3f26eafcdabfd1fc98f07517974 100644
GIT binary patch
delta 98
zcmZp8z|ru4V?qbZ_E^r;#-6P`i~`pMBvNbZQ@W3OOi_OE>4kgujqPi$GhXloE1BM)
z$|NE4>Wf{o-!Xf~ZNW!>yq)@Q86yJ&gNs$n^IdzNu9$v9mFdQG2Q?;@?HkmX0yqJ$
CBP;s=

delta 129
zcmV-{0Dk{~;0S==2#|;bx~|b=fsD0`0T9;^-{5*wK!qAgz98f`z>ck#x2)Fz&`kuo
zuF+(dfF%MLK=G)}erTF!N{aVC@jrC&+yMXp07N=m=9#+XkcjB7n&pM8<&U`LmWSlK
jwp{6<x#yd%T<5yI<*0#N<h!HipqI2I0@$~(CIV0i*C<6Y

diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
index 7465538..aabf784 100644
--- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs
+++ b/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
                             }
                         }
diff --git a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
index ec8f6e7..e6d9769 100644
--- a/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
+++ b/WMS-BS/NFine.Application/WMS/PickMaterialApp.cs
@@ -2565,7 +2565,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);