#

luxiaotao1123

2020-07-02 8616db4ff233414053845a742058197691aafd99

#

 src/main/java/com/zy/asrs/controller/TrayCodeController.java

@@ -12,6 +12,7 @@
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.entity.param.TrayCodeParam;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -124,17 +125,15 @@
        return R.ok();
    }

    @RequestMapping(value = "/trayCode/print/preview")
    @PostMapping(value = "/trayCode/print/preview")
    @ManagerAuth
    public R printPreview(@RequestParam String startNo,
                   @RequestParam Integer count,
                   @RequestParam Integer type) {
        if (count <= 0) {
    public R printPreview(@RequestParam TrayCodeParam param) {
        if (param.getCount() <= 0) {
            return R.error("数量必须大于零");
        }
        List<Map<String, Object>> res = new ArrayList<>();
        for (int i = 0; i<count; i++) {
            res.add(Cools.add("item", String.valueOf(Integer.parseInt(startNo)+i)));
        for (int i = 0; i<param.getCount(); i++) {
            res.add(Cools.add("item", String.valueOf(Integer.parseInt(param.getStartNo())+i)));
        }
        return R.ok().add(res);
    }

 src/main/java/com/zy/asrs/entity/param/TrayCodeParam.java

New file
@@ -0,0 +1,37 @@
package com.zy.asrs.entity.param;

/**
 * Created by vincent on 2020/7/2
 */
public class TrayCodeParam {

    private String startNo;

    private Integer count;

    private Integer type;

    public String getStartNo() {
        return startNo;
    }

    public void setStartNo(String startNo) {
        this.startNo = startNo;
    }

    public Integer getCount() {
        return count;
    }

    public void setCount(Integer count) {
        this.count = count;
    }

    public Integer getType() {
        return type;
    }

    public void setType(Integer type) {
        this.type = type;
    }
}

 src/main/webapp/static/js/trayCode/trayCode.js

@@ -104,12 +104,12 @@
            // 生成托盘码
            case "btnTray":
                layer.open({
                    type: 2,
                    type: 1,
                    title: '生成托盘码',
                    offset: '100px',
                    area: ['360px'],
                    shade: 0.1,
                    content: 'tray.html',
                    content: $('#print-windows'),
                    success: function(layero, index){
                        layer.iframeAuto(index)
                    },
@@ -295,18 +295,51 @@
        ,range: true
    });

    form.on('submit(print)', function (data) {
        // $.ajax({
        //     url: baseUrl+"/trayCode/print/preview",
        //     headers: {'token': localStorage.getItem('token')},
        //     data: {
        //         startNo: $('#startNo'),
        //         count: $('#count'),
        //         type: $("input[name='type']:checked").val()
        //     },
        //     method: 'POST',
        //     async: false,
        //     success: function (res) {
        //         if (res.code === 200){
        //             for (let i=0;i<res.data.length;i++){
        //                 res.data[i]["barcodeUrl"]=baseUrl+"/macCode/code/auth?type=1&param="+res.data[i].item;
        //             }
        //             var tpl = $('#trayCodeTemplate').html();
        //             var template = Handlebars.compile(tpl);
        //             var html = template(res);
        //             let box = $("#printBox");
        //             // box.html(html);
        //             // box.show();
        //             // box.print();
        //             // box.hide();
        //             // parent.layer.close(parent.layer.getFrameIndex(window.name));
        //         } else if (res.code === 403){
        //             top.location.href = baseUrl+"/";
        //         }else {
        //             layer.msg(res.msg)
        //         }
        //     }
        // })
    });


});

function printPreview(content) {
    var tpl = $('#trayCodeTemplate').html();
    var template = Handlebars.compile(tpl);
    var html = template(content);
    let box = $("#printBox");
    box.html(html);
    box.show();
    box.print();
    box.hide();
}

$('#print').click(function () {

});

$('#cancel').click(function () {
    // layer.close(layer.getFrameIndex(window.name));
})

// 关闭动作
$(document).on('click','#data-detail-close', function () {

 src/main/webapp/views/trayCode/tray.html

File was deleted

 src/main/webapp/views/trayCode/trayCode.html

@@ -62,6 +62,34 @@

<iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>

<div id="print-windows" style="display: none">
    <form class="layui-form" >
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">起始序列:</label>
            <div class="layui-input-block">
                <input id="startNo" name="startNo" placeholder="请输入起始序列号" class="layui-input" lay-verify="required|number" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">数量:</label>
            <div class="layui-input-block">
                <input id="count" name="count" type="number" placeholder="请输入数量" class="layui-input" lay-verify="required|number" autocomplete="off">
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label layui-form-required">码类型:</label>
            <div class="layui-input-block">
                <input type="radio" name="type" value="1" title="条形码" checked="">
                <input type="radio" name="type" value="2" title="二维码">
            </div>
        </div>
        <div class="layui-form-item cool-button-contain">
            <button class="layui-btn layui-btn-normal" id="print" >打印</button>
            <button class="layui-btn layui-btn-primary" id="cancel">取消</button>
        </div>
    </form>
</div>

</body>
<script type="text/template" id="trayCodeTemplate">
    {{#each data}}