自动化立体仓库 - WMS系统
#
luxiaotao1123
2020-07-02 1064200ae079272bbe8fe10c9ca5f3f86d954227
#
2个文件已修改
76 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/TrayCodeController.java 47 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/trayCode/tray.html 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/TrayCodeController.java
@@ -10,16 +10,14 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.core.exception.CoolException;
import com.zy.asrs.entity.TrayCode;
import com.zy.asrs.service.TrayCodeService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;
@RestController
public class TrayCodeController extends BaseController {
@@ -126,4 +124,45 @@
        return R.ok();
    }
    @RequestMapping(value = "/trayCode/print/preview")
    @ManagerAuth
    public R printPreview(@RequestParam String startNo,
                   @RequestParam Integer count,
                   @RequestParam Integer type) {
        if (count <= 0) {
            return R.error("数量必须大于零");
        }
        List<String> res = new ArrayList<>();
        for (int i = 0; i<count; i++) {
            res.add(String.valueOf(Integer.parseInt(startNo)+i));
        }
        return R.ok().add(res);
    }
    @RequestMapping(value = "/trayCode/print/auth")
    @ManagerAuth(memo = "托盘码打印")
    public R print(@RequestParam String startNo,
                  @RequestParam Integer count,
                  @RequestParam Integer type){
        if (count <= 0) {
            return R.error("数量必须大于零");
        }
        for (int i = 0; i<count; i++) {
            TrayCode trayCode = new TrayCode(
                    String.valueOf(Integer.parseInt(startNo)+i),    // 序列号[非空]
                    i==0?"Y":"N",    // 起始
                    i==count-1?"Y":"N",    // 终止
                    null,    // 备注
                    new Date(),    // 修改时间
                    getUserId(),    // 修改人员
                    new Date(),    // 添加时间
                    getUserId()    // 添加人员
            );
            if (!trayCodeService.insert(trayCode)) {
                throw new CoolException("保存序列号失败");
            }
        }
        return R.ok();
    }
}
src/main/webapp/views/trayCode/tray.html
@@ -10,12 +10,6 @@
    <link rel="stylesheet" href="../../static/css/cool.css" media="all">
    <link rel="stylesheet" href="../../static/css/common.css" media="all">
    <link rel="stylesheet" href="../../static/css/print.css" media="all">
    <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>
    <style>
        .layui-form {
            padding: 25px 30px 0 0;
@@ -42,6 +36,9 @@
            text-align: right;
            margin: 20px 0;
        }
        .layui-form-radio>i:hover, .layui-form-radioed>i {
            color: #007bff;
        }
        .layui-btn {
            height: 36px;
            line-height: 36px;
@@ -64,14 +61,14 @@
    <div class="layui-form-item">
        <label class="layui-form-label layui-form-required">数量:</label>
        <div class="layui-input-block">
            <input name="count" placeholder="请输入数量" class="layui-input" lay-verify="required|number" autocomplete="off">
            <input 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="sex" value="1" title="条形码" checked="">
            <input type="radio" name="sex" value="2" title="二维码">
            <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">
@@ -80,12 +77,22 @@
    </div>
</form>
</body>
<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>
    layui.use(['form'], function() {
        var $ = layui.jquery;
        var form = layui.form;
        let $ = layui.jquery;
        let form = layui.form;
        form.on('submit(print)', function (data) {
            http.post(baseUrl + '/trayCode/print/preview', data.field, function (res) {
                console.log(res.data)
            })
        });
        $('#cancel').click(function () {