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

@@ -9,7 +9,7 @@
    <link rel="stylesheet" href="../../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../../layuiadmin/style/admin.css" media="all">
    <style>
        

        .layui-col-xs8 {
            width: 55.666667%;
        }
@@ -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>
@@ -231,20 +231,20 @@
                            <!--物料清单-->
                            <div class="layui-tab-item">
                                <div class="layui-form-item" style="padding:0px;margin:0px">
            <div class="layui-row">
                <div class="layui-col-xs4">
                    <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                </div>
                <div class="layui-col-xs8">
                    <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                </div>
            </div>
        </div>
                                    <div class="layui-row">
                                        <div class="layui-col-xs4">
                                            <label class="layui-form-label" style="width:40px;padding-left:0px;">条码</label>
                                        </div>
                                        <div class="layui-col-xs8">
                                            <input type="text" name="HBarCode" id="HBarCode" lay-verify="HBarCode" autocomplete="off" class="layui-input">
                                        </div>
                                    </div>
                                </div>

                                <table class="layui-hide" id="wl-table" lay-filter="wl-table"></table>
                            </div>
                            <!--明细清单-->
                           

                            <div class="layui-tab-item">
                                <table class="layui-hide" id="mx-table" lay-filter="mx-table"></table>
                            </div>
@@ -328,11 +328,11 @@
            index: 'lib/index' //主入口模块
        }).use(['index', 'form', 'laydate', 'table', 'element'], function () {
            var $ = layui.$
            , admin = layui.admin
            , layer = layui.layer
            , table = layui.table
            , form = layui.form
            , element = layui.element;
                , admin = layui.admin
                , layer = layui.layer
                , table = layui.table
                , form = layui.form
                , element = layui.element;



@@ -346,7 +346,7 @@
                , page: true
                , cellMinWidth: 90
                , cols: [[
                    { field: '在库状态', title: '在库状态',width:180 }
                    { field: '在库状态', title: '在库状态', width: 180 }
                    , { field: '物料名称', title: '物料名称' }
                    , { field: '批次', title: '批次' }
                    , { field: '数量', title: '数量' }
@@ -443,10 +443,10 @@
            var params = getUrlVars();
            var linterid = params[params[0]]; //从参数中获取 å•æ®å†…码
            var lSourceBillType = params[params[2]];  //从单据获取 æºå•ç±»åž‹
        
            

            function  RoadBillMain(linterid)//加载表头


            function RoadBillMain(linterid)//加载表头
            {
                $.ajax({
                    url: GetWEBURL() + "/Web/GetPonderationBill",
@@ -462,7 +462,7 @@
                        HSourceFlag = true;
                        $("#HDeptID").val(result.data[0].HDeptID);
                        $("#HDeptName").val(result.data[0].HDeptName);
                      

                        //$("#HWHID").val(d.data[0].HWhID);
                        //$("#HStockPlaceID").val(d.data[0].HSPID);
                        //$("#HKeeperID").val(d.data[0].HKeeperID);
@@ -570,22 +570,22 @@
                //    }
                //});
            }
             

            //动态加载源单类型列表 new

            

            

            




            //判断是否新增
            if (linterid == null || linterid == 0) {
                //获取最大单据号 new
                $("#HInterID").val("");
                $("#HBillNo").val(""); 
                $("#HBillNo").val("");
                $.ajax({
                    url: GetWEBURL() + "/Web/GetMAXNumPDA",
                    url: GetWEBURL() + "/Web/GetMAXNum",
                    type: "GET",
                    data: { "HBillType": '1205' },
                    success: function (d) {
@@ -596,13 +596,12 @@
                        //$("#HBillNo").val('421458026');
                        set_InitGrid();
                    }
                }); 
                });
            }
            else {//如果修改则走下面 new-----不会走
                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"
            })

            //编辑
@@ -882,7 +876,7 @@
                //       success: function (data) {
                //           if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                //               table.render({
                //                   elem: '#wl-table' 
                //                   elem: '#wl-table'
                //                   , url: GetWEBURL() + '/SellOut/DisBillEntryList_Webs_Json'
                //                   , cellMinWidth: 80
                //                   , toolbar: '#toolbarDemo'
@@ -943,43 +937,43 @@
                    } else {
                        Saver(sMainStr);
                    }
                    

                }
            });
            //提交方法调用的ajax
            function Saver(sMainStr) {
                layer.load(1);
                $.ajax(
                {
                    type: "POST",
                    // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //方法所在页面和方法名
                    url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
                    async: true,
                    data: { "oMain": sMainStr },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                            layer.confirm(data.Message , {
                                icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                btn2: function () {
                                    //parent.layui.admin.events.closeThisTabs();关闭页签
                                    //window.close();//关闭页面，浏览器有效，PDA无效
                                    parent.location.href = "../../../views/index.html";
                                }//关闭
                            }, function () {
                                //sessionStorage["SourceFlag"] = false;
                                window.location.reload();
                            });//新增
                    {
                        type: "POST",
                        // url: "http://61.130.49.162:9090/WMSAPI///SellOut/set_SaveSellOutBill_Json", //方法所在页面和方法名
                        url: GetWEBURL() + "/SellOut/set_SaveSellOutBill_Json",
                        async: true,
                        data: { "oMain": sMainStr },
                        dataType: "json",
                        success: function (data) {
                            if (data.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†
                                layer.confirm(data.Message, {
                                    icon: 1, skin: 'layui-layer-lan', title: "温馨提示", closeBtn: 0, btn: ['新增'],
                                    btn2: function () {
                                        //parent.layui.admin.events.closeThisTabs();关闭页签
                                        //window.close();//关闭页面，浏览器有效，PDA无效
                                        parent.location.href = "../../../views/index.html";
                                    }//关闭
                                }, function () {
                                    //sessionStorage["SourceFlag"] = false;
                                    window.location.reload();
                                });//新增
                            }
                            else {
                                layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            }
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        else {
                            layer.msg(data.Message, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        layer.msg("接口请求失败！" + err, { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                    }
                });
                    });
            }

            //监听提交
@@ -1004,7 +998,7 @@
            form.on('submit(QueDin)', function (data) {
                GetMeesageByBarCode();
            });
            


            $('#HStockPlaceName').on('keydown', function (event) {      //扫仓位
                var HBarCode = $('#HStockPlaceName').val()
@@ -1107,7 +1101,7 @@
            //});

            //扫源单
            $('#HSourceBillNo').on('keydown', function (event) {    
            $('#HSourceBillNo').on('keydown', function (event) {
                if (event.keyCode == 13) {
                    GetMeesageBySourceBillNo();
                }
@@ -1123,13 +1117,13 @@
                // , url: 'http://localhost:8083/Web/SellOut/GetHBarCodeShowBillSub'
                //, toolbar: '#toolbarDemo'
                // , where: { sMsg: linterid, sMsg2: lentryid }
             , cols: [[
               , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
             ]]
             , page: true
             , height: 500
             , done: function () {
             }
                , cols: [[
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                ]]
                , page: true
                , height: 500
                , done: function () {
                }
            });

            //扫源单查货
@@ -1182,7 +1176,7 @@
                    }
                });
            }
         

            //扫条码
            function GetMeesageByBarCode(obj) {  //返回工作中心
                var sOldBarCode = $('#HBarCode').val()
@@ -1238,10 +1232,10 @@
                            }
                        });
                }
                else if (HScanStyle =="整托删除") {
                else if (HScanStyle == "整托删除") {
                    var HBarCode = $('#HBarCode').val();
                    var HInterID = $('#HInterID').val();
                    if (HBarCode=="") {
                    if (HBarCode == "") {
                        layer.msg("整托删除条码不能为空", { icon: 5, btn: ['确认'], time: 100000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return;
                    }
@@ -1305,7 +1299,7 @@
                    $.ajax({
                        url: GetWEBURL() + "/SellOut/get_CheckTypeByBarCode_Json",
                        type: "GET",
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle},
                        data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sMaker, "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"], "HScanStyle": HScanStyle },
                        success: function (result) {
                            playSound1();
                            if (result.count == 1) {
@@ -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;
@@ -1477,17 +1471,17 @@
                , totalRow: true
                , cols: [[
                    { type: 'radio' }
                  , { field: 'HSNO', title: '序号', width: 60 }
                  , { field: 'HQty', title: '数量', width: 80, totalRow: true }
                  , { field: 'HAuxQty', title: '辅助数量', width: 80, totalRow: true }
                  , { field: 'HQtyMust', title: '应发数量', width: 80 }
                  , { field: 'HMaterName', title: '物料名称', width: 90 }
                  , { field: 'HMaterNumber', title: '物料代码', width: 90 }
                  , { field: 'HMaterModel', title: '规格型号', width: 90 }
                  , { field: 'HSourceInterID', title: '源单主内码', width: 90 }
                  , { field: 'HSourceEntryID', title: '源单子内码', width: 90 }
                  , { field: 'HSourceBillNo', title: '源单单号', width: 90 }
                  , { field: 'HBatchNo', title: '批次', width: 90 }
                    , { field: 'HSNO', title: '序号', width: 60 }
                    , { field: 'HQty', title: '数量', width: 80, totalRow: true }
                    , { field: 'HAuxQty', title: '辅助数量', width: 80, totalRow: true }
                    , { field: 'HQtyMust', title: '应发数量', width: 80 }
                    , { field: 'HMaterName', title: '物料名称', width: 90 }
                    , { field: 'HMaterNumber', title: '物料代码', width: 90 }
                    , { field: 'HMaterModel', title: '规格型号', width: 90 }
                    , { field: 'HSourceInterID', title: '源单主内码', width: 90 }
                    , { field: 'HSourceEntryID', title: '源单子内码', width: 90 }
                    , { field: 'HSourceBillNo', title: '源单单号', width: 90 }
                    , { field: 'HBatchNo', title: '批次', width: 90 }
                ]]
                , height: 500
                , done: function () {
@@ -1537,7 +1531,7 @@
                audio.play();
            }
            //扫源单
            function GetMeesageBySourceBillNo(obj) { 
            function GetMeesageBySourceBillNo(obj) {
                var HSourceBillNo = $('#HSourceBillNo').val()
                var sInterID = $("#HInterID").val()
                var sBillNo = $("#HBillNo").val()
@@ -1553,7 +1547,7 @@
                $.ajax({
                    url: GetWEBURL() + "/SellOut/set_SavePonderationBillMain_Temp_Source_Fast_Json",
                    type: "GET",
                    data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205',"HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    data: { sInterID: sInterID, sBillNo: sBillNo, HBillType: '1205', "HSourceBillType": HSourceBillType, "HSourceBillNo": HSourceBillNo, "sInterID": sInterID, "sBillNo": sBillNo },
                    success: function (result) {
                        if (result.count == 1) { // è¯´æ˜ŽéªŒè¯æˆåŠŸäº†ï¼Œ
                            //GetSellOutFindSP();
@@ -1628,7 +1622,7 @@
                    }
                });
            }
        

        });



 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'