6个文件已修改
986 ■■■■ 已修改文件
HTML/views/ASNSetting/LabelBoxBuDa.html 90 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/WareHouseSetting/Pallets.html 849 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Pda/View/AsnSetting/LocationOptimize.html 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Wms/Wms/appsettings.json 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
HTML/views/ASNSetting/LabelBoxBuDa.html
@@ -40,10 +40,12 @@
        .showCls {
            display: block;
        }
        .font-size12{
            font-size: 12px;
        .font-size12 {
            font-size: 14px;
        }
        .font-size10{
        .font-size10 {
            font-size: 10px;
        }
    </style>
@@ -51,37 +53,49 @@
<body>
    <div style="width:100%;">
        <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print" style="width: 100%;height:100%;">
        <div class="layui-form hideCls" lay-filter="layuiadmin-app-form-list" id="print"
            style="width: 100%;height:100%;">
            <div style="display: flex;align-items: center;justify-content: center; height: 260px;">
                <table border="1" id="table" style="width: 90%; height:240px; text-align: center;border-collapse: collapse;table-layout: fixed;border:none">
                <table border="0" id="table"
                    style="width: 90%; height:240px;border-collapse: collapse;table-layout: fixed;border:none">
                    <tr>
                        <td class="font-size12">物料编号:</td>
                        <td id="SkuNo" class="font-size10"></td>
                        <td class="font-size12">
                            物料编号:
                            <table id="SkuNo" class="font-size12"></table>
                        </td>
                    </tr>
                    <tr>
                        <td class="font-size12">物料名称:</td>
                        <td id="SkuName" class="font-size10"></td>
                        <td class="font-size12">
                            物料名称:
                            <table id="SkuName" class="font-size12"></table>
                        </td>
                    </tr>
                    <tr>
                        <td class="font-size12">批次号:</td>
                        <td id="LotNo" class="font-size10"></td>
                    </tr>
                    <tr>
                        <td class="font-size12">生产日期:</td>
                        <td id="ProductionTime" class="font-size10"></td>
                    </tr>
                    <tr>
                        <td class="font-size12">有效期:</td>
                        <td id="ExpirationTime" class="font-size10"></td>
                        <td class="font-size12">
                            批次号:
                            <table id="LotNo" class="font-size12"></table>
                        </td>
                    </tr>
                    <tr>
                        <td colspan="2" style="padding: 5px 0px;">
                            <img id="imgBar" style=" height: 40px;" />
                        </td>
                    <tr>
                        <td class="font-size12">
                            生产日期:
                            <table id="ProductionTime" class="font-size12"></table>
                        </td>
                    </tr>
                </table>
                    <tr>
                        <td class="font-size12">
                            有效期:
                            <table id="ExpirationTime" class="font-size12"></table>
                        </td>
                    </tr>
                    <tr>
                        <td style="padding: 5px 0px;">
                            <img id="imgBar" style=" height: 60px;" />
                        </td>
                    </tr>
                </table>
            </div>
            <div style="page-break-after: always;"></div>
        </div>
@@ -119,7 +133,7 @@
                        class="layui-input" readonly>
                </div>
            </div>
            <div class="layui-form-item" style="margin-bottom:0px;">
                <label class="layui-form-label" style="width: 60px;">补打类型</label>
                <div class="layui-input-inline">
@@ -220,11 +234,11 @@
                            // console.log(z);
                            $("#SkuNo").attr("id", "SkuNo" + z.toString());
                            $("#SkuNo" + z.toString()).html(res.data[z].SkuNo);
                            $("#SkuName").attr("id", "SkuName" + z.toString());
                            $("#SkuName" + z.toString()).html( res.data[z].SkuName);
                            $("#SkuName").attr("id", "SkuName" + z.toString());
                            $("#SkuName" + z.toString()).html(res.data[z].SkuName);
                            $("#PackageStandard").attr("id", "PackageStandard" + z.toString());
                            $("#PackageStandard" + z.toString()).html(res.data[z].PackageStandard);
@@ -232,24 +246,24 @@
                            $("#Standard" + z.toString()).html(res.data[z].Standard);
                            $("#Qty").attr("id", "Qty" + z.toString());
                            $("#Qty" + z.toString()).html( res.data[z].Qty);
                            $("#Qty" + z.toString()).html(res.data[z].Qty);
                            $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
                            $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
                            $("#SupplierLot" + z.toString()).html(res.data[z].SupplierLot);
                            $("#LotNo").attr("id", "LotNo" + z.toString());
                            $("#LotNo" + z.toString()).html( res.data[z].LotNo);
                            $("#LotNo" + z.toString()).html(res.data[z].LotNo);
                            $("#SupplierLot").attr("id", "SupplierLot" + z.toString());
                            $("#SupplierLot" + z.toString()).html( res.data[z].SupplierLot);
                            $("#SupplierLot" + z.toString()).html(res.data[z].SupplierLot);
                            $("#ExpirationTime").attr("id", "ExpirationTime" + z.toString());
                            $("#ExpirationTime" + z.toString()).html( formatDate2(res.data[z].ExpirationTime));
                            $("#ExpirationTime" + z.toString()).html(formatDate2(res.data[z].ExpirationTime));
                            $("#ProductionTime").attr("id", "ProductionTime" + z.toString());
                            $("#ProductionTime" + z.toString()).html( formatDate2(res.data[z].ProductionTime));
                            $("#ProductionTime" + z.toString()).html(formatDate2(res.data[z].ProductionTime));
                            $("#imgBar").attr("id", "imgBar" + z.toString());
                            $("#imgBar" + z.toString()).attr("src", res.data[z].ImgStr);
HTML/views/WareHouseSetting/Pallets.html
@@ -1,445 +1,452 @@
<!DOCTYPE html>
<html>
    <head>
        <meta charset="utf-8">
        <title>条形码列表</title>
        <meta name="renderer" content="webkit">
        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
        <meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
        <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
        <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
        <style media="print">
            @page{
                size: auto;
                margin: 0 0 0 30px;
            }
        </style>
        <script>
            // 这里是需要在页面渲染之前执行的代码
            document.addEventListener("DOMContentLoaded", function() {
                //获取table默认显示数
                pageCntFirst();
            });
          </script>
    </head>
    <body id="body">
        <div class="layui-fluid" style="padding-bottom: 0;">
            <div class="layui-card">
                <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC" id="top">
                    <div class="layui-form-item">
                        <div class="layui-inline">
                            <label class="layui-form-label" style="width: 70px;">托盘条码:</label>
                            <div class="layui-input-inline">
                                <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘条码" autocomplete="off" class="layui-input">
                            </div>
                        </div>
                        <div class="layui-inline">
                            <label class="layui-form-label">条码状态</label>
                            <div class="layui-input-inline">
                                <select name="Status" id="Status" lay-verify="" lay-search>
                                    <option value=""></option>
                                    <option value="0">未使用</option>
                                    <option value="1">使用中</option>
                                </select>
                            </div>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit lay-filter="LAY-app-contlist-search">
                                <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                            </button>
                        </div>
                        <div class="layui-inline">
                            <button class="layui-btn layui-btn-sm layuiadmin-btn-list add" data-type="add">
                                <i class="layui-icon layuiadmin-button-btn">&#xe654;</i>添加
                            </button>
<head>
    <meta charset="utf-8">
    <title>条形码列表</title>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
    <meta name="viewport"
        content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
    <link rel="stylesheet" href="../../layuiadmin/layui/css/layui.css" media="all">
    <link rel="stylesheet" href="../../layuiadmin/style/admin.css" media="all">
    <style media="print">
        @page {
            size: auto;
            margin: 0 0 0 30px;
        }
    </style>
    <script>
        // 这里是需要在页面渲染之前执行的代码
        document.addEventListener("DOMContentLoaded", function () {
            //获取table默认显示数
            pageCntFirst();
        });
    </script>
</head>
<body id="body">
    <div class="layui-fluid" style="padding-bottom: 0;">
        <div class="layui-card">
            <div class="layui-form layui-card-header layuiadmin-card-header-auto" style="border-bottom:1px solid #CCC"
                id="top">
                <div class="layui-form-item">
                    <div class="layui-inline">
                        <label class="layui-form-label" style="width: 70px;">托盘条码:</label>
                        <div class="layui-input-inline">
                            <input type="text" id="PalletNo" name="PalletNo" placeholder="托盘条码" autocomplete="off"
                                class="layui-input">
                        </div>
                    </div>
                    <div class="layui-inline">
                        <label class="layui-form-label">条码状态</label>
                        <div class="layui-input-inline">
                            <select name="Status" id="Status" lay-verify="" lay-search>
                                <option value=""></option>
                                <option value="0">未使用</option>
                                <option value="1">使用中</option>
                            </select>
                        </div>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list" lay-submit
                            lay-filter="LAY-app-contlist-search">
                            <i class="layui-icon layui-icon-search layuiadmin-button-btn"></i>搜索
                        </button>
                    </div>
                    <div class="layui-inline">
                        <button class="layui-btn layui-btn-sm layuiadmin-btn-list add" data-type="add">
                            <i class="layui-icon layuiadmin-button-btn">&#xe654;</i>添加
                        </button>
                    </div>
                </div>
                <div id="center"></div>
                <div class="layui-card-body">
                    <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                    <script type="text/html" id="table-content-list">
            </div>
            <div id="center"></div>
            <div class="layui-card-body">
                <table id="LAY-app-content-list" lay-filter="LAY-app-content-list"></table>
                <script type="text/html" id="table-content-list">
                        <a class="approvalBtndel layui-btn layui-btn-normal layui-btn-xs queryClass" lay-event="edit"><i class="layui-icon layui-icon-search"></i>查看</a>
                        <a class="approvalBtn layui-btn layui-btn-normal layui-btn-xs buDaClass" lay-event="print"><i class="layui-icon layui-icon-print"></i>补打</a>
                    </script>
                </div>
                <div id="print"></div>
            </div>
            <div id="print"></div>
        </div>
        <script src="../../layuiadmin/layui/layui.js"></script>
        <script src="../../js/public.js"></script>
        <script src="../../js/jquery-3.5.1.min.js"></script>
        <script src="../../js/jquery.cookie.js"></script>
        <script src="../../js/jquery.print.js"></script>
        <script>
            layui.config({
                base: '../../layuiadmin/' //静态资源所在路径
            }).extend({
                index: 'lib/index' //主入口模块
            }).use(['index', 'table', 'laypage', 'layer'], function() {
                var table = layui.table,
                    form = layui.form,
                    laypage = layui.laypage,
                    layer = layui.layer;
                    var h1 = GetTableHeight();
                var isTrue= true;
                var where = {
                    PalletNo:$("#PalletNo").val(),
                    Status:$("#Status").val(),
                }
                var tableIns = table.render({
                    elem: '#LAY-app-content-list',
                    height: h1,
                    id: 'LAY-app-content-list',
                    url: IP + "/Sys/GetPalletsList",
                    method: 'post',
                    where: where,
                    contentType: 'application/json',
                    headers:{ToKen:$.cookie('token')},
                    page: true,
                    limit: pageCnt,
                    limits: pageLimits,
                    cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                    done:function(){
                        $(function() {
                            $(".queryClass").hide();
                            $(".buDaClass").hide();
                            $(".add").hide();
                        });
                        sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
                            if (res.code == 0) { //成功
                                for (var k = 0; k < res.data.length; k++) {
                                    if (res.data[k].MenuName == "添加条码") {
                                        $(function() {
                                            $(".add").show();
                                        });
                                    }
                                    if (res.data[k].MenuName == "查看条码") {
                                        $(function() {
                                            $(".queryClass").show();
                                        });
                                    }
                                    if (res.data[k].MenuName == "补打条码") {
                                        $(function() {
                                            $(".buDaClass").show();
                                        });
                                    }
    </div>
    <script src="../../layuiadmin/layui/layui.js"></script>
    <script src="../../js/public.js"></script>
    <script src="../../js/jquery-3.5.1.min.js"></script>
    <script src="../../js/jquery.cookie.js"></script>
    <script src="../../js/jquery.print.js"></script>
    <script>
        layui.config({
            base: '../../layuiadmin/' //静态资源所在路径
        }).extend({
            index: 'lib/index' //主入口模块
        }).use(['index', 'table', 'laypage', 'layer'], function () {
            var table = layui.table,
                form = layui.form,
                laypage = layui.laypage,
                layer = layui.layer;
            var h1 = GetTableHeight();
            var isTrue = true;
            var where = {
                PalletNo: $("#PalletNo").val(),
                Status: $("#Status").val(),
            }
            var tableIns = table.render({
                elem: '#LAY-app-content-list',
                height: h1,
                id: 'LAY-app-content-list',
                url: IP + "/Sys/GetPalletsList",
                method: 'post',
                where: where,
                contentType: 'application/json',
                headers: { ToKen: $.cookie('token') },
                page: true,
                limit: pageCnt,
                limits: pageLimits,
                cellMinWidth: 80, //全局定义常规单元格的最小宽度,layui 2.2.1 新增
                done: function () {
                    $(function () {
                        $(".queryClass").hide();
                        $(".buDaClass").hide();
                        $(".add").hide();
                    });
                    sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                        if (res.code == 0) { //成功
                            for (var k = 0; k < res.data.length; k++) {
                                if (res.data[k].MenuName == "添加条码") {
                                    $(function () {
                                        $(".add").show();
                                    });
                                }
                            } else { //不成功
                                layer.msg('获取权限信息失败', {
                                    icon: 2,
                                    time: 2000 //2秒关闭(如果不配置,默认是3秒)
                                }, function() {});
                                if (res.data[k].MenuName == "查看条码") {
                                    $(function () {
                                        $(".queryClass").show();
                                    });
                                }
                                if (res.data[k].MenuName == "补打条码") {
                                    $(function () {
                                        $(".buDaClass").show();
                                    });
                                }
                            }
                        });
                        } else { //不成功
                            layer.msg('获取权限信息失败', {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function () { });
                        }
                    });
                },
                cols: [
                    [{
                        title: '序号',
                        type: 'numbers',
                        width: 65,
                        fixed: 'left'
                    }, {
                        field: 'PalletNo',
                        title: '托盘条码',
                        align: 'center',
                    }, {
                        field: 'Status',
                        title: '条码状态',
                        align: 'center',
                        templet: function (d) {
                            switch (d.Status) {
                                case "0":
                                    return `<button class="layui-btn layui-btn-radius layui-btn-xs">未使用</button>`;
                                case "1":
                                    return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">使用中</button>`;
                                default:
                                    return "";
                            }
                        }
                    }, {
                        field: 'CreateUserName',
                        title: '创建人',
                        align: 'center',
                    }, {
                        field: 'CreateTime',
                        title: '创建时间',
                        align: 'center',
                        templet: function (d) {
                            return formatDate(d.CreateTime);
                        }
                    }, {
                        field: 'LastUse',
                        title: '上次使用时间',
                        align: 'center',
                        templet: function (d) {
                            return formatDate(d.LastUse);
                        }
                    }, {
                        title: '操作',
                        fixed: 'right',
                        width: 220,
                        align: 'center',
                        toolbar: '#table-content-list'
                    }]
                ],
            });
            //监听搜索
            form.on('submit(LAY-app-contlist-search)', function (data) {
                tableIns.reload({
                    where: {
                        PalletNo: $("#PalletNo").val(),
                        Status: $("#Status").val(),
                    },
                    cols: [
                        [{
                            title: '序号',
                            type: 'numbers',
                            width: 65,
                            fixed: 'left'
                        }, {
                            field: 'PalletNo',
                            title: '托盘条码',
                            align: 'center',
                        }, {
                            field: 'Status',
                            title: '条码状态',
                            align: 'center',
                            templet:function(d){
                                switch (d.Status) {
                                    case "0":
                                        return `<button class="layui-btn layui-btn-radius layui-btn-xs">未使用</button>`;
                                    case "1":
                                        return `<button class="layui-btn layui-btn-radius layui-btn-warm layui-btn-xs">使用中</button>`;
                                    default:
                                        return "";
                                }
                            }
                        }, {
                            field: 'CreateUserName',
                            title: '创建人',
                            align: 'center',
                        } ,{
                            field: 'CreateTime',
                            title: '创建时间',
                            align: 'center',
                            templet:function(d){
                                return formatDate(d.CreateTime);
                            }
                        }, {
                            field: 'LastUse',
                            title: '上次使用时间',
                            align: 'center',
                            templet:function(d){
                                return formatDate(d.LastUse);
                            }
                        }, {
                            title: '操作',
                            fixed: 'right',
                            width: 220,
                            align: 'center',
                            toolbar: '#table-content-list'
                        }]
                    ],
                });
                //监听搜索
                form.on('submit(LAY-app-contlist-search)', function(data) {
                    tableIns.reload({
                        where:{
                            PalletNo:$("#PalletNo").val(),
                            Status:$("#Status").val(),
                        },
                        page: {
                            curr: 1
                        }
                    });
                });
                $(function() {
                    $(".addClass").hide();
                });
                sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function(res) {
                    if (res.code == 0) { //成功
                        for (var k = 0; k < res.data.length; k++) {
                            if (res.data[k].MenuName == "添加条码") {
                                $(function() {
                                    $(".addClass").show();
                                });
                            }
                        }
                    } else { //不成功
                        layer.msg('获取权限信息失败', {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function() {});
                    page: {
                        curr: 1
                    }
                });
            });
            $(function () {
                $(".addClass").hide();
            });
            sendData(IP + "/Basis/GetRoleRightList", {}, 'get', function (res) {
                if (res.code == 0) { //成功
                    for (var k = 0; k < res.data.length; k++) {
                        if (res.data[k].MenuName == "添加条码") {
                            $(function () {
                                $(".addClass").show();
                            });
                        }
                    }
                } else { //不成功
                    layer.msg('获取权限信息失败', {
                        icon: 2,
                        time: 2000 //2秒关闭(如果不配置,默认是3秒)
                    }, function () { });
                }
            });
                var    active = {
                    add: function() {
                        layer.open({
                            type: 2,
                            title: '打印托盘条码',
                            content: 'PalletsPrintFrom.html',
                            maxmin: true,
                            area: ['600px', '300px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero){
                                var iframeWindow = window['layui-layer-iframe'+ index]
                                ,submitID = 'layuiadmin-app-form-submit'
                                ,submit = layero.find('iframe').contents().find('#'+ submitID);
                                //监听提交
                                iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
                                    var field = data.field; //获取提交的字段
                                    console.log(field);
                                    if (isTrue = true) {
                                        isTrue = false;
                                        var html = "";
                                        var xun = 0;
                                        document.getElementById('print').innerHTML="";
                                        for(var i=0;i<field.GroupCount;i++){
                                            for(var j=0;j<field.SameCount;j++){
                                                html ="<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 10%;margin-left: 0%;\">\n"+
                                                "<div class=\"layui-form-item\">\n"+
                                                "<div class=\"layui-inline\">\n"+
                                                "<div class=\"\">\n"+
                                                "<img  id=\"imgBar\" width=\"245px\" height=\"120px\"/></div>\n"+
                                                "</div>\n"+
                                                "</div>\n"+
                                                "</div>\n"+
                                                "<div style=\"page-break-after: always;\"></div>\n"+
                                                "</div>" ;
                                                document.getElementById('print').innerHTML+=html;
                                                document.getElementById('imgBar').id="imgBar"+xun;
                                                xun+=1
                                            }
                                        }
                                        GetimgBar(field.StockCode,field.GroupCount,field.SameCount);
                                        layer.close(index);
                                    }
                                });
                                submit.trigger('click');
                            },
                            end:function(){
                                location.reload();
                                return false;
                            }
                        });
                    }
                };
                $('.layui-btn.layuiadmin-btn-list').on('click', function() {
                    var type = $(this).data('type');
                    active[type] ? active[type].call(this) : '';
                });
                //获取添加条形码
                function GetimgBar(StockCode,GroupCount,SameCount){
                    var param = {
                        PalletNo:StockCode,
                        GroupCount: parseInt(GroupCount),
                        SameCount:parseInt(SameCount),
                    };
                    console.log(param);
                    synData(IP + "/Sys/GetImgBar", param, 'post', function(res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                            for(var i=0;i<res.data.length;i++){
                                $("#"+"imgBar"+i).attr("src", res.data[i]);
                            }
                            AddPallets(StockCode,GroupCount);
                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function() {});
                        }
                    });
                };
                //添加条形码
                function AddPallets(StockCode,GroupCount){
                    //提交 Ajax 成功后,静态更新表格中的数据
                    var param = {
                        GroupCount:parseInt(GroupCount),
                    };
                    synData(IP + "/Sys/AddPallets", param, 'post', function(res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                            $("#print").print();
                        } else if(res.code == 1){
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function() {});
                        } else { //不成功
                            layer.msg(res.statusText, {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function() {});
                        }
                    });
                };
                //获取补打条形码
                function GetimgBar1(StockCode,GroupCount,SameCount){
                    var param = {
                        PalletNo:StockCode,
                        GroupCount:parseInt(GroupCount),
                        SameCount:parseInt(SameCount),
                    };
                    synData(IP + "/Sys/GetImgBarReprint", param, 'post', function(res) {
                        console.log(res);
                        if (res.code == 0) { //成功
                            var ok=false;
                            for(var i=0;i<res.data.length;i++){
                                $("#"+"imgBar"+i).attr("src", res.data[i]);
                                if(i==(res.data.length-1)){
                                    ok=true;
                                }
                            }
                            if(ok){
                                $("#print").print();
                            }
                        } else { //不成功
                            layer.msg(res.msg, {
                                icon: 2,
                                time: 2000 //2秒关闭(如果不配置,默认是3秒)
                            }, function() {});
                        }
                    })
                };
                table.on('tool(LAY-app-content-list)', function(obj) {
                    var data = obj.data;
                    if (obj.event === 'edit') {
                        layer.open({
                            type: 2,
                            title: '托盘时间线',
                            content: 'PalletsTimeLine.html?PalletNo=' +  data.PalletNo,
                            maxmin: true,
                            area: ['700px', '650px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero){
                                layer.close(index); //关闭弹层
                            }
                        });
                    }
                    if (obj.event === 'print') {
                        PalletNo = data.PalletNo;
                        layer.open({
                            type: 2,
                            title: '打印托盘条码',
                            content: 'PalletsPrintFrom.html?PalletNo='+PalletNo,
                            maxmin: true,
                            area: ['600px', '300px'],
                            btn: ['确定', '取消'],
                            yes: function(index, layero){
                                var iframeWindow = window['layui-layer-iframe'+ index]
                                ,submitID = 'layuiadmin-app-form-submit'
                                ,submit = layero.find('iframe').contents().find('#'+ submitID);
                                //监听提交
                                iframeWindow.layui.form.on('submit('+ submitID +')', function(data){
                                    var field = data.field; //获取提交的字段
                                    console.log(field);
            var active = {
                add: function () {
                    layer.open({
                        type: 2,
                        title: '打印托盘条码',
                        content: 'PalletsPrintFrom.html',
                        maxmin: true,
                        area: ['600px', '300px'],
                        btn: ['确定', '取消'],
                        yes: function (index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index]
                                , submitID = 'layuiadmin-app-form-submit'
                                , submit = layero.find('iframe').contents().find('#' + submitID);
                            //监听提交
                            iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                                var field = data.field; //获取提交的字段
                                console.log(field);
                                if (isTrue = true) {
                                    isTrue = false;
                                    var html = "";
                                    var xun = 0;
                                    var isOk = false;
                                    document.getElementById('print').innerHTML="";
                                    for(var i=0;i<parseInt(field.GroupCount);i++){
                                        for(var j=0;j<parseInt(field.SameCount);j++){
                                            html ="<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 10%;margin-left: 0%;\">\n"+
                                                "<div class=\"layui-form-item\">\n"+
                                                "<div class=\"layui-inline\">\n"+
                                                "<div class=\"\">\n"+
                                                "<img  id=\"imgBar\" width=\"245px\" height=\"120px\" /></div>\n"+
                                                "</div>\n"+
                                                "</div>\n"+
                                                "</div>\n"+
                                                "<div style=\"page-break-after: always;\"></div>\n"+
                                                "</div>" ;
                                                document.getElementById('print').innerHTML+=html;
                                                document.getElementById('imgBar').id="imgBar"+xun;
                                                xun+=1
                                        }
                                        if(i==(parseInt(field.GroupCount)-1)){
                                            isOk= true;
                                    document.getElementById('print').innerHTML = "";
                                    for (var i = 0; i < field.GroupCount; i++) {
                                        for (var j = 0; j < field.SameCount; j++) {
                                            html = "<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 20%;margin-left: 19%;\">\n" +
                                                "<div class=\"layui-form-item\">\n" +
                                                "<div class=\"layui-inline\">\n" +
                                                "<div class=\"\">\n" +
                                                "<img  id=\"imgBar\" width=\"245px\" height=\"120px\"/></div>\n" +
                                                "</div>\n" +
                                                "</div>\n" +
                                                "</div>\n" +
                                                "<div style=\"page-break-after: always;\"></div>\n" +
                                                "</div>";
                                            document.getElementById('print').innerHTML += html;
                                            document.getElementById('imgBar').id = "imgBar" + xun;
                                            xun += 1
                                        }
                                    }
                                    if(isOk){
                                        GetimgBar1(field.StockCode,field.GroupCount,field.SameCount);
                                    }
                                });
                              submit.trigger('click');
                            },
                            end:function(){
                                location.reload();
                                return false;
                            }
                        });
                                    GetimgBar(field.StockCode, field.GroupCount, field.SameCount);
                                    layer.close(index);
                                }
                            });
                            submit.trigger('click');
                        },
                        end: function () {
                            location.reload();
                            return false;
                        }
                    });
                }
            };
            $('.layui-btn.layuiadmin-btn-list').on('click', function () {
                var type = $(this).data('type');
                active[type] ? active[type].call(this) : '';
            });
            //获取添加条形码
            function GetimgBar(StockCode, GroupCount, SameCount) {
                var param = {
                    PalletNo: StockCode,
                    GroupCount: parseInt(GroupCount),
                    SameCount: parseInt(SameCount),
                };
                console.log(param);
                synData(IP + "/Sys/GetImgBar", param, 'post', function (res) {
                    console.log(res);
                    if (res.code == 0) { //成功
                        for (var i = 0; i < res.data.length; i++) {
                            $("#" + "imgBar" + i).attr("src", res.data[i]);
                        }
                        AddPallets(StockCode, GroupCount);
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
            };
            //添加条形码
            function AddPallets(StockCode, GroupCount) {
                //提交 Ajax 成功后,静态更新表格中的数据
                var param = {
                    GroupCount: parseInt(GroupCount),
                };
                synData(IP + "/Sys/AddPallets", param, 'post', function (res) {
                    console.log(res);
                    if (res.code == 0) { //成功
                        $("#print").print();
                    } else if (res.code == 1) {
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    } else { //不成功
                        layer.msg(res.statusText, {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                });
            };
            //获取补打条形码
            function GetimgBar1(StockCode, GroupCount, SameCount) {
                var param = {
                    PalletNo: StockCode,
                    GroupCount: parseInt(GroupCount),
                    SameCount: parseInt(SameCount),
                };
                synData(IP + "/Sys/GetImgBarReprint", param, 'post', function (res) {
                    console.log(res);
                    if (res.code == 0) { //成功
                        var ok = false;
                        for (var i = 0; i < res.data.length; i++) {
                            $("#" + "imgBar" + i).attr("src", res.data[i]);
                            if (i == (res.data.length - 1)) {
                                ok = true;
                            }
                        }
                        if (ok) {
                            $("#print").print();
                        }
                    } else { //不成功
                        layer.msg(res.msg, {
                            icon: 2,
                            time: 2000 //2秒关闭(如果不配置,默认是3秒)
                        }, function () { });
                    }
                })
            };
            table.on('tool(LAY-app-content-list)', function (obj) {
                var data = obj.data;
                if (obj.event === 'edit') {
                    layer.open({
                        type: 2,
                        title: '托盘时间线',
                        content: 'PalletsTimeLine.html?PalletNo=' + data.PalletNo,
                        maxmin: true,
                        area: ['700px', '650px'],
                        btn: ['确定', '取消'],
                        yes: function (index, layero) {
                            layer.close(index); //关闭弹层
                        }
                    });
                }
                if (obj.event === 'print') {
                    PalletNo = data.PalletNo;
                    layer.open({
                        type: 2,
                        title: '打印托盘条码',
                        content: 'PalletsPrintFrom.html?PalletNo=' + PalletNo,
                        maxmin: true,
                        area: ['600px', '300px'],
                        btn: ['确定', '取消'],
                        yes: function (index, layero) {
                            var iframeWindow = window['layui-layer-iframe' + index]
                                , submitID = 'layuiadmin-app-form-submit'
                                , submit = layero.find('iframe').contents().find('#' + submitID);
                            //监听提交
                            iframeWindow.layui.form.on('submit(' + submitID + ')', function (data) {
                                var field = data.field; //获取提交的字段
                                console.log(field);
                                var html = "";
                                var xun = 0;
                                var isOk = false;
                                document.getElementById('print').innerHTML = "";
                                for (var i = 0; i < parseInt(field.GroupCount); i++) {
                                    for (var j = 0; j < parseInt(field.SameCount); j++) {
                                        html = "<div class=\"layui-form\" lay-filter=\"layuiadmin-app-form-list\" id=\"print\" style=\"width: 50%; text-align: center;padding-top: 20%;margin-left: 19%;\">\n" +
                                            "<div class=\"layui-form-item\">\n" +
                                            "<div class=\"layui-inline\">\n" +
                                            "<div class=\"\">\n" +
                                            "<img  id=\"imgBar\" width=\"245px\" height=\"120px\" /></div>\n" +
                                            "</div>\n" +
                                            "</div>\n" +
                                            "</div>\n" +
                                            "<div style=\"page-break-after: always;\"></div>\n" +
                                            "</div>";
                                        document.getElementById('print').innerHTML += html;
                                        document.getElementById('imgBar').id = "imgBar" + xun;
                                        xun += 1
                                    }
                                    if (i == (parseInt(field.GroupCount) - 1)) {
                                        isOk = true;
                                    }
                                }
                                if (isOk) {
                                    GetimgBar1(field.StockCode, field.GroupCount, field.SameCount);
                                }
                            });
                            submit.trigger('click');
                        },
                        end: function () {
                            location.reload();
                            return false;
                        }
                    });
                }
            });
        </script>
    </body>
</html>
        });
    </script>
</body>
</html>
Pda/View/AsnSetting/LocationOptimize.html
@@ -86,7 +86,7 @@
            <table border="" cellspacing="" cellpadding="">
                <tr>
                    <td class="img-back"><a href="../index.html"><img src="/assets/back.jpg"></a></td>
                    <td class="title-text" lang>库位巷道</td>
                    <td class="title-text" lang>指定储位</td>
                    <td class="title-menu-icon"><img id="menuImg" src="/assets/menu.jpg"></td>
                </tr>
            </table>
Wms/WMS.BLL/BllAsnServer/ArrivalNoticeServer.cs
@@ -301,6 +301,8 @@
                    };
                    List<BllArrivalNoticeDetail> details = new List<BllArrivalNoticeDetail>();
                    var skuList = Db.Queryable<SysMaterials>().Where(m => m.IsDel == "0").ToList();
                    foreach (ArrivalNoticeDetailVm detailModel in model.AsnDetail)
                    {
                        if (string.IsNullOrEmpty(detailModel.SkuNo))
@@ -318,7 +320,7 @@
                            strMessage = "-1:数量必须大于0;";
                            continue;
                        }
                        if ( model.Type == "5" || model.Type == "6" || model.Type == "7")
                        {
                            if (!string.IsNullOrWhiteSpace(detailModel.LotNo))
@@ -375,6 +377,33 @@
                        {
                            detailModel.Price = 0;
                        }
                        var sku = skuList.FirstOrDefault(m => m.SkuNo == detailModel.SkuNo);
                        if (sku == null)
                        {
                            throw new Exception("未查询出物料信息!");
                        }
                        string lot1 = detailModel.Lot1;
                        string lot2 = detailModel.Lot2;
                        if (sku.IsPasteCode == "0")
                        {
                            //不贴标物料 生产日期、有效期不能为空
                            DateTime lot12;
                            DateTime lot22;
                            if (!DateTime.TryParse(detailModel.Lot1, out lot12))
                            {
                                throw new Exception("非贴标物料生产日期转换失败");
                            }
                            if (!DateTime.TryParse(detailModel.Lot2, out lot22))
                            {
                                throw new Exception("非贴标物料过期日期转换失败");
                            }
                            lot1 = lot12.ToString();
                            lot2 = lot22.ToString();
                        }
                        if (string.IsNullOrWhiteSpace(detailModel.PackagNo))
                        {
                            throw new Exception("包装不能为空");
                        }
                        // 计算出总金额
                        detailModel.Money = detailModel.Price * detailModel.Qty;
                        BllArrivalNoticeDetail detail = new BllArrivalNoticeDetail()
@@ -397,6 +426,8 @@
                            Status = "0",
                            IsSampling = "0",
                            InspectStatus = "0",
                            Lot1 = lot1, //生产日期
                            Lot2 = lot2, // 过期日期
                            UDF1 = detailModel.UDF1,
                            UDF2 = detailModel.UDF2,
                            UDF3 = detailModel.UDF3,
Wms/WMS.BLL/BllPdaServer/PdaAsnServer.cs
@@ -2235,8 +2235,8 @@
                    if (boxNoList.Count > 0)
                    {
                        data.BoxNoList = boxNoList;
                        data.Date1 = item.ProductionTime.ToString();
                        data.Date2 = item.ExpirationTime.ToString();
                        data.Date1 = item.ProductionTime == null ? "" : Convert.ToDateTime(item.ProductionTime).ToString("yyyy-MM-dd");
                        data.Date2 = item.ExpirationTime == null ? "" : Convert.ToDateTime(item.ExpirationTime).ToString("yyyy-MM-dd");
                        break;
                    }
Wms/Wms/appsettings.json
@@ -11,8 +11,8 @@
    //"ConnectionString": "Server=47.95.120.93;Database=WMS_JC09;User ID=sa;password=boxline!@#; Integrated Security=True;",
    //"ConnectionString": "Server=47.95.120.53;Database=WMS_JC09;User ID=sa;Password=boxline!@#;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.106;Database=WMS_JC24;User ID=sa;Password=sql2019;Integrated Security=False;",
    "ConnectionString": "Server=10.26.200.29;Database=WMS_JC34;User ID=sa;Password=boxline@2016;Integrated Security=False;",
    //"ConnectionString": "Server=192.168.62.200;Database=WMS_JC34;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=10.26.200.29;Database=WMS_JC34;User ID=sa;Password=boxline@2016;Integrated Security=False;",
    "ConnectionString": "Server=192.168.62.200;Database=WMS_JC34;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Server=.;Database=WMS_JC09;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"ConnectionString": "Data Source=DESKTOP-0EJDG95\\MSSQLSERVER1;Initial Catalog=WMS_V01;Integrated Security=True;"
  },
@@ -49,8 +49,8 @@
  },
  "Quartz": {
    "dbProviderName": "SqlServer",
    //"connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;",
    "connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
    "connectionString": "Server=192.168.62.200;Database=WMS_JC34QRTZ;User ID=sa;Password=sql2019;Integrated Security=False;"
    //"connectionString": "Server=10.26.200.29;Database=WMS_JC34QRTZ;User ID=sa;Password=boxline@2016;Integrated Security=False;"
  }