From e9360c60df703fd23d8860b4bef8f7bebfa2db67 Mon Sep 17 00:00:00 2001
From: yangle <admin@YINMOU>
Date: 星期二, 13 六月 2023 11:18:36 +0800
Subject: [PATCH] 1
---
WebTM/App_Data/MssqlReportData.cs | 4 ++--
WebTM/views/生产管理/日计划基础资料/Cg_PODemandPlanConfigBill_Excel.html | 10 ++--------
WebTM/Properties/PublishProfiles/JFTM.pubxml | 2 +-
3 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/WebTM/App_Data/MssqlReportData.cs b/WebTM/App_Data/MssqlReportData.cs
index c693628..2970159 100644
--- a/WebTM/App_Data/MssqlReportData.cs
+++ b/WebTM/App_Data/MssqlReportData.cs
@@ -18,8 +18,8 @@
//public const string SqlConnStr = "Data Source=10.0.2.9;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public const string SqlConnStr = "Data Source=.;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//ch娴嬭瘯
- //public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
- public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
+ public const string SqlConnStr = "Data Source=47.96.97.237,15127;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//YL娴嬭瘯
+ //public const string SqlConnStr = "Data Source=192.168.0.245;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//甯呭▉
//public const string SqlConnStr = "Data Source=192.168.1.251;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涔斾竴
//public const string SqlConnStr = "Data Source=192.168.16.53;Initial Catalog=HX_LMESsys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//榫欏北姹介厤
//public const string SqlConnStr = @"Data Source=192.168.0.193\SWE2014;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";//涓镐簳鍦板潃
diff --git a/WebTM/Properties/PublishProfiles/JFTM.pubxml b/WebTM/Properties/PublishProfiles/JFTM.pubxml
index 1c676bc..70a8712 100644
--- a/WebTM/Properties/PublishProfiles/JFTM.pubxml
+++ b/WebTM/Properties/PublishProfiles/JFTM.pubxml
@@ -10,7 +10,7 @@
<LastUsedBuildConfiguration>Debug</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<PublishProvider>FileSystem</PublishProvider>
- <PublishUrl>E:\缃戠珯鍙戝竷\LAYUI</PublishUrl>
+ <PublishUrl>D:\缃戠珯鍙戝竷\鏅轰簯MESWMS\LAYUI</PublishUrl>
<WebPublishMethod>FileSystem</WebPublishMethod>
<SiteUrlToLaunchAfterPublish />
</PropertyGroup>
diff --git "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html" "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
index c1afa06..80aeee9 100644
--- "a/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
+++ "b/WebTM/views/\347\224\237\344\272\247\347\256\241\347\220\206/\346\227\245\350\256\241\345\210\222\345\237\272\347\241\200\350\265\204\346\226\231/Cg_PODemandPlanConfigBill_Excel.html"
@@ -152,17 +152,11 @@
//瀵煎叆 淇濆瓨鏁版嵁
form.on('submit(btnSave)', function (data) {
-
- if ($("input[name='SqlAppend']").prop("checked")) {
+ if (table.cache["mainTable"] != null) {
set_AddNew(data);
}
else {
- if (table.cache["mainTable"] != null) {
- set_AddNew(data);
- }
- else {
- layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
- }
+ layer.msg("鏃犳暟鎹�,璇峰厛瀵煎叆鏁版嵁!");
}
})
--
Gitblit v1.9.1