From c2e8facf26a66f589f84080b22b78e0f61b0c8bb Mon Sep 17 00:00:00 2001
From: YL <YL@LAPTOP-SE03PLUR>
Date: 星期一, 27 十二月 2021 23:20:13 +0800
Subject: [PATCH] SRM送货单上 预计到货日期，批次号，物流单号设为不是必填项（根据系统参数判断安瑞为必填，其他为非必填）
---
WebSRM/WebSRM.csproj | 33 +++++++++++++++++++++++++++++++++
WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html | 16 ++++++++--------
WebSRM/App_Data/MssqlReportData.cs | 4 ++--
3 files changed, 43 insertions(+), 10 deletions(-)
diff --git a/WebSRM/App_Data/MssqlReportData.cs b/WebSRM/App_Data/MssqlReportData.cs
index 75fe363..f478b4d 100644
--- a/WebSRM/App_Data/MssqlReportData.cs
+++ b/WebSRM/App_Data/MssqlReportData.cs
@@ -14,9 +14,9 @@
//杩炴帴SQL Server鏁版嵁搴撶殑杩炴帴涓诧紝搴旇淇敼涓轰笌瀹為檯涓�鑷淬�傚鏋滄槸杩愯Grid++Report鏈韩鐨勪緥瀛愶紝搴旇棣栧厛闄勫姞渚嬪瓙鏁版嵁搴撳埌
//SQL Server2000/2005鏁版嵁搴撲笂銆�
//public const string SqlConnStr = "Data Source=(local);Initial Catalog=gridreport;Persist Security Info=True;User ID=sa;Password=;";
- 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;";
+ //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;";
//澶忓疂
- //public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
+ public const string SqlConnStr = "Data Source=192.168.1.239;Initial Catalog=HX_LimsSys;Persist Security Info=True;User ID=HX_USER;Password=lc@841022;";
//public string sServer;
//public string sDataBase;
diff --git a/WebSRM/WebSRM.csproj b/WebSRM/WebSRM.csproj
index f564e77..93b6208 100644
--- a/WebSRM/WebSRM.csproj
+++ b/WebSRM/WebSRM.csproj
@@ -896,6 +896,17 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\user\user\list.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\user\user\userform.html" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\user\璇存槑.txt" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\HBarPlanPrint.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_ICSubContractBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_PODemandPlanBilList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_POInStockBackBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_POInStockBill.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_POInStockBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\KF_POOrderBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\Web_BarCodeBill.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\Web_BarCodeBillList.html" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_POInStockBill.aspx" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_Web_BarCodeBillList.aspx" />
<Content Include="layuiAdmin.std-v1.2.1\璇存槑.txt" />
<Content Include="Message.html" />
<Content Include="packages.config" />
@@ -914,6 +925,8 @@
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\閫佽揣鍗�%28鏍囩绾�%29.grf" />
<Content Include="layuiAdmin.std-v1.2.1\src\views\grf\鏉＄爜.grf" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\鐗╂枡鏉＄爜%28涓冭绾稿ぇ%29_浜斾簯.grf" />
+ <Content Include="layuiAdmin.std-v1.2.1\src\views\WarM\閫佽揣鍗�%28A4绾�%29.grf" />
<None Include="Properties\PublishProfiles\websrm.pubxml" />
<None Include="Scripts\jquery-1.8.2.intellisense.js" />
<Content Include="Scripts\jquery-1.8.2.js" />
@@ -1026,6 +1039,26 @@
<Compile Include="layuiAdmin.std-v1.2.1\src\views\SRM\xmlSRM_POInStockBill.aspx.designer.cs">
<DependentUpon>xmlSRM_POInStockBill.aspx</DependentUpon>
</Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_POInStockBill.aspx.cs">
+ <DependentUpon>xmlK3_POInStockBill.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_POInStockBill.aspx.designer.cs">
+ <DependentUpon>xmlK3_POInStockBill.aspx</DependentUpon>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_POInStockBillBarCode.aspx.cs">
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_Web_BarCodeBill.aspx.cs">
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_Web_BarCodeBillList.aspx.cs">
+ <DependentUpon>xmlK3_Web_BarCodeBillList.aspx</DependentUpon>
+ <SubType>ASPXCodeBehind</SubType>
+ </Compile>
+ <Compile Include="layuiAdmin.std-v1.2.1\src\views\WarM\xmlK3_Web_BarCodeBillList.aspx.designer.cs">
+ <DependentUpon>xmlK3_Web_BarCodeBillList.aspx</DependentUpon>
+ </Compile>
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Site.Master.cs">
<DependentUpon>Site.Master</DependentUpon>
diff --git a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
index 7544ce3..bcbfb5d 100644
--- a/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
+++ b/WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html
@@ -655,14 +655,14 @@
//闈炵┖楠岃瘉
function AllowLoadData(sSubStr) {
var Result = true;
- if ($("#HDHDate").val() == '' || $("#HDHDate").val() == null) {
- layer.msg("棰勮鍒拌揣鏃ユ湡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
- if ($("#HDeliveryNo").val() == '' || $("#HDeliveryNo").val() == null) {
- layer.msg("鐗╂祦鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
- return Result = false;
- }
+ //if ($("#HDHDate").val() == '' || $("#HDHDate").val() == null) {
+ // layer.msg("棰勮鍒拌揣鏃ユ湡涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
+ //if ($("#HDeliveryNo").val() == '' || $("#HDeliveryNo").val() == null) {
+ // layer.msg("鐗╂祦鍗曞彿涓嶈兘涓虹┖锛�", { icon: 5, btn: ['纭'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "娓╅Θ鎻愮ず" });
+ // return Result = false;
+ //}
return Result;
}
--
Gitblit v1.9.1