直接调拨单扫码模块,增加源单出库申请单、生产用料通知单功能;生产领料单扫码模块,增加源单生产用料通知单功能
2个文件已修改
183 ■■■■ 已修改文件
WebTM/views/仓存管理/仓库调拨/Kf_MoveStockBill_Fast.html 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/领料发货/领料出库/Kf_MateOutBill_Fast.html 163 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
WebTM/views/²Ö´æ¹ÜÀí/²Ö¿âµ÷²¦/Kf_MoveStockBill_Fast.html
@@ -69,6 +69,8 @@
                                                <option value="1243">调拨申请单</option>
                                                <option value="3720">生产用料清单</option>
                                                <option value="1604">委外用料清单</option>
                                                <option value="1242">出库申请单</option>
                                                <option value="1214">生产发料通知单</option>
                                                <option value="-1">手工录入</option>
                                            </select>
                                            <!--<input type="text" name="cmbSourceType" id="cmbSourceType" lay-verify="cmbSourceType" autocomplete="off" class="layui-input">-->
@@ -510,6 +512,24 @@
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "1242") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1242");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '出库申请单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "1214") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1214");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产发料通知单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else {
                            $("#HBillType").empty();
                            $("#HBillType").val("-1");
WebTM/views/ÁìÁÏ·¢»õ/ÁìÁϳö¿â/Kf_MateOutBill_Fast.html
@@ -63,7 +63,8 @@
                                        </div>
                                        <div class="layui-col-xs8">
                                            <select name=" HBillType" id="HBillType">
                                                <option value="3720">生产任务单-投料</option>
                                                <option value="3720">生产用料清单</option>
                                                <option value="1214">生产发料通知单</option>
                                                <option value="-1">手工录入</option>
                                            </select>
                                        </div>
@@ -443,8 +444,37 @@
                        // console.log(d.data);
                        $("#HInterID").val(d.data[0].HInterID);
                        $("#HBillNo").val(d.data[0].HBillNo);
                        $("#HBillType").val(d.data[0].HSourceBillType);
                        $("#HBillType").val(d.data[0].HSourceBillType == null ? "3720" : d.data[0].HSourceBillType);
                        //获取源单类型、源单单号
                        if (d.data[0].HSourceBillType == "3720") {
                            $("#HBillType").empty();
                            $("#HBillType").val("3720");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产用料清单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else if (d.data[0].HSourceBillType == "1214") {
                            $("#HBillType").empty();
                            $("#HBillType").val("1214");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '生产发料通知单' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        else {
                            $("#HBillType").empty();
                            $("#HBillType").val("-1");
                            var optionHtml = '';
                            optionHtml += "<option value = '" + d.data[0].HSourceBillType + "' >" + '手工录入' + "</option>";
                            $("#HBillType").append(optionHtml);
                            layui.form.render('select');
                            $("#HBillType").attr("readonly", "readonly");
                        }
                        $("#HSourceBillNo").val(d.data[0].HSourceBillNo);
                        $("#HSourceBillNo").attr("disabled", "true");
                        HSourceFlag = true;
                        //$("#HWHID").val(d.data[0].HWhID);
@@ -518,7 +548,23 @@
            }
            //选择仓库(事件)
            form.on('submit(HWHID-BT)', function () {
            //form.on('submit(HWHID-BT)', function () {
            //    layer.open({
            //        type: 2
            //        , area: ['100%', '100%']
            //        , title: '仓库列表'
            //        , shade: 0.6 //遮罩透明度
            //        , maxmin: true //允许全屏最小化
            //        , anim: 0 //0-6的动画形式,-1不开启
            //        , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes']
            //        , resize: false
            //        , cancel: function () {
            //            //$(".layui-btn").removeClass("layui-btn-disabled");
            //        }
            //    })
            //});
            form.on('submit(HWHID-BT)', function () {//选择仓库
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
@@ -526,7 +572,40 @@
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HWHID', 'yes']
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
                    , resize: false
                    , cancel: function () {
                    }
                })
            });
            ////选择仓库(事件)
            //form.on('submit(HFIFOWHID-BT)', function () {
            //    layer.open({
            //        type: 2
            //        , area: ['100%', '100%']
            //        , title: '仓库列表'
            //        , shade: 0.6 //遮罩透明度
            //        , maxmin: true //允许全屏最小化
            //        , anim: 0 //0-6的动画形式,-1不开启
            //        , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
            //        , resize: false
            //        , cancel: function () {
            //            //$(".layui-btn").removeClass("layui-btn-disabled");
            //        }
            //    })
            //});
            //选择先进先出仓库
            form.on('submit(HFIFOWHID-BT)', function () {//选择调出仓库
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseListNew.html?Type=HFIFOWHID&HOrgID=' + sessionStorage["OrganizationID"] + '', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
@@ -534,22 +613,6 @@
                })
            });
            //选择仓库(事件)
            form.on('submit(HFIFOWHID-BT)', function () {
                layer.open({
                    type: 2
                    , area: ['100%', '100%']
                    , title: '仓库列表'
                    , shade: 0.6 //遮罩透明度
                    , maxmin: true //允许全屏最小化
                    , anim: 0 //0-6的动画形式,-1不开启
                    , content: ['../../../views/Baseset/基础资料/Gy_WarehouseList.html?Type=HFIFOWHID', 'yes']
                    , resize: false
                    , cancel: function () {
                        //$(".layui-btn").removeClass("layui-btn-disabled");
                    }
                })
            });
            //选择仓位(事件)
            form.on('submit(HSpID-BT)', function () {
                layer.open({
@@ -959,10 +1022,13 @@
                    }
                }
                $.ajax({
                    url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                    url: GetWEBURL() + "/WEBSController/Get_BarCode_Json",
                    type: "GET",
                    //data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
                    data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    data: { "sBarCode": sBarCode, "HInterID": sInterID, "HBillType": sBillType, "HBillNo": sBillNo, "HMaker": sessionStorage["HUserName"], "HWhID": sHWHID, "HSPID": sHSPID, "HQty": sQty, "HRedBlueFlag": false, "SourceFlag": HSourceFlag, "HSourceBillNo": sSourceBillNo, "HSourceBillType": sHBillType, "HStockOrgID": sessionStorage["OrganizationID"], "HScanStyle": "", "HCustom1": "", "HCustom2": "" },
                    //url: GetWEBURL() + "/MateOutBill/get_CheckTypeByBarCode_Json",
                    //type: "GET",
                    ////data: { "sCode": '1001456360', "sInterID": 122554, "HBillType": '1204', "sBillNo": 'MATO00000055', "sMaker": sessionStorage["HUserName"], "WhID": 484080, "SPID": 0, "sQty": 0, "sRedBlue": false, "SourceFlag": sessionStorage["SourceFlag"], "sSourceBillNo": 'PPBOM202112226', "sSourceType": '3720', "HOWNERID": sessionStorage["OrganizationID"] },
                    //data: { "sCode": sBarCode, "sInterID": sInterID, "HBillType": sBillType, "sBillNo": sBillNo, "sMaker": sessionStorage["HUserName"], "WhID": sHWHID, "SPID": sHSPID, "sQty": sQty, "sRedBlue": false, "SourceFlag": HSourceFlag, "sSourceBillNo": sSourceBillNo, "sSourceType": sHBillType, "HOWNERID": sessionStorage["OrganizationID"] },
                    success: function (result) {
                        if (result.count == 1) {
                            if (result.data.HBarType == '仓库条码') {
@@ -992,10 +1058,10 @@
                                $("#HDeptName").val(result.data.HDeptName);
                                $("#HDeptID").val(result.data.HDeptID);
                                $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                $("#HBillType").val(result.data.hSourceBillTypeField)
                                HSourceFlag = true;
                                //获取源单类型、源单单号
                                if (result.data.HSourceBillType == "3720") {
                                $("#HBillType").val(result.data.hSourceBillTypeField == null ? "3720" : result.data.hSourceBillTypeField);
                                if (result.data.hSourceBillTypeField == "3720") {
                                    $("#HBillType").empty();
                                    $("#HBillType").val("3720");
                                    var optionHtml = '';
@@ -1003,11 +1069,26 @@
                                    $("#HBillType").append(optionHtml);
                                    layui.form.render('select');
                                    $("#HBillType").attr("readonly", "readonly");
                                }
                                else if (result.data.hSourceBillTypeField == "1214") {
                                    $("#HBillType").empty();
                                    $("#HBillType").val("1214");
                                    var optionHtml = '';
                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产发料通知单' + "</option>";
                                    $("#HBillType").append(optionHtml);
                                    layui.form.render('select');
                                    $("#HBillType").attr("readonly", "readonly");
                                }
                                else {
                                    $("#HBillType").val("手工录入");
                                    //$("#HBillType").empty();
                                    $("#HBillType").val("-1");
                                    var optionHtml = '';
                                    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '手工录入' + "</option>";
                                    $("#HBillType").append(optionHtml);
                                    layui.form.render('select');
                                    $("#HBillType").attr("readonly", "readonly");
                                }
                                $("#HSourceBillNo").attr("readonly", "readonly");
                                $("#HNote").val(";一键扫码源单条码");
                                element.tabChange('tab-Kf_MateOutBill', '3');
                            }
@@ -1018,22 +1099,22 @@
                                else {
                                    //$("#HSupName").val(result.data.HSupName);
                                    //$("#HSupID").val(result.data.HSupID);
                                    $("#HDeptName").val(result.data.HDept);
                                    $("#HDeptID").val(result.data.HDeptID);
                                    $("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    $("#HBillType").val(result.data.hSourceBillTypeField)
                                    //$("#HDeptName").val(result.data.HDept);
                                    //$("#HDeptID").val(result.data.HDeptID);
                                    //$("#HSourceBillNo").val(result.data.hSourceBillNoField);
                                    //$("#HBillType").val(result.data.hSourceBillTypeField)
                                    HSourceFlag = true;
                                    //获取源单类型、源单单号
                                    if (result.data.HSourceBillType == "3720") {
                                        ("#HBillType").empty();
                                        $("#HBillType").val("3720");
                                        var optionHtml = '';
                                        optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产用料清单' + "</option>";
                                        $("#HBillType").append(optionHtml);
                                        layui.form.render('select');
                                        $("#HBillType").attr("readonly", "readonly");
                                    ////获取源单类型、源单单号
                                    //if (result.data.HSourceBillType == "3720") {
                                    //    ("#HBillType").empty();
                                    //    $("#HBillType").val("3720");
                                    //    var optionHtml = '';
                                    //    optionHtml += "<option value = '" + result.data.hSourceBillTypeField + "' >" + '生产用料清单' + "</option>";
                                    //    $("#HBillType").append(optionHtml);
                                    //    layui.form.render('select');
                                    //    $("#HBillType").attr("readonly", "readonly");
                                    }
                                    //}
                                    //else if (result.data.HSourceBillType == "1601") {
                                    //    $("#HBillType").val("1601");
                                    //}