不同订单类型不能合并下推送货单；设置默认打印模板；一键打印

yusijie

2024-09-24 b28c9a27dfefb67600192dcd587efdf0cf64cc98

不同订单类型不能合并下推送货单；设置默认打印模板；一键打印

 WebSRM/layuiAdmin.std-v1.2.1/src/views/Baseset/SRM_OpenTmpList.html

@@ -20,6 +20,7 @@
                            <div class="layui-btn-group">
                                <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Add">新增</button>-->
                                <!--<button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Del">删除</button>-->
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Default">默认模板</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Reload">刷新</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Select">选择</button>
                                <button type="button" class="layui-btn layui-btn-normal" lay-submit="" lay-filter="Exit">退出</button>
@@ -267,13 +268,39 @@
                var index = parent.layer.getFrameIndex(window.name);
                parent.layer.close(index);
            });

            form.on('submit(Default)', function (data) {//设置默认模板
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var OpenTmp = data[0].模板名称;
                if (checkStatus.data.length == 1) {
                    $.ajax({
                        type: "get",
                        url: GetWEBURL() + "/Open_PrintTem/DefaultOpenTmp",
                        async: true,
                        data: { "HNumber": Type, "HName": OpenTmp },
                        //data: { "Value": Value },
                        success: function (result) {
                            if (result.count == 1) {
                                layer.msg('设置默认模板成功!', { icon: 6, time: 2000 });
                            } else {
                                layer.msg('设置默认模板失败!', { icon: 5, time: 2000 });
                            }
                        },
                        error: function (result) {
                            console.log(result);
                            //layer.msg('出现异常', { icon: 2, time: 2000 });
                        }
                    });
                } else {
                    layer.msg('请选择一行数据打印！');
                };
            });

            form.on('submit(Exit)', function (data) {//退出
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
            });




        });
    </script>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBill.html

@@ -25,7 +25,11 @@
                                <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverPZ">生成品种码</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverWY">生成唯一码</button>-->
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="HBarcodeSaverBox" id="HBarcodeSaverBox">生成内外箱条码</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">条码打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">内外箱条码打印</button>
                                <!--<button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_nx">内箱条码打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_wx">外箱条码打印</button>-->
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_NX_Convenient">内箱条码打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="set_Print_WX_Convenient">外箱条码打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>

                            </div>
@@ -458,6 +462,10 @@
                        layer.msg("明细记录第" + (i + 1) + "行,生产日期不能为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    if (_sSubStr[i].HBatchManager == "是" && _sSubStr[i].HBatchNo == "") {
                        layer.msg("明细记录第" + (i + 1) + "行,物料启用批次管理，批次为空，请填写批次信息!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        return Result = false;
                    }
                    //获取下标
                    index = findIndex(_sSubStr[i].HMaterNumber, _sSubStr[i].HMaterModel, newArray);
                    if (index === -1 || _sSubStr[i].HIsSplit == 0) {
@@ -579,7 +587,9 @@
                    });
                return false;
            });
            form.on('submit(Print)', function (data) {//打印

            //内外箱打印
            form.on('submit(Print)', function (data) {
                var data1 = layui.table.cache["subTable"]
                    , data2 = layui.table.cache["subTable2"];
                var rows = '';
@@ -591,6 +601,58 @@
                for (var i = 0; i < data1.length; i++) {
                    rows += data1[i].HItemID.toString() + ',';
                    rows2 += data1[i].HBarCode.toString() + ',';
                }
                for (var j = 0; j < data2.length; j++) {
                    rows += data2[j].HItemID.toString() + ',';
                    rows2 += data2[j].HBarCode.toString() + ',';
                }
                rows = rows.substring(rows.length - 1, 0);
                rows2 = rows2.substring(rows2.length - 1, 0);
                if (rows == "") {
                    layer.msg("没有需要打印的数据！")
                    return;
                }
                else {
                    var url = "linteridSession";
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
                    sessionStorage["linterid"] = rows.toString();
                    layer.open({
                        type: 2
                        , area: ['80%', '80%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                        , resize: false
                        //, cancel: function () {
                        //    $(".layui-btn").removeClass("layui-btn-disabled");
                        //}
                    })
                }
            });

            //内箱打印
            form.on('submit(Print_nx)', function (data) {
                var data2 = layui.table.cache["subTable2"];//内箱条码

                var rows = '';
                var rows2 = '';
                if (data2 == undefined) {
                    layer.msg("请先生成内箱条码！")
                    return;
                }
                for (var j = 0; j < data2.length; j++) {
                    rows += data2[j].HItemID.toString() + ',';
@@ -633,6 +695,176 @@
                    })
                }
            });

             //外箱打印
            form.on('submit(Print_wx)', function (data) {
                var data1 = layui.table.cache["subTable"]//外箱条码
                var rows = '';
                var rows2 = '';
                if (data1 == undefined) {
                    layer.msg("请先生成外箱条码！")
                    return;
                }
                for (var i = 0; i < data1.length; i++) {
                    rows += data1[i].HItemID.toString() + ',';
                    rows2 += data1[i].HBarCode.toString() + ',';
                }
               
                rows = rows.substring(rows.length - 1, 0);
                rows2 = rows2.substring(rows2.length - 1, 0);
                if (rows == "") {
                    layer.msg("没有需要打印的数据！")
                    return;
                }
                else {
                    var url = "linteridSession";
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
                    sessionStorage["linterid"] = rows.toString();

                    layer.open({
                        type: 2
                        , area: ['50%', '50%']
                        , title: '打印模版选择'
                        , shade: 0.6 //遮罩透明度
                        , maxmin: false //允许全屏最小化
                        , anim: 0 //0-6的动画形式，-1不开启
                        , content: ['../../views/BaseSet/SRM_OpenTmpList.html?linterid=' + sessionStorage["linterid"] + '&HBarcode=&Type=SRM_POOrderBillList', 'yes']
                        , resize: false
                        //, cancel: function () {
                        //    $(".layui-btn").removeClass("layui-btn-disabled");
                        //}
                    })
                }
            });

            //一键打印内箱
            form.on('submit(set_Print_NX_Convenient)', function (data) {
                var data2 = layui.table.cache["subTable2"];//内箱条码

                var rows = '';
                var rows2 = '';
                if (data2 == undefined) {
                    layer.msg("请先生成内箱条码！")
                    return;
                }
                for (var j = 0; j < data2.length; j++) {
                    rows += data2[j].HItemID.toString() + ',';
                    rows2 += data2[j].HBarCode.toString() + ',';
                }
                rows = rows.substring(rows.length - 1, 0);
                rows2 = rows2.substring(rows2.length - 1, 0);
                if (rows == "") {
                    layer.msg("没有需要打印的数据！")
                    return;
                }
                else {
                    var url = "linteridSession";
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
                    sessionStorage["linterid"] = rows.toString();

                    $.ajax({
                        type: "get",
                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                        async: true,
                        data: { "HNumber": 'SRM_POOrderBillList' },
                        //data: { "Value": Value },
                        success: function (result) {
                            if (result.count == 1) {
                                var OpenTmp = result.data[0].模板名称
                                window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
                            } else {
                                layer.msg(result.Message);
                            }
                        },
                        error: function (result) {
                            console.log(result);
                        }
                    });
                }
            });
            
            //一键打印外箱
            form.on('submit(set_Print_WX_Convenient)', function (data) {
                var data1 = layui.table.cache["subTable"]//外箱条码
                var rows = '';
                var rows2 = '';
                if (data1 == undefined) {
                    layer.msg("请先生成外箱条码！")
                    return;
                }
                for (var i = 0; i < data1.length; i++) {
                    rows += data1[i].HItemID.toString() + ',';
                    rows2 += data1[i].HBarCode.toString() + ',';
                }

                rows = rows.substring(rows.length - 1, 0);
                rows2 = rows2.substring(rows2.length - 1, 0);
                if (rows == "") {
                    layer.msg("没有需要打印的数据！")
                    return;
                }
                else {
                    var url = "linteridSession";
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
                    sessionStorage["linterid"] = rows.toString();

                    $.ajax({
                        type: "get",
                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                        async: true,
                        data: { "HNumber": 'SRM_POOrderBillList' },
                        //data: { "Value": Value },
                        success: function (result) {
                            if (result.count == 1) {
                                var OpenTmp = result.data[0].模板名称
                                window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
                            } else {
                                layer.msg(result.Message);
                            }
                        },
                        error: function (result) {
                            console.log(result);
                        }
                    });
                }
            });

            form.on('submit(Exit)', function (data) {//退出
                var index = parent.layer.getFrameIndex(window.name); //先得到当前iframe层的索引
                parent.layer.close(index); //再执行关闭
@@ -647,6 +879,7 @@
                    //}
                }
            });
            //进入页面查询表体物料信息
            layer.load(3)
            table.render({
                elem: '#mainTable'
@@ -658,16 +891,16 @@
                    { type: 'checkbox', fixed: 'left' }
                    , { field: 'HMaterID', title: '物料ID', width: 100, hide: true }
                    , { field: 'HMaterNumber', title: '物料编码', width: 120 }
                    , { field: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true  }
                    , { field: 'HOldMaterNumber', title: '旧物料编码', width: 120, hide: true }
                    , { field: 'HMaterShortNumber', title: '物料代码', width: 120, hide: true }
                    , { field: 'HSubjoin', title: '物料代码', width: 120, hide: true  }
                    , { field: 'HSubjoin', title: '物料代码', width: 120, hide: true }
                    , { field: 'HMaterName', title: '物料名称', width: 120 }
                    , { field: 'HMaterModel', title: '规格型号', width: 120 }
                    , { field: 'HUnitName', title: '计量单位', width: 100 }
                    , { field: 'HUnitNumber', title: '计量单位代码', width: 100, hide: true }
                    , { field: 'HUnitID', title: '计量单位ID', width: 100, hide: true }
                    , { field: 'HDDQty', title: '订单数量', width: 100 }
                    , { field: 'HMrbQty', title: '退料数量', width: 100, hide: true}
                    , { field: 'HMrbQty', title: '退料数量', width: 100, hide: true }
                    , { field: 'HBarcodeCount', title: '已生成条码数量', width: 135 }
                    , { field: 'HNotBarcodeCount', title: '可生成条码数量', width: 135 }
                    , { field: 'HQty', title: '本次生成条码数量', width: 135, edit: 'text', event: "inputHQty" }
@@ -679,6 +912,7 @@
                    , { field: 'HMoney', title: '金额', width: 100, hide: true }
                    , { field: 'HMTONO', title: '计划跟踪单号', width: 100, hide: true }
                    , { field: 'HBatchNo', title: '批号', width: 100, edit: 'text' }
                    , { field: 'HBatchManager', title: '启用批号', width: 100, hide: true }
                    , { field: 'HISKFPERIOD', title: '是否启用保质期', width: 100, edit: 'text', hide: true }
                    , { field: 'HEXPUNIT', title: '保质期单位', width: 100, edit: 'text', hide: true }
                    , { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }//, event: "chooseHKFDate"

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_BarCodeBillList.html

@@ -120,6 +120,7 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>-->
                              <button type="button" class="layui-btn layui-btn-sm" id="btn_HideColumn" lay-event="btn-HideColumn"><i class="layui-icon layui-icon-return"></i>隐藏列设置</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>条码打印</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>一键打印</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
                        </div>
@@ -308,7 +309,7 @@
                            sessionStorage["linterid"] = rows.toString();
                            layer.open({
                                type: 2
                                , area: ['50%', '50%']
                                , area: ['80%', '80%']
                                , title: '打印模版选择'
                                , shade: 0.6 //遮罩透明度
                                , maxmin: false //允许全屏最小化
@@ -317,6 +318,9 @@
                                , resize: false
                            })
                        }
                        break;
                    case 'btn-print-Convenient':
                        convenientPrint();
                        break;
                    case 'btn-Delete':
                        var checkStatus = table.checkStatus('mainTable')
@@ -511,6 +515,58 @@
                active[type] ? active[type].call(this) : '';
            });

            //一键打印
            function convenientPrint() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                var rows = '';
                var rows2 = '';
                for (var i = 0; i < data.length; i++) {
                    rows += data[i].HItemID.toString() + ',';
                    rows2 += data[i].条码编号.toString() + ',';
                }
                rows = rows.substring(rows.length - 1, 0);
                rows2 = rows2.substring(rows2.length - 1, 0);
                if (rows == "") {
                    layer.msg("至少选择一行记录！")
                }
                else {
                    var url = "linteridSession";
                    $.ajax({
                        type: "POST",
                        url: GetWEBURL() + url, //方法所在页面和方法名
                        async: true,
                        data: { "linterid": rows.toString(), "HUserName": sessionStorage["HUserName"] },
                        dataType: "json",
                        success: function (data) {
                            layer.closeAll("loading");
                        },
                        error: function (err) {
                            layer.alert("错误:" + err, { icon: 5 });
                        }
                    });
                    sessionStorage["linterid"] = rows.toString();
                    $.ajax({
                        type: "get",
                        url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                        async: true,
                        data: { "HNumber": 'SRM_POOrderBillList' },
                        //data: { "Value": Value },
                        success: function (result) {
                            if (result.count == 1) {
                                var OpenTmp = result.data[0].模板名称
                                window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + sessionStorage["linterid"].toString() + "&Type=SRM_POOrderBillList" + "&OpenTmp=" + OpenTmp.toString());
                            } else {
                                layer.msg(result.Message);
                            }
                        },
                        error: function (result) {
                            console.log(result);
                        }
                    });
                }
            }

            //隐藏列设置
            function get_HideColumn() {
                var colName = "";

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBillList.html

@@ -138,6 +138,7 @@
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-details"><i class="layui-icon layui-icon-form"></i>详情</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-changebg"><i class="layui-icon layui-icon-form"></i>变更</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print"><i class="layui-icon layui-icon-print"></i>打印送货单</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-print-Convenient"><i class="layui-icon layui-icon-print"></i>一键打印</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-Delete"><i class="layui-icon layui-icon-delete"></i>删除</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-generate"><i class="layui-icon layui-icon-file"></i>生成条码</button>
                            <button type="button" class="layui-btn layui-btn-sm" lay-event="btn-exit"><i class="layui-icon layui-icon-return"></i>退出</button>
@@ -690,7 +691,7 @@
                        //}
                        layer.open({
                            type: 2
                            , area: ['50%', '50%']
                            , area: ['80%', '80%']
                            , title: '打印模版选择'
                            , shade: 0.6 //遮罩透明度
                            , maxmin: false //允许全屏最小化
@@ -702,6 +703,9 @@
                            //}
                        })

                        break;
                    case 'btn-print-Convenient':
                        convenientPrint();
                        break;
                    case 'btn-generate':
                        var checkStatus = table.checkStatus('mainTable')
@@ -752,6 +756,40 @@
                    }
                });
            });

            //一键打印
            function convenientPrint() {
                var checkStatus = table.checkStatus('mainTable')
                    , data = checkStatus.data;
                if (data.length != 1) {
                    layer.msg("请选择一条数据", { icon: 5 });
                    return;
                }
                if (data[0].单据状态 != '已审核') {
                    layer.msg("请审核送货单后在进行打印( ´◔︎ ‸◔︎`)", { icon: 5 });
                    return;
                }

                $.ajax({
                    type: "get",
                    url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                    async: true,
                    data: { "HNumber": 'SRM_POInStockBillList' },
                    //data: { "Value": Value },
                    success: function (result) {
                        if (result.count == 1) {
                            var OpenTmp = result.data[0].模板名称
                            window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data[0].hmainid.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
                        } else {
                            layer.msg(result.Message);
                        }
                    },
                    error: function (result) {
                        console.log(result);
                    }
                });
            }

        });
    </script>
</body>

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POInStockBill_Edit.html

@@ -27,6 +27,7 @@
                                <button type="button" id="add-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Saver">保存</button>
                                <button type="button" id="aduit-btn" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Aduit">审核</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print">打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Print_Convenient">一键打印</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="ChooseSource">选源单</button>
                                <button type="button" class="layui-btn layui-btn-normal layui-btn-radius" lay-submit="" lay-filter="Exit">退出</button>
                            </div>
@@ -349,13 +350,15 @@
                    , { field: 'HRQty', title: '剩余可发货数量', width: 100 }
                    , { field: 'HSQty', title: '源单数量', width: 100 }
                    , { field: 'HBatchNo', title: '批号', width: 120, edit: 'text' }
                    , { field: 'HBatchManager', title: '启用批次管理', width: 120, hide: true }
                    , { field: 'HOrderType', title: '订单类型', width: 120, hide: true }
                    , { field: 'HKFDate', title: '生产日期', align: 'center', width: 150, data_field: 'HKFDate', event: "chooseHKFDate" }
                    , { field: 'HKFPeriod', title: '保质期', width: 100, hide: true }
                    , { field: 'HDate', title: '预计到货日期', align: 'center', width: 150, data_field: 'HDate', event: "chooseHDate", hide: true }
                    , { field: 'HPrice', title: '单价', width: 100, hide: true }
                    , { field: 'HMoney', title: '金额', width: 100, hide: true }
                    , { field: 'HRemark', title: '备注', width: 200, edit: true }
                    , { field: 'HTAXPRICE_T', title: '含税重量单价/吨', width: 200, edit: true, hide: true}                    
                    , { field: 'HTAXPRICE_T', title: '含税重量单价/吨', width: 200, edit: true, hide: true }
                    //, { field: 'HRemark', title: '备注', width: 100 }
                    , { field: 'HPOOrderInterID', title: '采购订单主内码', width: 150, hide: true }
                    , { field: 'HPOOrderEntryID', title: '采购订单子内码', width: 150, hide: true }
@@ -741,6 +744,50 @@
                    });
            });

            //一键打印
            form.on('submit(Print_Convenient)', function (data) {
                if (HIsAduit == false) {
                    layer.msg("请审核送货单后在进行打印( ´◔︎ ‸◔︎`)", { icon: 5 });
                    return;
                }
                $.ajax({
                    type: "GET",
                    url: GetWEBURL() + "/GetHinterID", //方法所在页面和方法名
                    async: true,
                    data: { "HBillNo": $("#HBillNo").val() },
                    dataType: "json",
                    success: function (data) {
                        if (data.count == 1) { // 说明验证成功了，
                            $.ajax({
                                type: "get",
                                url: GetWEBURL() + "/Open_PrintTem/GetDefaultOpenTmp_Json",
                                async: true,
                                data: { "HNumber": 'SRM_POInStockBillList' },
                                //data: { "Value": Value },
                                success: function (result) {
                                    if (result.count == 1) {
                                        var OpenTmp = result.data[0].模板名称
                                        window.open("../../views/SRM/HBarPlanPrint.html?linterid=" + data.data.toString() + "&Type=SRM_POInStockBillList" + "&OpenTmp=" + OpenTmp.toString());
                                    } else {
                                        layer.msg(result.Message);
                                    }
                                },
                                error: function (result) {
                                    console.log(result);
                                }
                            });
                        }
                        else {
                            f_alert(data.Message);
                        }
                        layer.closeAll("loading");
                    },
                    error: function (err) {
                        f_alert("错误:" + err);
                    }
                });
            });           

            form.on('submit(ChooseSource)', function (data) {
                layer.open({
                    type: 2
@@ -825,10 +872,10 @@
                        //    layer.msg("明细记录第" + (i + 1) + "行,送货单数量不能超过已生成条码数量!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        //    return Result = false;
                        //}
                        //if (sSubStr[i].HBatchNo == "") {
                        //    layer.msg("明细记录第" + (i + 1) + "行,批次为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                        //    return Result = false;
                        //}
                        if (sSubStr[i].HBatchNo == "" && sSubStr[i].HBatchManager == "是") {
                            layer.msg("明细记录第" + (i + 1) + "行,物料启用批次管理，批次为空，请填写批次信息!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
                            return Result = false;
                        }
                        if (sSubStr[i].HKFDate == "") {
                            //凯贝
                            layer.msg("明细记录第" + (i + 1) + "行,生产日期为空!", { icon: 5, btn: ['确认'], time: 2000, offset: 't', skin: 'layui-layer-lan', title: "温馨提示" });
@@ -970,11 +1017,16 @@
        });

        function GetPoorderValue(obj) {
            var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2,6);//6位数当前日期
            
            var Batchno = Format(new Date(), "yyyy-MM-dd").replaceAll('-', '').substr(2, 6);//6位数当前日期

            var HSubLen = HSubData.length + 1;
            var a = [];
            var HOrderType = HSubData[0].HOrderType
            var HError = "";
            for (let i = 0; i < obj.length; i++) {
                if (obj[i].订单类型 != HOrderType) {
                    HError += obj[i].订单类型;
                }
                var row_options = {
                    //"sorderid": HSubLen, "HPOOrderInterID": obj[i].hmainid, "HPOOrderEntryID": obj[i].hentryid, "HPOOrderBillNo": obj[i].单据号, "HWWOrderInterID": 0,
                    //"HWWOrderEntryID": 0, "HWWOrderDetaiLID": 0., "HWWOrderBillNo": '', "HBillType": "1102", "HBatchNo": obj[i].HBatchNo, "HMaterID": obj[i].hmaterid,
@@ -1001,6 +1053,9 @@
                //    "HUnitID": "0", "FPrintCount": "0", "HRQty": "0", "HSQty": "", "HBatchNo": "", "HKFDate": "", "HKFPeriod": "", "HDate": "", "HPrice": "", "HMoney": "", "HRemark": "", "HPOOrderInterID": "", "HPOOrderEntryID": "", "HPOOrderBillNo": "", "HWWOrderInterID": "", "HWWOrderEntryID": "", "HWWOrderBillNo": "", "HBillType": "", "HSourceBillType": "", "HSourceBillNo": "", "HSupMaterNumber": "", "HSupBatchNo": "", "HExpressNumberSub": "", "HExpressSupplierSub": "", "HPlanArrivalDate": "", "HBoxNumber": "", "HSourceInterID": "", "HSourceEntryID": ""
                //};
            };
            if (HError != "") {
                return layer.msg('采购订单订单类型不同，不允许合并下推生成送货单！')
            }
            table.reload('mainTable', {
                data: HSubData
                , height: 'full-10'

 WebSRM/layuiAdmin.std-v1.2.1/src/views/SRM/SRM_POOrderBillList.html

@@ -805,22 +805,31 @@
                        break;
                    case 'btn-generate':
                        var checkStatus = table.checkStatus('mainTable')
                            , data = checkStatus.data;
                            , data = checkStatus.data;                       
                        if (data.length == 0) {
                            layer.alert("请选择数据", { icon: 5 });
                            return;
                        }
                        if (data[0].完成状态 == "已完成") {
                            return layer.msg('订单已完成！')
                        }
                        }                     
                        ajaxLabelData = data;
                        //根据选中的采购订单，重新从金蝶云同步采购订单关联数量过来。考虑采购订单删除和关闭状态，同步状态
                        var ids = "";
                        var entryids = "";
                        var HBillType = data[0].订单类型
                        var HErr = "";
                        $.each(data, function (obj) {
                            ids += data[obj].hmainid + ",";
                            entryids += data[obj].hsubid + ",";
                            if (HBillType != data[obj].订单类型) {
                                HErr += data[obj].订单类型;
                            }
                        })
                        if (HErr != "") {
                            return layer.msg('采购订单订单类型不同，不允许合并下推生成送货单！')
                        }
                       
                        ids = ids.substring(0, ids.length - 1);
                        entryids = entryids.substring(0, entryids.length - 1);
                        var hasPrivileage = true;

 WebSRM/login.html

@@ -81,7 +81,7 @@
                    if (result.count == 1) { // 说明验证成功了，
                        var data = result.data;
                        for (var i = 0; i < data.length; i++) {
                            if (data[i].Name == "浙江夏宝电器有限公司" || data[i].Name.indexOf("蓝海实业集团") >= 0 || data[i].Name.indexOf("安瑞集团") >= 0)
                            if (data[i].Name == "浙江夏宝电器有限公司" || data[i].Name.indexOf("蓝海实业集团") >= 0 || data[i].Name.indexOf("安瑞集团") >= 0 || data[i].Name.indexOf("添康科技") >= 0)
                                Organization += '<option  style="color:blue;" selected value="' + data[i].ID + '">' + data[i].Name + '</option>';
                            else
                                Organization += '<option  style="color:blue;" value="' + data[i].ID + '">' + data[i].Name + '</option>';