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

yangle

2022-08-19 c70718b511583294298b1055f8e581c1ec18f97e

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

 WebTM/Properties/PublishProfiles/JFTM.pubxml.user

@@ -2828,6 +2828,9 @@
    <File Include="views/生产管理/日计划报表/ReportMOMaterReadysBillList.html">
      <publishTime>08/09/2022 16:56:03</publishTime>
    </File>
    <File Include="views/生产管理/日计划报表/ReportMOMaterReadysBillList.html">
      <publishTime>08/04/2022 11:04:35</publishTime>
    </File>
    <File Include="views/生产管理/日计划报表/ReportPODemandPlanBillList.html">
      <publishTime>06/21/2022 02:57:43</publishTime>
    </File>

 WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html

@@ -845,11 +845,7 @@

            //退出按钮
            form.on('submit(Cancel)', function () {
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })

            //提交
@@ -1059,7 +1055,7 @@
                            type: "Get",
                            url: GetWEBURL() + "/ProductIn/Delete_Json",
                            async: true,
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": sBillType, "HBarCode": sBarCode },
                            data: { "HInterID": sInterID, "HBillNo": sBillNo, "HBillType": '1207', "HBarCode": sBarCode },
                            dataType: "json",
                            success: function (data) {
                                if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
@@ -1137,7 +1133,7 @@
                    $.ajax({
                        url: GetWEBURL() + "/MoveStockBill/get_InfoByBarCode_Source_Json",//37181
                        type: "GET",
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": HBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": WhID, "SPID": SPID, "HSCWhID": HSCWhID, "HSCSPID": HSCSPID, "sQty": sQty, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sHSourceBillType": sHBillType, "HStockInOrgID": HStockInOrgID, "HStockOutOrgID": HStockOutOrgID, "HScanStyle": HScanStyle},
                        success: function (result) {
                            if (result.count == 1) {
                                sessionStorage["SourceFlag"] = true;
@@ -1276,8 +1272,8 @@
                                $("#HStockOutOrgName").val(result.data[0].HSTOCKOUTORGName);
                            }

                            $("#HDeptID").val(result.data[0].HDeptID);
                            $("#HDeptName").val(result.data[0].HDeptName);
                            //$("#HDeptID").val(result.data[0].HDeptID);
                            //$("#HDeptName").val(result.data[0].HDeptName);


                            $("#HWHID").val(result.data[0].HWhID);

 WebTM/views/ÁìÁÏ·¢»õ/ÏúÊÛ³ö¿â/Kf_SellOutBill_Fast.html

@@ -78,7 +78,7 @@
                                            <label class="layui-form-label" style="width:60px;padding-left:0px;">扫描类型</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HScanStyle" id="HScanStyle">
                                            <select name=" HScanStyle" id="HScanStyle" disabled:"disabled">
                                                <option value="整托扫码">整托扫码</option>
                                                <option value="单个拆码">单个拆码</option>
                                                <option value="反向拆码">反向拆码</option>
@@ -97,7 +97,7 @@
                                            <input type="hidden" name="HWHID_FIFO" id="HWHID_FIFO" lay-verify="HWHID_FIFO" value="0" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs3">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT">...</button>
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="HWHID_FIFO-BT" disabled:"disabled">...</button>
                                        </div>
                                    </div>
                                </div>
@@ -585,7 +585,7 @@
                $("#HInterID").val("");
                $("#HBillNo").val(""); 
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1205' },
                    success: function (d) {
@@ -602,7 +602,6 @@
                RoadBillMain(linterid);
                RoadBillSub(linterid);
            }


            form.on('submit(HWHID-BT)', function () {//选择仓库
                layer.open({
@@ -759,12 +758,7 @@
            });

            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.location.href = "http://localhost:8082/LuBaoUi/views/index_Mobile.html"
                });
                parent.location.href = "../../../views/index.html"
            })

            //编辑
@@ -1411,7 +1405,7 @@
                                $.ajax({
                                    url: GetWEBURL() + '/OtherInStockBill/DisBillEntryList_Webs_New_Json1',
                                    type: "GET",
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: HBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    data: { HBillID: sInterID, HBillNo: sBillNo, HBillType: sBillType, sMouldManagerCtl: sMouldManagerCtl, sFIFOCtl: sFIFOCtl },
                                    success: function (result) {
                                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                                            listOption.data = result.data.list;

 WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_FastList.html

@@ -233,8 +233,16 @@

        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1204'

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_Fast.html

@@ -96,9 +96,9 @@
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HSourceBillNo" id="HSourceBillNo" lay-verify="HSourceBillNo" autocomplete="off" class="layui-input">
                                        </div>
                                        <div class="layui-col-xs2">
                                        <!--<div class="layui-col-xs2">
                                            <button type="button" lay-submit="" class="layui-btn" lay-filter="QueDin2">确定</button>
                                        </div>
                                        </div>-->
                                    </div>
                                </div>
                            </div>
@@ -421,6 +421,7 @@
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled", "true");
                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -759,12 +760,7 @@
            });

            form.on('submit(Cancel)', function () {
                //sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })

            ////删除

 WebTM/views/ÑéÊÕÈë¿â/²úÆ·Èë¿â/Kf_ProductInBill_FastList.html

@@ -310,8 +310,16 @@

            //撤销功能
            form.on('submit(cmdRescind)', function () {
                var checkStatus = table.checkStatus('yd-table')
                    , data = checkStatus.data;
                var checkStatus = table.checkStatus('yd-table');
                var checkStatus2 = table.checkStatus('sy-table');
                var data = "";
                if (checkStatus.data.length != 0) {
                    data = checkStatus.data;
                } else if (checkStatus2.data.length != 0) {
                    data = checkStatus2.data;
                } else {
                    return layer.msg("请选择一条数据");
                }
                var sInterID = data[0].HInterID
                var sBillNo = data[0].HBillNo
                var sBillType = '1202'

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_Fast.html

@@ -662,12 +662,7 @@

            //退出
            form.on('submit(Cancel)', function () {
                sessionStorage["SourceFlag"] = false;
                //parent.location.href = "../../../views/index.html"
                //window.close();//关闭当前页
                layer.confirm('您确定要退出吗？', { icon: 3, title: '提示' }, function (index) {
                    window.close();
                });
                parent.location.href = "../../../views/index.html"
            })
            //编辑
            form.on('submit(cmdModify)', function () {

 WebTM/views/ÑéÊÕÈë¿â/Í⹺Èë¿â/Kf_POStockInBill_FastList.html

@@ -209,8 +209,16 @@
        });
        //撤销功能
        form.on('submit(cmdRescind)', function () {
            var checkStatus = table.checkStatus('yd-table')
                , data = checkStatus.data;
            var checkStatus = table.checkStatus('yd-table');
            var checkStatus2 = table.checkStatus('sy-table');
            var data = "";
            if (checkStatus.data.length != 0) {
                data = checkStatus.data;
            } else if (checkStatus2.data.length != 0) {
                data = checkStatus2.data;
            } else {
                return layer.msg("请选择一条数据");
            }
            var sInterID = data[0].HInterID
            var sBillNo = data[0].HBillNo
            var sBillType = '1201'