Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

王 垚

2021-12-29 f5976e32889eb54f48f75ad791c32218d0ea9f6f

Merge branch 'master' of http://101.37.171.70:10101/r/SRM-LAYUI

 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;

 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>

 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;
            }