From d5767d95e23664ce5288e2bfc99c4ac306ad5917 Mon Sep 17 00:00:00 2001 From: yangtm Date: Thu, 27 Feb 2025 10:21:40 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E5=8D=95=E5=BD=A2=E6=80=81=E8=BD=AC?= =?UTF-8?q?=E6=8D=A2=E5=85=88=E8=BF=9B=E5=85=88=E5=87=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Root/ICSSoft.Frame.Data.Entity.dll | Bin 145920 -> 145920 bytes ICSSoft.FromERP/Root/ICSSoft.FromERP.dll | Bin 664576 -> 664576 bytes ICSSoft.FromERP/Root/ICSSoft.Test.application | 2 +- ICSSoft.FromERP/Root/ICSSoft.Test.exe | Bin 4096 -> 4096 bytes .../Root/ICSSoft.Test.exe.manifest | 6 +++--- .../Root/app.publish/ICSSoft.Test.exe | Bin 4096 -> 4096 bytes .../ICSSoft.DataProject/ICSSubmitService.cs | 2 +- 7 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll b/ICSSoft.FromERP/Root/ICSSoft.Frame.Data.Entity.dll index fd0c4d1fc2a174fc70d2fbbda0f0bac81814b889..168d21754f6b428b0ac4f3bd31da1bffde35e2c7 100644 GIT binary patch delta 74 zcmZqp!qM=BV?qZr|L0YW-CMgEJMRl@X?ipL$`vQ)$(7Th1Pvd&*sk(`ktG16V!E~g elca#)57sS8b0@j&{N?6W`P)i%dx!zk8cqNiP9UNH delta 74 zcmZqp!qM=BV?qaW--C?C?ycR7o%aPc9=#I9w^YKv{Zsgd5BEQCZdZB0$PxfjFjS%}q&Ge*qt6sIzly!QJ;Z=%4JQCYeIm91 diff --git a/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll b/ICSSoft.FromERP/Root/ICSSoft.FromERP.dll index fca924693b51c39646f49218c86f3453e8f2df33..e4a5f811d605c3edd410002af0f0d1501cf9be60 100644 GIT binary patch delta 98 zcmZoTq0w+cV?qbBz~@zs-L2h>t=&wm-OR1sEUn$Ft=(*`-R!O199z3N-#!uOedgP~ zd5?wHLW7$75=V}zZtr-?8Da|3IsLvAm!tsq=1u&;7aRS$B?|w42;1|1JBKva4-NoK Cgex!r delta 98 zcmZoTq0w+cV?qbB?2nAb?$&O`)^4WOZsyi*mey|8)^4`eZuZu0j;-CCZ=VP}S7+hw zo~Z1&@#Z!T<3hFc?Hx}!Lrg(Br{9<2k`%aUIP+z~+et1 - zpVJZ5eGSw01Wfd4GRg+C5F0szNGUZFdicxI+jx/+og= + DSEm34b+1mjlnEtOlTxUI5JOE3tLC4gcAszwXd3T2V0= diff --git a/ICSSoft.FromERP/Root/ICSSoft.Test.exe b/ICSSoft.FromERP/Root/ICSSoft.Test.exe index 3ffc2657e5e5f6328130a4a71f6cb747cb97819e..7d05e12bcb9366c0524f83f0c1cb352742473ba7 100644 GIT binary patch delta 66 zcmZorXi%8Y!7T83)yD3fYyxv0cz#|p`>x*{`=jr_N}P4s9KtTb2$G$g%^@jZdBV&x W?@h2z^X$%Z5}SA3**t|KhaCX-@Ez^| delta 66 zcmZorXi%8Y!7TeDV`KMDHUSayzZ*}8obYIyU@4OO#j$sD2)hU)NOp2Ihor#O$|GIe V56xX>Pp^BqEqczB%~LpX*a3{|8_WOz 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 3ffc2657e5e5f6328130a4a71f6cb747cb97819e..7d05e12bcb9366c0524f83f0c1cb352742473ba7 100644 GIT binary patch delta 66 zcmZorXi%8Y!7T83)yD3fYyxv0cz#|p`>x*{`=jr_N}P4s9KtTb2$G$g%^@jZdBV&x W?@h2z^X$%Z5}SA3**t|KhaCX-@Ez^| delta 66 zcmZorXi%8Y!7TeDV`KMDHUSayzZ*}8obYIyU@4OO#j$sD2)hU)NOp2Ihor#O$|GIe V56xX>Pp^BqEqczB%~LpX*a3{|8_WOz 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)