From f1c71ac24732d123329f681e9cba796f7e923e16 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期三, 03 一月 2024 16:40:10 +0800
Subject: [PATCH] #

---
 zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml                           |    5 
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java            |   12 
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java              |  123 +++++++++
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java          |    8 
 zy-asrs-wms/src/main/webapp/static/js/basBarcode/basBarcode.js                              |  347 ++++++++++++++++++++++++++
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java |   12 
 zy-asrs-wms/src/main/webapp/views/basBarcode/basBarcode.html                                |  170 +++++++++++++
 zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java                  |   89 ++++++
 8 files changed, 766 insertions(+), 0 deletions(-)

diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java
new file mode 100644
index 0000000..3faa124
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/BasBarcode.java
@@ -0,0 +1,89 @@
+package com.zy.asrs.common.wms.entity;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.SpringUtils;
+import com.zy.asrs.common.sys.entity.User;
+import com.zy.asrs.common.sys.entity.Host;
+import com.zy.asrs.common.sys.service.UserService;
+import com.zy.asrs.common.sys.service.HostService;
+
+import java.io.Serializable;
+import java.util.Date;
+
+@Data
+@TableName("wms_bas_barcode")
+public class BasBarcode implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * ID
+     */
+    @ApiModelProperty(value= "ID")
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 鏉$爜鍊�
+     */
+    @ApiModelProperty(value= "鏉$爜鍊�")
+    private String barcode;
+
+    /**
+     * 鍒涘缓鏃堕棿
+     */
+    @ApiModelProperty(value= "鍒涘缓鏃堕棿")
+    @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 浠撳簱ID
+     */
+    @ApiModelProperty(value= "浠撳簱ID")
+    private Long hostId;
+
+    public BasBarcode() {}
+
+    public BasBarcode(Long id,String barcode,Date createTime,Long hostId) {
+        this.id = id;
+        this.barcode = barcode;
+        this.createTime = createTime;
+        this.hostId = hostId;
+    }
+
+//    BasBarcode basBarcode = new BasBarcode(
+//            null,    // ID[闈炵┖]
+//            null,    // 鏉$爜鍊�
+//            null,    // 鍒涘缓鏃堕棿
+//            null    // 鎺堟潈鍟嗘埛
+//    );
+
+    public String getCreateTime$(){
+        if (Cools.isEmpty(this.createTime)){
+            return "";
+        }
+        return new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(this.createTime);
+    }
+
+    public String getHostId$(){
+        HostService service = SpringUtils.getBean(HostService.class);
+        Host host = service.getById(this.hostId);
+        if (!Cools.isEmpty(host)){
+            return String.valueOf(host.getName());
+        }
+        return null;
+    }
+
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java
new file mode 100644
index 0000000..2b63f90
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/BasBarcodeMapper.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.mapper;
+
+import com.zy.asrs.common.wms.entity.BasBarcode;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Repository;
+
+@Mapper
+@Repository
+public interface BasBarcodeMapper extends BaseMapper<BasBarcode> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java
new file mode 100644
index 0000000..ceaf7b1
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/BasBarcodeService.java
@@ -0,0 +1,8 @@
+package com.zy.asrs.common.wms.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.zy.asrs.common.wms.entity.BasBarcode;
+
+public interface BasBarcodeService extends IService<BasBarcode> {
+
+}
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java
new file mode 100644
index 0000000..7b5eb91
--- /dev/null
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/BasBarcodeServiceImpl.java
@@ -0,0 +1,12 @@
+package com.zy.asrs.common.wms.service.impl;
+
+import com.zy.asrs.common.wms.mapper.BasBarcodeMapper;
+import com.zy.asrs.common.wms.entity.BasBarcode;
+import com.zy.asrs.common.wms.service.BasBarcodeService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+@Service("basBarcodeService")
+public class BasBarcodeServiceImpl extends ServiceImpl<BasBarcodeMapper, BasBarcode> implements BasBarcodeService {
+
+}
diff --git a/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml b/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml
new file mode 100644
index 0000000..8b8635e
--- /dev/null
+++ b/zy-asrs-common/src/main/resources/mapper/wms/BasBarcodeMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zy.asrs.common.wms.mapper.BasBarcodeMapper">
+
+</mapper>
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
new file mode 100644
index 0000000..f617227
--- /dev/null
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasBarcodeController.java
@@ -0,0 +1,123 @@
+package com.zy.asrs.wms.controller;
+
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.zy.asrs.common.wms.entity.BasBarcode;
+import com.zy.asrs.common.wms.service.BasBarcodeService;
+import com.zy.asrs.framework.annotations.ManagerAuth;
+import com.zy.asrs.framework.common.Cools;
+import com.zy.asrs.framework.common.R;
+import com.zy.asrs.framework.domain.KeyValueVo;
+import com.zy.asrs.framework.common.DateUtils;
+import com.zy.asrs.common.web.BaseController;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.*;
+
+@RestController
+public class BasBarcodeController extends BaseController {
+
+    @Autowired
+    private BasBarcodeService basBarcodeService;
+
+    @RequestMapping(value = "/basBarcode/{id}/auth")
+    @ManagerAuth
+    public R get(@PathVariable("id") String id) {
+        return R.ok(basBarcodeService.getById(String.valueOf(id)));
+    }
+
+    @RequestMapping(value = "/basBarcode/page/auth")
+    @ManagerAuth
+    public R page(@RequestParam(defaultValue = "1") Integer curr,
+                  @RequestParam(defaultValue = "10") Integer limit,
+                  @RequestParam(required = false) String condition,
+                  @RequestParam(required = false) String timeRange,
+                  @RequestParam Map<String, Object> param) {
+        LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        if (!Cools.isEmpty(condition)) {
+            wrapper.like(BasBarcode::getId, condition);
+        }
+        if (!Cools.isEmpty(timeRange)) {
+            String[] range = timeRange.split(RANGE_TIME_LINK);
+            wrapper.ge(BasBarcode::getCreateTime, DateUtils.convert(range[0]));
+            wrapper.le(BasBarcode::getCreateTime, DateUtils.convert(range[1]));
+        }
+        return R.ok(basBarcodeService.page(new Page<>(curr, limit), wrapper));
+    }
+
+
+    @RequestMapping(value = "/basBarcode/add/auth")
+    @ManagerAuth
+    public R add(BasBarcode basBarcode) {
+        basBarcodeService.save(basBarcode);
+        return R.ok();
+    }
+
+	@RequestMapping(value = "/basBarcode/update/auth")
+	@ManagerAuth
+    public R update(BasBarcode basBarcode){
+        if (Cools.isEmpty(basBarcode) || null==basBarcode.getId()){
+            return R.error();
+        }
+        basBarcodeService.updateById(basBarcode);
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basBarcode/delete/auth")
+    @ManagerAuth
+    public R delete(@RequestParam(value="ids[]") Long[] ids){
+         for (Long id : ids){
+            basBarcodeService.removeById(id);
+        }
+        return R.ok();
+    }
+
+    @RequestMapping(value = "/basBarcodeQuery/auth")
+    @ManagerAuth
+    public R query(String condition) {
+        LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(BasBarcode::getId, condition);
+        Page<BasBarcode> page = basBarcodeService.page(new Page<>(0, 10), wrapper);
+        List<Map<String, Object>> result = new ArrayList<>();
+        for (BasBarcode basBarcode : page.getRecords()){
+            Map<String, Object> map = new HashMap<>();
+            map.put("id", basBarcode.getId());
+            map.put("value", basBarcode.getId());
+            result.add(map);
+        }
+        return R.ok(result);
+    }
+
+    @RequestMapping("/basBarcode/all/get/kv")
+    @ManagerAuth
+    public R getDataKV(@RequestParam(required = false) String condition) {
+        List<KeyValueVo> vos = new ArrayList<>();
+        LambdaQueryWrapper<BasBarcode> wrapper = new LambdaQueryWrapper<>();
+        if (!Cools.isEmpty(condition)) {
+            wrapper.like(BasBarcode::getId, condition);
+        }
+        basBarcodeService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId())));
+        return R.ok().add(vos);
+    }
+
+    @RequestMapping(value = "/basBarcode/generateBarcode/auth")
+    @ManagerAuth
+    public R generateBarcode(@RequestParam("barcode") String barcode, @RequestParam("num") Integer num) {
+        Long hostId = getHostId();
+        Date now = new Date();
+        int barcodeInt = Integer.parseInt(barcode);
+        for (int i = 0; i < num; i++) {
+            barcodeInt += 1;
+            BasBarcode basBarcode = new BasBarcode();
+            basBarcode.setBarcode(String.valueOf(barcodeInt));
+            basBarcode.setHostId(hostId);
+            basBarcode.setCreateTime(now);
+            basBarcodeService.save(basBarcode);
+        }
+        return R.ok();
+    }
+
+}
diff --git a/zy-asrs-wms/src/main/webapp/static/js/basBarcode/basBarcode.js b/zy-asrs-wms/src/main/webapp/static/js/basBarcode/basBarcode.js
new file mode 100644
index 0000000..fe8b545
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/static/js/basBarcode/basBarcode.js
@@ -0,0 +1,347 @@
+var pageCurr;
+var pageCount = 0;
+var printBarcodes = [];
+layui.config({
+    base: baseUrl + "/static/layui/lay/modules/"
+}).use(['table','laydate', 'form', 'admin', 'xmSelect'], function(){
+    var table = layui.table;
+    var $ = layui.jquery;
+    var layer = layui.layer;
+    var layDate = layui.laydate;
+    var form = layui.form;
+    var admin = layui.admin;
+    var xmSelect = layui.xmSelect;
+
+    // 鏁版嵁娓叉煋
+    tableIns = table.render({
+        elem: '#basBarcode',
+        headers: {token: localStorage.getItem('token')},
+        url: baseUrl+'/basBarcode/page/auth',
+        page: true,
+        limit: 15,
+        limits: [15, 30, 50, 100, 200, 500],
+        toolbar: '#toolbar',
+        cellMinWidth: 50,
+        height: 'full-120',
+        cols: [[
+            {type: 'checkbox'}
+            ,{field: 'id', align: 'center',title: 'ID'}
+            ,{field: 'barcode', align: 'center',title: '鏉$爜鍊�'}
+            ,{field: 'createTime$', align: 'center',title: '鍒涘缓鏃堕棿'}
+            ,{field: 'hostId$', align: 'center',title: '浠撳簱ID'}
+
+            ,{fixed: 'right', title:'鎿嶄綔', align: 'center', toolbar: '#operate', width:120}
+        ]],
+        request: {
+            pageName: 'curr',
+            pageSize: 'limit'
+        },
+        parseData: function (res) {
+            return {
+                'code': res.code,
+                'msg': res.msg,
+                'count': res.data.total,
+                'data': res.data.records
+            }
+        },
+        response: {
+            statusCode: 200
+        },
+        done: function(res, curr, count) {
+            if (res.code === 403) {
+                top.location.href = baseUrl+"/";
+            }
+            pageCurr=curr;pageCount=count;
+            limit();
+        }
+    });
+
+    // 鐩戝惉鎺掑簭浜嬩欢
+    table.on('sort(basBarcode)', function (obj) {
+        var searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        searchData['orderByField'] = obj.field;
+        searchData['orderByType'] = obj.type;
+        tableIns.reload({
+            where: searchData,
+            page: {curr: 1}
+        });
+    });
+
+    // 鐩戝惉澶村伐鍏锋爮浜嬩欢
+    table.on('toolbar(basBarcode)', function (obj) {
+        var checkStatus = table.checkStatus(obj.config.id).data;
+        switch(obj.event) {
+            case 'addData':
+                showEditModel();
+                break;
+            case 'deleteData':
+               if (checkStatus.length === 0) {
+                   layer.msg('璇烽�夋嫨瑕佸垹闄ょ殑鏁版嵁', {icon: 2});
+                   return;
+               }
+               del(checkStatus.map(function (d) {
+                   return d.id;
+               }));
+               break;
+            case 'exportData':
+                admin.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+                    var titles=[];
+                    var fields=[];
+                    obj.config.cols[0].map(function (col) {
+                        if (col.type === 'normal' && col.hide === false && col.toolbar == null) {
+                            titles.push(col.title);
+                            fields.push(col.field);
+                        }
+                    });
+                    var exportData = {};
+                    $.each($('#search-box [name]').serializeArray(), function() {
+                        exportData[this.name] = this.value;
+                    });
+                    var param = {
+                        'basBarcode': exportData,
+                        'fields': fields
+                    };
+                    $.ajax({
+                        url: baseUrl+"/basBarcode/export/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: JSON.stringify(param),
+                        dataType:'json',
+                        contentType:'application/json;charset=UTF-8',
+                        method: 'POST',
+                        success: function (res) {
+                            layer.closeAll();
+                            if (res.code === 200) {
+                                table.exportFile(titles,res.data,'xls');
+                            } else if (res.code === 403) {
+                                top.location.href = baseUrl+"/";
+                            } else {
+                                layer.msg(res.msg, {icon: 2})
+                            }
+                        }
+                    });
+                });
+                break;
+            // 鎵归噺鎵撳嵃
+            case 'btnPrintBatch':
+                printBarcodes = [];
+                var data = checkStatus;
+                if (data.length === 0){
+                    layer.msg('璇烽�夋嫨鎵撳嵃鏁版嵁');
+                } else {
+                    layer.open({
+                        type: 1,
+                        title: '鎵归噺鎵撳嵃 [鏁伴噺'+ data.length +']',
+                        area: ['500px', '500px'],
+                        shadeClose: true,
+                        content: $('#printDataDiv'),
+                        success: function(layero, index){
+                            for (var i = 0; i<data.length;i++) {
+                                printBarcodes.push({
+                                    barcode: data[i].barcode
+                                });
+                            }
+                        },
+                        end: function () {
+                        }
+                    });
+                }
+                break;
+        }
+    });
+
+    // 鐩戝惉琛屽伐鍏蜂簨浠�
+    table.on('tool(basBarcode)', function(obj){
+        var data = obj.data;
+        switch (obj.event) {
+            case 'edit':
+                showEditModel(data);
+                break;
+            case "del":
+                del([data.id]);
+                break;
+        }
+    });
+
+    // 妯℃澘閫夋嫨
+    form.on('radio(selectTemplateRadio)', function (data) {
+        $('.template-preview').hide();
+        $('#template-preview-'+data.value).show();
+    });
+
+    // 寮�濮嬫墦鍗�
+    form.on('submit(doPrint)', function (data) {
+        var templateNo = data.field.selectTemplate;
+        layer.closeAll();
+        for (let i = 0; i < printBarcodes.length; i++) {
+            var templateDom = $("#templatePreview" + templateNo);
+            var className = templateDom.attr("class");
+            if (className === 'template-barcode') {
+                printBarcodes[i]["barcodeUrl"] = baseUrl + "/mac/code/auth?type=1&param=" + printBarcodes[i].barcode;
+            } else {
+                printBarcodes[i]["barcodeUrl"] = baseUrl + "/mac/code/auth?type=2&param=" + printBarcodes[i].barcode;
+            }
+        }
+        console.log(printBarcodes)
+        var tpl = templateDom.html();
+        console.log(tpl)
+        var template = Handlebars.compile(tpl);
+        console.log(template)
+        var html = template({code:200, data: printBarcodes});
+        console.log(html)
+        var box = $("#box");
+        box.html(html);box.show();
+        box.print({mediaPrint:true});
+        box.hide();
+    });
+
+    /* 寮圭獥 - 鏂板銆佷慨鏀� */
+    function showEditModel(mData) {
+        admin.open({
+            type: 1,
+            area: '600px',
+            title: (mData ? '淇敼' : '娣诲姞') + '',
+            content: $('#editDialog').html(),
+            success: function (layero, dIndex) {
+                form.val('detail', mData);
+                layDateRender(mData);
+                form.on('submit(editSubmit)', function (data) {
+                    var loadIndex = layer.load(2);
+                    $.ajax({
+                        url: baseUrl+"/basBarcode/"+(mData?'update':'generateBarcode')+"/auth",
+                        headers: {'token': localStorage.getItem('token')},
+                        data: data.field,
+                        method: 'POST',
+                        success: function (res) {
+                            layer.close(loadIndex);
+                            if (res.code === 200){
+                                layer.close(dIndex);
+                                layer.msg(res.msg, {icon: 1});
+                                tableReload();
+                            } else if (res.code === 403){
+                                top.location.href = baseUrl+"/";
+                            }else {
+                                layer.msg(res.msg, {icon: 2});
+                            }
+                        }
+                    })
+                    return false;
+                });
+                $(layero).children('.layui-layer-content').css('overflow', 'visible');
+                layui.form.render('select');
+            }
+        });
+    }
+
+    /* 鍒犻櫎 */
+    function del(ids) {
+        layer.confirm('纭畾瑕佸垹闄ら�変腑鏁版嵁鍚楋紵', {
+            skin: 'layui-layer-admin',
+            shade: .1
+        }, function (i) {
+            layer.close(i);
+            var loadIndex = layer.load(2);
+            $.ajax({
+                url: baseUrl+"/basBarcode/delete/auth",
+                headers: {'token': localStorage.getItem('token')},
+                data: {ids: ids},
+                method: 'POST',
+                success: function (res) {
+                    layer.close(loadIndex);
+                    if (res.code === 200){
+                        layer.msg(res.msg, {icon: 1});
+                        tableReload();
+                    } else if (res.code === 403){
+                        top.location.href = baseUrl+"/";
+                    } else {
+                        layer.msg(res.msg, {icon: 2});
+                    }
+                }
+            })
+        });
+    }
+
+    // 鎼滅储
+    form.on('submit(search)', function (data) {
+        pageCurr = 1;
+        tableReload(true);
+    });
+
+    // 閲嶇疆
+    form.on('submit(reset)', function (data) {
+        pageCurr = 1;
+        clearFormVal($('#search-box'));
+        tableReload(true);
+    });
+
+    // 鏃堕棿閫夋嫨鍣�
+    function layDateRender(data) {
+        setTimeout(function () {
+            layDate.render({
+                elem: '.layui-laydate-range'
+                ,type: 'datetime'
+                ,range: true
+            });
+            layDate.render({
+                elem: '#createTime\\$',
+                type: 'datetime',
+                value: data!==undefined?data['createTime$']:null
+            });
+
+        }, 100);
+    }
+    layDateRender();
+
+    window.loadHostSel = function () {
+        return xmSelect.render({
+            el: '#hostXmlSel',
+            autoRow: true,
+            filterable: true,
+            remoteSearch: true,
+            radio: true,
+            remoteMethod: function (val, cb, show) {
+                $.ajax({
+                    url: baseUrl + "/host/all/get/kv",
+                    headers: {'token': localStorage.getItem('token')},
+                    data: {
+                        condition: val
+                    },
+                    method: 'POST',
+                    success: function (res) {
+                        if (res.code === 200) {
+                            cb(res.data)
+                        } else {
+                            cb([]);
+                            layer.msg(res.msg, {icon: 2});
+                        }
+                    }
+                });
+            }
+        });
+    }
+
+
+
+});
+
+// 鍏抽棴鍔ㄤ綔
+$(document).on('click','#data-detail-close', function () {
+    parent.layer.closeAll();
+});
+
+function tableReload(search) {
+    if (pageCount === 0 || search) {
+        let searchData = {};
+        $.each($('#search-box [name]').serializeArray(), function() {
+            searchData[this.name] = this.value;
+        });
+        tableIns.reload({
+            where: searchData,
+            page: {curr: pageCurr}
+        });
+    } else {
+        $(".layui-laypage-btn")[0].click();
+    }
+}
diff --git a/zy-asrs-wms/src/main/webapp/views/basBarcode/basBarcode.html b/zy-asrs-wms/src/main/webapp/views/basBarcode/basBarcode.html
new file mode 100644
index 0000000..f86c191
--- /dev/null
+++ b/zy-asrs-wms/src/main/webapp/views/basBarcode/basBarcode.html
@@ -0,0 +1,170 @@
+<!DOCTYPE html>
+<html lang="en">
+<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, maximum-scale=1">
+    <link rel="stylesheet" href="../../static/layui/css/layui.css" media="all">
+    <link rel="stylesheet" href="../../static/css/admin.css?v=318" media="all">
+    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
+</head>
+<body>
+
+<div class="layui-fluid">
+    <div class="layui-card">
+        <div class="layui-card-body">
+            <div class="layui-form toolbar" id="search-box">
+                <div class="layui-form-item">
+                    <div class="layui-inline">
+                        <div class="layui-input-inline">
+                            <input class="layui-input" type="text" name="condition" placeholder="璇疯緭鍏�" autocomplete="off">
+                        </div>
+                    </div>
+                    <div class="layui-inline" style="width: 300px">
+                        <div class="layui-input-inline">
+                            <input class="layui-input layui-laydate-range" name="timeRange" type="text" placeholder="璧峰鏃堕棿 - 缁堟鏃堕棿" autocomplete="off" style="width: 300px">
+                        </div>
+                    </div>
+                    <div class="layui-inline">&emsp;
+                        <button class="layui-btn icon-btn" lay-filter="search" lay-submit>
+                            <i class="layui-icon">&#xe615;</i>鎼滅储
+                        </button>
+                        <button class="layui-btn icon-btn" lay-filter="reset" lay-submit>
+                            <i class="layui-icon">&#xe666;</i>閲嶇疆
+                        </button>
+                    </div>
+                </div>
+            </div>
+            <table class="layui-hide" id="basBarcode" lay-filter="basBarcode"></table>
+        </div>
+    </div>
+</div>
+
+<script type="text/html" id="toolbar">
+    <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm" id="btn-btnPrintBatch" lay-event="btnPrintBatch">鎵归噺鎵撳嵃</button>
+        <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">鐢熸垚鏉$爜</button>
+        <button class="layui-btn layui-btn-sm layui-btn-danger" id="btn-delete" lay-event="deleteData">鍒犻櫎</button>
+        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData" style="float: right">瀵煎嚭</button>
+    </div>
+</script>
+
+<script type="text/html" id="operate">
+    <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="edit">淇敼</a>
+    <a class="layui-btn layui-btn-danger layui-btn-xs btn-edit" lay-event="del">鍒犻櫎</a>
+</script>
+
+<!-- 鎵撳嵃鎿嶄綔寮圭獥 -->
+<div id="printDataDiv" style="display: none;padding: 20px">
+    <div class="layui-form" style="text-align: center">
+        <hr>
+        <!--鍗曢�夋-->
+        <div class="layui-form-item" style="display: inline-block; margin-bottom: 10px">
+            <input type="radio" name="selectTemplate" value="1" title="妯℃澘涓�" lay-filter="selectTemplateRadio" checked="">
+            <input type="radio" name="selectTemplate" value="2" title="妯℃澘浜�" lay-filter="selectTemplateRadio">
+        </div>
+        <fieldset class="layui-elem-field site-demo-button" style="margin-top: 30px;text-align: left;">
+            <legend>鎵撳嵃棰勮</legend>
+            <div id="template-container" style="margin: 20px;text-align: center">
+
+                <!-- 棰勮鍥� 1 -->
+                <div id="template-preview-1" class="template-preview" style="display: inline-block">
+                    <div class="barcode">
+                        <img class="template-code template-barcode" src="">
+                        <div style="letter-spacing: 2px;margin-top: 1px; text-align: center;">
+                            <span>xxxxxx</span>
+                        </div>
+                    </div>
+                </div>
+
+                <!-- 棰勮鍥� 2 -->
+                <div id="template-preview-2" class="template-preview" style="display: none">
+                    <div>
+                        <img class="template-code template-qrcode" src="">
+                        <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
+                            <span>xxxxxx</span>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </fieldset>
+
+        <button class="layui-btn" id="doPrint" lay-submit lay-filter="doPrint" style="margin-top: 20px">纭畾</button>
+    </div>
+</div>
+
+<script type="text/javascript" src="../../static/js/jquery/jquery-3.3.1.min.js"></script>
+<script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/jquery/jQuery.print.js"></script>
+<script type="text/javascript" src="../../static/js/handlebars/handlebars-v4.5.3.js"></script>
+<script type="text/javascript" src="../../static/js/common.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/cool.js" charset="utf-8"></script>
+<script type="text/javascript" src="../../static/js/basBarcode/basBarcode.js" charset="utf-8"></script>
+</body>
+
+<div id="box" style="display: block"></div>
+
+<!-- 鍒濆鍖栨墦鍗版ā鏉跨殑鏉″舰鐮� -->
+<script type="text/javascript">
+    $('.template-barcode').attr("src", baseUrl + "/mac/code/auth?type=1&param=123123123");
+    $('.template-qrcode').attr("src", baseUrl + "/mac/code/auth?type=2&param=123123123");
+</script>
+
+<!-- 妯℃澘寮曟搸 -->
+<!-- 妯℃澘1 -->
+<script type="text/template" id="templatePreview1" class="template-barcode">
+    {{#each data}}
+    <div class="barcode" style="margin-top: 20px;width: 200px;text-align: center;">
+        <div>
+            <img class="template-code template-barcode" src="{{this.barcodeUrl}}" width="100%">
+        </div>
+        <div style="letter-spacing: 2px;margin-top: 1px;">
+            <span>{{this.barcode}}</span>
+        </div>
+    </div>
+    {{/each}}
+</script>
+<!-- 妯℃澘2 -->
+<script type="text/template" id="templatePreview2" class="template-qrcode">
+    {{#each data}}
+    <div style="margin-top: 20px;width: 200px;text-align: center;">
+        <img class="template-code template-qrcode" src="{{this.barcodeUrl}}">
+        <div style="letter-spacing: 1px;margin-top: 1px; text-align: center">
+            <span>{{this.barcode}}</span>
+        </div>
+    </div>
+    {{/each}}
+</script>
+
+<!-- 琛ㄥ崟寮圭獥 -->
+<script type="text/html" id="editDialog">
+    <div id="detail" lay-filter="detail" class="layui-form admin-form model-form">
+        <input name="id" type="hidden">
+        <div class="layui-row">
+            <div class="layui-col-md12">
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鏉$爜璧峰鍊�: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="barcode" placeholder="璇疯緭鍏ユ潯鐮佽捣濮嬪��">
+                    </div>
+                </div>
+                <div class="layui-form-item">
+                    <label class="layui-form-label">鐢熸垚鏁伴噺: </label>
+                    <div class="layui-input-block">
+                        <input class="layui-input" name="num" placeholder="璇疯緭鍏ョ敓鎴愭暟閲�">
+                    </div>
+                </div>
+
+             </div>
+        </div>
+        <hr class="layui-bg-gray">
+        <div class="layui-form-item text-right">
+            <button class="layui-btn" lay-filter="editSubmit" lay-submit="">鐢熸垚</button>
+            <button class="layui-btn layui-btn-primary" type="button" ew-event="closeDialog">鍙栨秷</button>
+        </div>
+    </div>
+</script>
+</html>
+

--
Gitblit v1.9.1