From a5760cca80dc53940cc3333bb40d504be27f4f1e Mon Sep 17 00:00:00 2001 From: dengyu Date: Mon, 25 Nov 2024 09:19:44 +0800 Subject: [PATCH] =?UTF-8?q?20241125=20=E6=97=A7=E4=BB=93=E5=82=A8=E7=BB=93?= =?UTF-8?q?=E7=AE=97=E6=B8=85=E5=8D=95=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E7=BB=93=E6=9E=9C=E4=B8=AD=E5=8F=AF=E8=83=BD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8=E7=9A=84amount=E4=B8=BAnull=E7=9A=84=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=88=E5=85=81=E8=AE=B8=E6=9C=89=E6=AD=A4=E7=A7=8D?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=EF=BC=8C=E4=BD=86=E4=B8=8D=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E5=87=BA=E6=9D=A5=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 派车的GetTruckNoList，由于查询改为union一条空白数据的形式，查询条件中的扩展名做调整 --- DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs | 6 ++++-- DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs b/DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs index 9e5fd42b..16290acb 100644 --- a/DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs +++ b/DSWeb/Areas/MvcShipping/DAL/RptWmsSettle/RptWmsSettleDAL.cs @@ -65,9 +65,11 @@ namespace DSWeb.MvcShipping.DAL.RptWmsSettleDAL data.MAKEOUTUSER = Convert.ToString(reader["MAKEOUTUSER_NAME"]);//重新生成人 if (reader["MAKEOUTTIME"] != DBNull.Value) data.MAKEOUTTIME = Convert.ToDateTime(reader["MAKEOUTTIME"]);//重新生成时间 + if (reader["YWCOUNT"] != DBNull.Value) + data.YWCOUNT = Convert.ToDecimal(reader["YWCOUNT"]);// + if (reader["AMOUNT"] != DBNull.Value) + data.AMOUNT = Convert.ToDecimal(reader["AMOUNT"]);// - data.YWCOUNT = Convert.ToDecimal(reader["YWCOUNT"]);// - data.AMOUNT = Convert.ToDecimal(reader["AMOUNT"]);// data.YWSTR = Convert.ToString(reader["YWSTR"]);// #endregion headList.Add(data); diff --git a/DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs b/DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs index 107de1e0..cfa344f5 100644 --- a/DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs +++ b/DSWeb/Areas/TruckMng/DAL/MsWlBs/MsWlPcDAL.cs @@ -894,6 +894,12 @@ namespace DSWeb.Areas.TruckMng.DAL.MsWlBs if (!string.IsNullOrEmpty(condition)) { + + if (condition.Contains(" a.")||condition.Contains(" A.")) { + condition = condition.Replace(" a.", " v."); + condition = condition.Replace(" A.", " v."); + } + strSql.Append(" where " + condition); }