diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll index fd0c4d1..168d217 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/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll b/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll index fca9246..e4a5f81 100644 Binary files a/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll and b/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll differ diff --git a/ICSSoft.FromERP/Root/ICSSoft.Test.application b/ICSSoft.FromERP/Root/ICSSoft.Test.application index aec6e3f..20627b5 100644 --- a/ICSSoft.FromERP/Root/ICSSoft.Test.application +++ b/ICSSoft.FromERP/Root/ICSSoft.Test.application @@ -14,7 +14,7 @@ - zpVJZ5eGSw01Wfd4GRg+C5F0szNGUZFdicxI+jx/+og= + DSEm34b+1mjlnEtOlTxUI5JOE3tLC4gcAszwXd3T2V0= diff --git a/ICSSoft.FromERP/Root/ICSSoft.Test.exe b/ICSSoft.FromERP/Root/ICSSoft.Test.exe index 3ffc265..7d05e12 100644 Binary files a/ICSSoft.FromERP/Root/ICSSoft.Test.exe and b/ICSSoft.FromERP/Root/ICSSoft.Test.exe differ diff --git a/ICSSoft.FromERP/Root/ICSSoft.Test.exe.manifest b/ICSSoft.FromERP/Root/ICSSoft.Test.exe.manifest index 50d80e2..82dbdd1 100644 --- a/ICSSoft.FromERP/Root/ICSSoft.Test.exe.manifest +++ b/ICSSoft.FromERP/Root/ICSSoft.Test.exe.manifest @@ -433,7 +433,7 @@ - ZqCVkFwOX415qbq/CzbDsVT0a/pqaWaf9+Hzz9WEtt0= + fg7iGJTYSYZJ78jzmOQ5xQ29Je1Rvyo6d1tJGY5pArw= @@ -445,7 +445,7 @@ - r2JjCbHoqMF+WVmOYkMHzNTlzbz6shg12rXHl8NrLVY= + RI0rXBrn/ZNMPPW/egAkb3LTmZ7hMIeXL57eRqTtwC8= @@ -457,7 +457,7 @@ - Armf9vZ45JUe28+974dXE+1Dl1Mwo/uuirlsT/HoFM4= + k+BS27YmYHf5uEci+kcOWalMM5aNy1jmNgZ9ZkFVqG0= diff --git a/ICSSoft.FromERP/Root/app.publish/ICSSoft.Test.exe b/ICSSoft.FromERP/Root/app.publish/ICSSoft.Test.exe index 3ffc265..7d05e12 100644 Binary files a/ICSSoft.FromERP/Root/app.publish/ICSSoft.Test.exe and b/ICSSoft.FromERP/Root/app.publish/ICSSoft.Test.exe differ diff --git a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs index b770f16..8866704 100644 --- a/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs +++ b/ICSSoft.WMS.WebAPI/ICSSoft.DataProject/ICSSubmitService.cs @@ -9393,7 +9393,7 @@ ORDER BY CAST(Sequence AS INT),MTDOCType"; string lotList = @"SELECT a.*,b.ExtensionID FROM ICSWareHouseLotInfo a LEFT JOIN ICSInventoryLot b ON a.lotno=b.lotno and a.WorkPoint=b.WorkPoint WHERE a.Quantity>0 AND a.INVCode='{0}' AND b.ExtensionID='{1}' and a.WorkPoint='{2}' and a.WarehouseCode='{3}' -ORDER BY a.mtime desc "; +ORDER BY a.mtime "; lotList = string.Format(lotList, beforInvCode, beforExtensionID, JsonData.WorkPoint, whCode); DataTable dtlotList = DBHelper.SQlReturnData(lotList, cmd); foreach (DataRow dr in dtlotList.Rows)