From bc96c32d756d95da9329b2d9f8b7276f3e1e4961 Mon Sep 17 00:00:00 2001 From: "songnan.zhang" Date: Wed, 26 Oct 2022 08:09:17 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E8=A1=A5=E5=A4=A9=E6=B4=A5=E9=80=80?= =?UTF-8?q?=E8=BF=94=E5=85=A5=E5=BA=93=E5=90=8E=E9=87=8D=E6=96=B0=E5=8F=91?= =?UTF-8?q?=E8=BF=90bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- APP/QMAPP.Web/Web.config | 6 +++--- APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs | 8 +++++++- APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs | 19 ++++++++++++++++++- APPQ5/QMAPP.WinForm/App.config | 6 +++--- .../QMAPP.WinForm/Properties/AssemblyInfo.cs | 4 ++-- .../WCF/QMFrameWork.WebServiceHost/Web.config | 8 ++++---- 6 files changed, 37 insertions(+), 14 deletions(-) diff --git a/APP/QMAPP.Web/Web.config b/APP/QMAPP.Web/Web.config index c7e3a38..f111f23 100644 --- a/APP/QMAPP.Web/Web.config +++ b/APP/QMAPP.Web/Web.config @@ -40,7 +40,7 @@ - + - + + --> diff --git a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs index 4449a29..050912d 100644 --- a/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs +++ b/APPQ5/QMAPP.FJC.BLL/TianJin/TJFrmPlaceBLL.cs @@ -296,7 +296,13 @@ namespace QMAPP.FJC.BLL.TianJin { try { - return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().ExistBarcode(barcodetime, pbarcode); + var DATA = QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL.TExistBarcode(barcodetime, pbarcode); + if (DATA.Rows.Count>0) + { + return new DataTable(); + } + else + return new QMAPP.FJC.DAL.TianJin.TJFrmPlaceDAL().ExistBarcode(barcodetime, pbarcode); } catch (Exception ex) diff --git a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs index 9a4d6f5..8be1bc7 100644 --- a/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs +++ b/APPQ5/QMAPP.FJC.DAL/TianJin/TJFrmPlaceDAL.cs @@ -1034,7 +1034,24 @@ namespace QMAPP.FJC.DAL.TianJin } - + /// + /// 查找退返入库 + /// + /// + /// + public static DataTable TExistBarcode(int barcodetime, string pbarcode) + { + StringBuilder strSql = new StringBuilder(); + strSql.Append($"SELECT * FROM T_AW_Storage WHERE ProductCode = '{pbarcode}' AND InStorageType = '退返入库'"); + List parameters = new List(); + //DateTime dtime = DateTime.Now; + //string bdatetime = dtime.AddDays(-barcodetime).ToShortDateString(); + //strSql.Append(string.Format(" WHERE SANBARCODE='{2}' AND SCANDATE>='{0} 00:00:00' and SCANDATE<='{1} 23:59:59' AND FLAGDEL='0' ", bdatetime, DateTime.Now.ToShortDateString(), pbarcode)); + using (IDataSession session = AppDataFactory.CreateMainSession()) + { + return session.GetTable(strSql.ToString(), parameters.ToArray()); + } + } /// /// 判断条码是否重复 diff --git a/APPQ5/QMAPP.WinForm/App.config b/APPQ5/QMAPP.WinForm/App.config index 7b6a016..90bf53c 100644 --- a/APPQ5/QMAPP.WinForm/App.config +++ b/APPQ5/QMAPP.WinForm/App.config @@ -3,11 +3,11 @@ - + - + diff --git a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs index edc92b8..088903a 100644 --- a/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs +++ b/APPQ5/QMAPP.WinForm/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // 可以指定所有这些值,也可以使用“内部版本号”和“修订号”的默认值, // 方法是按如下所示使用“*”: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("2022.10.14.01")] -[assembly: AssemblyFileVersion("2022.10.14.01")] +[assembly: AssemblyVersion("2022.10.26.01")] +[assembly: AssemblyFileVersion("2022.10.26.01")] diff --git a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config index 8ef77a0..d9003b3 100644 --- a/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config +++ b/ServicesCenter/WCF/QMFrameWork.WebServiceHost/Web.config @@ -63,18 +63,18 @@ - + + --> -