Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

仲国强

2021-09-27 a26c5878f70ab095c101d29036fb6a590561dabf

Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI

 WebTM/WebTM.csproj

@@ -59,6 +59,7 @@
    <Reference Include="System.EnterpriseServices" />
  </ItemGroup>
  <ItemGroup>
    <Content Include="HtmlPage1.html" />
    <Content Include="layuiadmin\echarts.min.js" />
    <Content Include="layuiadmin\layui\css\global.css" />
    <Content Include="layuiadmin\layui\css\modules\layim\html\getmsg.json" />

 WebTM/WebTM.csproj.user

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <NameOfLastUsedPublishProfile>D:\Git仓库\项目\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\JFTM.pubxml</NameOfLastUsedPublishProfile>
    <NameOfLastUsedPublishProfile>JFTM</NameOfLastUsedPublishProfile>
    <ProjectView>ShowAllFiles</ProjectView>
    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>
    <UseIISExpress>true</UseIISExpress>

 WebTM/views/Éú²ú¹ÜÀí/Éú²úÈÎÎñµ¥/Sc_ICMOBillList.html

@@ -218,6 +218,7 @@

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({
                    url: GetWEBURL() + '/LEMS/MES_IF_ICMOBillList_Json',

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBill.html

@@ -60,6 +60,7 @@
                                            <div class="layui-input-block" style="margin-left: 120px;">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                            </div>
                                        </div>
                                        <div class="layui-inline">
@@ -512,6 +513,7 @@
            //保存提交
            form.on('submit(btnSave)', function (data) {//提交
                //var tableData = data.field;
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;

 WebTM/views/¼Æ»®¹ÜÀí/¹¤ÒÕ·Ïß/Gy_RoutingBillList.html

@@ -233,6 +233,7 @@

            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBill.html

@@ -72,6 +72,7 @@
                                            <div class="layui-input-inline">
                                                <input type="text" class="layui-input" name="HBillNo" id="HBillNo" style="background-color:#efefef4d;" readonly>
                                                <input type="hidden" name="HInterID" id="HInterID" value="0">
                                                <input type="hidden" name="HSTOCKORGID" id="HSTOCKORGID" lay-verify="HSTOCKORGID">
                                            </div>
                                        </div>
                                        <div class="layui-col-xs4 layui-inline">
@@ -935,6 +936,7 @@
                        }
                    }
                }
                data.field.HSTOCKORGID = sessionStorage["OrganizationID"];//组织
                var sMainStr = JSON.stringify(data.field);
                var sSubStr = JSON.stringify(table.cache['mainTable']);
                var sMainSub = sMainStr + ';' + sSubStr;

 WebTM/views/³µ¼ä¹ÜÀí/¹¤ÐòÁ÷ת¿¨/Sc_ProcessExchangeBillList.html

@@ -464,6 +464,7 @@
            }
            //#region æŸ¥è¯¢
            function get_Display(sWhere) {
                sWhere += " and HPRDORGID=" + sessionStorage["OrganizationID"] + " ";
                var ajaxLoad = layer.load();
                $.ajax({
                    //url: "http://61.130.49.162:9090/WMSAPI///Web/GetMAXNum",