parent: faec8e65 | 补丁 | 提交 | ignore whitespace
沈泽
2021-09-27 4c007a80dcf76fc93f53ab6f59119ce870950015 
Merge branch 'master' of http://101.37.171.70:10101/r/MESWMS-LayUI
9个文件已修改
1632 ■■■■■ 已修改文件
WebTM/Properties/PublishProfiles/LAYUI.pubxml.user 1517 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/WebTM.csproj.user 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/layuiadmin/Scripts/webConfig.js 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/生产管理/生产任务单/Sc_ICMOBillList.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/计划管理/工艺路线/Gy_RoutingBillList.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/委外工序发出单/Cj_StationEntrustInBill_Mul.html 104 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBill.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/车间管理/工序流转卡/Sc_ProcessExchangeBillList.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 WebTM/Properties/PublishProfiles/LAYUI.pubxml.user


Diff too large




 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>D:\Git仓库\智云迈思\项目\MESWMS\LAYUI\WebTM\Properties\PublishProfiles\LAYUI.pubxml</NameOfLastUsedPublishProfile>


    <ProjectView>ShowAllFiles</ProjectView>


    <LastActiveSolutionConfig>Debug|Any CPU</LastActiveSolutionConfig>


    <UseIISExpress>true</UseIISExpress>




 WebTM/layuiadmin/Scripts/webConfig.js


@@ -8,7 +8,7 @@


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //杨露本地配置


    //var WEBURL = "http://localhost:8082/LuBaoAPI/";    //章紫柔本地配置


    //var WEBURL = "http://10.1.4.155/API/";   //江丰客户NEW


    //var WEBURL = "http://47.96.97.237/API/";   //智云服务器


    var WEBURL = "http://47.96.97.237/API/";   //智云服务器


    //var WEBURL = "http://183.129.128.86:9090/API/";   //凯贝奈特客户服务器外网


    //var WEBURL = "http://192.168.1.253:8080/API/";   //凯贝奈特客户服务器内网


    //var WEBURL = "http://localhost/API/";




 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/³µ¼ä¹ÜÀí/ίÍ⹤Ðò·¢³öµ¥/Cj_StationEntrustInBill_Mul.html


@@ -83,42 +83,40 @@


                                                <input type="text" class="layui-input" name="HDate" id="HDate" style="background-color:#efefef4d;" readonly>


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label"><span style="color:red;">*</span>接收数量</label>


                                            <label class="layui-form-label">供应商</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HQty" id="HQty">


                                                <input type="text" class="layui-input" name="HSupName" id="HSupName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>


                                                <input type="hidden" name="HSupID" id="HSupID">


                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="HSupID-BT" id="HSupID-BT" style="width: 40px; padding: 0 10px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>


                                                </button>


                                            </div>


                                        </div>


                                    </div>


                                    <div class="layui-row">


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label"><span style="color:red;">*</span>生产资源</label>


                                            <label class="layui-form-label"><span style="color:red;">*</span>发出人</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HSourceName" id="HSourceName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>


                                                <input type="hidden" name="HSourceID" id="HSourceID" value="0">


                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkSource" id="get_checkSource" style="width: 40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>


                                                <button type="button" class="layui-btn" lay-submit="" lay-filter="HEmployeeID-BT" id="HEmployeeID-BT" style="width: 40px; padding: 0 10px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>


                                                </button>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label"><span style="color:red;">*</span>生产班组</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HGroupName" id="HGroupName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>


                                                <input type="hidden" name="HGroupID" id="HGroupID" value="0">


                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkGroup" id="get_checkGroup" style="width: 40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                </button>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label"><span style="color:red;">*</span>接收人</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HEmpName" id="HEmpName" onmouseover="this.title=this.value" style="float: left; width: 150px; background-color: #efefef4d; display: inline-block;" readonly>


                                                <input type="hidden" name="HEmpID" id="HEmpID" value="0">


                                                <button class="layui-btn layuiadmin-btn-order" type="button" lay-submit="" lay-filter="get_checkEmp" id="get_checkEmp" style="width: 40px;">


                                                    <i class="layui-icon layui-icon-search layuiadmin-button-btn" style="margin-left:-9px;"></i>


                                                </button>


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">发出数量</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HQty" id="HQty">


                                            </div>


                                        </div>


                                        <div class="layui-col-xs4 layui-inline">


                                            <label class="layui-form-label">委外工单号</label>


                                            <div class="layui-input-inline">


                                                <input type="text" class="layui-input" name="HWWWorkOrderBillNo" id="HWWWorkOrderBillNo">


                                            </div>


                                        </div>


                                    </div>


@@ -392,22 +390,12 @@


                        return;


                    }


                    if ($("#HQty").val() == "") {


                        layer.msg("请先填写接收数量！", { icon: 7 });


                        layer.msg("请先填写发出数量！", { icon: 7 });


                        $("#HBarCode").val("");


                        return;


                    }


                    if ($("#HSourceID").val() == 0) {


                        layer.msg("请选择生产资源！", { icon: 7 });


                        $("#HBarCode").val("");


                        return;


                    }


                    if ($("#HGroupID").val() == 0) {


                        layer.msg("请选择班组！", { icon: 7 });


                        $("#HBarCode").val("");


                        return;


                    }


                    if ($("#HEmpID").val() == 0) {


                        layer.msg("请选择接收人！", { icon: 7 });


                    if ($("#HEmpID").val() == "") {


                        layer.msg("请选择发出人！", { icon: 7 });


                        $("#HBarCode").val("");


                        return;


                    }


@@ -422,7 +410,7 @@


                var index = layer.load();


                $.ajax({


                    type: "POST",


                    url: GetWEBURL() + "/Cj_StationInBill/AddBill",


                    url: GetWEBURL() + "/Cj_StationEntrustInBill/AddBill",


                    async: true,


                    data: { "oMain": oMain },


                    dataType: "json",


@@ -632,18 +620,25 @@


                        if (result.count == 1) {


                            var data = result.data[0];


                            $("#HICMOInterID").val(data.hicmointerid);


                            $("#lngICMOEntryID").val(data.lngICMOEntryID);


                            $("#HICMOBillNo").val(data.任务单号);


                            $("#HMaterID").val(data.HMaterID);


                            $("#HMaterName").val(data.产品);


                            $("#HMaterNumber").val(data.产品代码);


                            $("#HMaterModel").val(data.规格型号);


                            $("#HPieceQty").val(data.流转卡数量);


                            $("#HPlanQty").val(data.流转卡数量);


                            $("#HPieceQty").val(data.生产数量);


                            $("#HPlanQty").val(data.生产数量);


                            $("#HProcExchBillNo").val(data.单据号);


                            $("#HICMOQty").val(data.任务单数量);


                            $("#lngBillKey").val(data.hmainid);


                            $("#HOrderProcNO").val(data.订单跟踪号);


                            $("#lngBillSubKey").val(data.hsubid);


                            $("#HStationInTime").val(Format(new Date(), "yyyy-MM-dd hh:mm:ss"));


                            $("#HSourceID").val(data.HSourceID);


                            $("#HSource").val(data.生产资源);


                            $("#HGroupID").val(data.HGroupID);


                            $("#HGroup").val(data.班组);


                            $("#HDeptID").val(sessionStorage["HDeptID"]);


                            $("#HDept").val(sessionStorage["HDept"]);


                            layer.close(index);


                            $("#HProcNo").attr("readonly", "readonly");


                            $("#HProcNo").css("background-color", "#efefef4d");


@@ -666,7 +661,7 @@


            function txtHProcNo_KeyDown(sBillNo, sProcNo) {


                var index = layer.load();


                $.ajax({


                    url: GetWEBURL() + "/Cj_StationInBill/txtHProcNo_KeyDown",


                    url: GetWEBURL() + "/Cj_StationEntrustInBill/txtHProcNo_KeyDown",


                    type: "GET",


                    data: { "sBillNo": sBillNo, "sProcNo": sProcNo },


                    success: function (result) {


@@ -709,10 +704,31 @@




            //#endregion




            //选择供应商


            form.on('submit(HSupID-BT)', function () {


                layer.open({


                    type: 2


                    , area: ['80%', '80%']


                    , title: '供应商列表'


                    , shade: 0.6 //遮罩透明度


                    , maxmin: true //允许全屏最小化


                    , anim: 0 //0-6的动画形式，-1不开启


                    , content: ['../../Baseset/基础资料/Gy_SupplierList.html', 'yes']


                    , resize: false


                    , cancel: function () {


                        //$(".layui-btn").removeClass("layui-btn-disabled");


                    }


                })


            });




            //以上为layui模块


        });




        //返回供应商


        function GetHSupValue(obj) {


            $("#HSupName").val(obj[0].HName);


            $("#HSupID").val(obj[0].HItemID);


        }


    </script>


</body>


</html>




 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",