From 2a9bf520f65e85777fff0f20f4c84ba9a810eef5 Mon Sep 17 00:00:00 2001
From: yyk <2336760928@qq.com>
Date: 星期四, 29 八月 2024 13:54:46 +0800
Subject: [PATCH] Merge branch 'yyk'
---
Wms/WMS.BLL/DataServer/StockInfoServer.cs | 2 +-
Wms/Wms/appsettings.json | 2 +-
Wms/WMS.BLL/DataServer/StockServer.cs | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Wms/WMS.BLL/DataServer/StockInfoServer.cs b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
index 2514636..b340c3a 100644
--- a/Wms/WMS.BLL/DataServer/StockInfoServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockInfoServer.cs
@@ -382,7 +382,7 @@
//楠岃瘉鏄惁瀛樺湪閫変腑鏃堕棿 涓嶅瓨鍦ㄥ垯璧嬪�间粖鏃ユ椂闂�
if (string.IsNullOrEmpty(StartDate))
{
- StartDate = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ff");
+ StartDate = DateTime.Now.ToString("yyyy-MM-dd");
}
//鏍规嵁鏃堕棿鑾峰彇瀵瑰簲鏃ユ湡鐨勫簱瀛樹俊鎭�
diff --git a/Wms/WMS.BLL/DataServer/StockServer.cs b/Wms/WMS.BLL/DataServer/StockServer.cs
index bf573df..65e4416 100644
--- a/Wms/WMS.BLL/DataServer/StockServer.cs
+++ b/Wms/WMS.BLL/DataServer/StockServer.cs
@@ -581,7 +581,7 @@
try
{
string str = "select* from SysMaterials where SkuNo in (select a.SkuNo from BllArrivalNoticeDetail a " +
- "inner join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";
+ "left join BllExportNoticeDetail b on a.SkuNo = b.SkuNo";
//鍒ゆ柇寮�濮嬫椂闂存槸鍚︿负绌�
if (!string.IsNullOrWhiteSpace(StartTime))
diff --git a/Wms/Wms/appsettings.json b/Wms/Wms/appsettings.json
index 72dd5a9..b1357b1 100644
--- a/Wms/Wms/appsettings.json
+++ b/Wms/Wms/appsettings.json
@@ -47,7 +47,7 @@
},
"Quartz": {
"dbProviderName": "SqlServer",
- "connectionString": "Server=.;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
+ "connectionString": "Server=192.168.62.200;Database=QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
}
--
Gitblit v1.8.0