联调

dubin

昨天 0ab29c6d89777a832e21c5d2934e3e3e1544c6d8

联调

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

@@ -171,15 +171,15 @@
    }

    /*物料托盘绑定*/
//    @RequestMapping(value = "/mat/barcode/auth")
//    @ManagerAuth
//    public R addBarcodeMatnr(Mat mat) {
//        if (Cools.isEmpty(mat.getUnit())){
//            return R.error(BaseRes.PARAM);
//        }
//        matBarcodeService.addBarcodeMatnrTwo(mat);
//        return R.ok();
//    }
    @RequestMapping(value = "/mat/barcode/auth")
    @ManagerAuth
    public R addBarcodeMatnr(Mat mat) {
        if (Cools.isEmpty(mat.getUnit())){
            return R.error(BaseRes.PARAM);
        }
        matBarcodeService.addBarcodeMatnrTwo(mat);
        return R.ok();
    }

    @RequestMapping(value = "/mat/delete/auth")
    @ManagerAuth

 src/main/java/com/zy/asrs/service/impl/WorkServiceImpl.java

@@ -934,7 +934,7 @@
        String locNo = ""; // 待修改目标库位
        String locSts = ""; // 待修改目标库位状态
        // 入库取消（修改目标库位）
        if (wrkMast.getWrkSts() < 4) {
        if (wrkMast.getWrkSts() < 4 || (wrkMast.getWrkSts()>= 103 && wrkMast.getWrkSts() <= 105)) {
            locNo = wrkMast.getLocNo();
            locSts = "O";

@@ -951,7 +951,7 @@
                locMastService.updateById(locMast);
            }
            // 出库取消（修改源库位）
        } else if (wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14) {
        } else if ((wrkMast.getWrkSts() > 10 && wrkMast.getWrkSts() != 14)) {
            locNo = wrkMast.getSourceLocNo();
            // 出库 ===>> F.在库
            if (wrkMast.getIoType() > 100 && wrkMast.getIoType() != 110) {

 src/main/webapp/static/js/mat/mat.js

@@ -315,71 +315,71 @@
        });
    }

    // /* 显示表单弹窗 */
    // function showEditModelBarcode(mData) {
    //     admin.open({
    //         type: 1,
    //         area: '600px',
    //         title: '绑定商品',
    //         content: $('#editDialogBarcode').html(),
    //         success: function (layero, dIndex) {
    //             // 回显表单数据
    //             form.val('detail', mData);
    //             // 表单提交事件
    //             form.on('submit(editSubmit)', function (data) {
    //                 console.log(data)
    //                 data.field.tagId = insXmSel.getValue('valueStr');
    //                 if (isEmpty(data.field.tagId)) {
    //                     layer.msg('分类不能为空', {icon: 2});
    //                     return false;
    //                 }
    //                 var loadIndex = layer.load(2);
    //                 $.ajax({
    //                     url: baseUrl+"/mat/barcode/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});
    //                             $(".layui-laypage-btn")[0].click();
    //                         } else if (res.code === 403){
    //                             top.location.href = baseUrl+"/";
    //                         }else {
    //                             layer.msg(res.msg, {icon: 2});
    //                         }
    //                     }
    //                 })
    //                 return false;
    //             });
    //             // 渲染下拉树
    //             var insXmSel = xmSelect.render({
    //                 el: '#tagSelBarcode',
    //                 height: '250px',
    //                 data: insTb.options.data,
    //                 initValue: mData ? [mData.tagId] : [],
    //                 model: {label: {type: 'text'}},
    //                 prop: {
    //                     name: 'name',
    //                     value: 'id'
    //                 },
    //                 radio: true,
    //                 clickClose: true,
    //                 tree: {
    //                     show: true,
    //                     indent: 15,
    //                     strict: false,
    //                     expandedKeys: true
    //                 }
    //             });
    //             // 弹窗不出现滚动条
    //             $(layero).children('.layui-layer-content').css('overflow', 'visible');
    //             layui.form.render('select');
    //         }
    //     });
    // }
    /* 显示表单弹窗 */
    function showEditModelBarcode(mData) {
        admin.open({
            type: 1,
            area: '600px',
            title: '绑定商品',
            content: $('#editDialogBarcode').html(),
            success: function (layero, dIndex) {
                // 回显表单数据
                form.val('detail', mData);
                // 表单提交事件
                form.on('submit(editSubmit)', function (data) {
                    console.log(data)
                    data.field.tagId = insXmSel.getValue('valueStr');
                    if (isEmpty(data.field.tagId)) {
                        layer.msg('分类不能为空', {icon: 2});
                        return false;
                    }
                    var loadIndex = layer.load(2);
                    $.ajax({
                        url: baseUrl+"/mat/barcode/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});
                                $(".layui-laypage-btn")[0].click();
                            } else if (res.code === 403){
                                top.location.href = baseUrl+"/";
                            }else {
                                layer.msg(res.msg, {icon: 2});
                            }
                        }
                    })
                    return false;
                });
                // 渲染下拉树
                var insXmSel = xmSelect.render({
                    el: '#tagSelBarcode',
                    height: '250px',
                    data: insTb.options.data,
                    initValue: mData ? [mData.tagId] : [],
                    model: {label: {type: 'text'}},
                    prop: {
                        name: 'name',
                        value: 'id'
                    },
                    radio: true,
                    clickClose: true,
                    tree: {
                        show: true,
                        indent: 15,
                        strict: false,
                        expandedKeys: true
                    }
                });
                // 弹窗不出现滚动条
                $(layero).children('.layui-layer-content').css('overflow', 'visible');
                layui.form.render('select');
            }
        });
    }

    // 模板选择
    form.on('radio(selectTemplateRadio)', function (data) {

 src/main/webapp/views/mat/mat.html

@@ -148,7 +148,7 @@

<script type="text/html" id="operate">
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="edit">修改</a>
<!--    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">绑定</a>-->
    <a class="layui-btn layui-btn-xs btn-edit layui-btn-primary" lay-event="editBarcode">绑定</a>
    <button class="layui-btn layui-btn-xs btn-print" lay-event="btnPrint">打印</button>
</script>

@@ -273,121 +273,121 @@



<!--&lt;!&ndash; 表单弹窗 &ndash;&gt;-->
<!--<script type="text/html" id="editDialogBarcode">-->
<!--    <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">-->
<!--        <input name="id" type="hidden">-->
<!--        <input name="uuid" type="hidden">-->
<!--        <input name="nodeId" type="hidden">-->
<!--        <input name="tag_id" type="hidden">-->
<!--        <input name="model" type="hidden">-->
<!--        <input name="name" type="hidden">-->
<!--        <input name="batch" type="hidden">-->
<!--        <input name="docId" type="hidden">-->
<!--        <input name="docNum" type="hidden">-->
<!--        <input name="custName" type="hidden">-->
<!--        <input name="itemNum" type="hidden">-->
<!--        <input name="count" type="hidden">-->
<!--        <input name="weight" type="hidden">-->
<!--        <input name="status" type="hidden">-->
<!--        <input name="createBy" type="hidden">-->
<!--        <input name="updateTime$" type="hidden">-->
<!--        <input name="updateBy" type="hidden">-->
<!--        <div class="layui-row">-->
<!-- 表单弹窗 -->
<script type="text/html" id="editDialogBarcode">
    <form id="detailBarcode" lay-filter="detail" class="layui-form admin-form">
        <input name="id" type="hidden">
        <input name="uuid" type="hidden">
        <input name="nodeId" type="hidden">
        <input name="tag_id" type="hidden">
        <input name="model" type="hidden">
        <input name="name" type="hidden">
        <input name="batch" type="hidden">
        <input name="docId" type="hidden">
        <input name="docNum" type="hidden">
        <input name="custName" type="hidden">
        <input name="itemNum" type="hidden">
        <input name="count" type="hidden">
        <input name="weight" type="hidden">
        <input name="status" type="hidden">
        <input name="createBy" type="hidden">
        <input name="updateTime$" type="hidden">
        <input name="updateBy" type="hidden">
        <div class="layui-row">

<!--            <div class="layui-col-md6">-->
            <div class="layui-col-md6">

                <div class="layui-form-item">
                    <label class="layui-form-label">分类</label>
                    <div class="layui-input-block">
                        <div id="tagSelBarcode" class="ew-xmselect-tree"></div>
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label layui-form-required">型材型号</label>
                    <div class="layui-input-block">
                        <input name="maktx" placeholder="请输入型材型号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">模具名称</label>
                    <div class="layui-input-block">
                        <input name="matnr" placeholder="请输入模具名称" class="layui-input">
                    </div>
                </div>

                <div class="layui-form-item">
                    <label class="layui-form-label">套号</label>
                    <div class="layui-input-block">
                        <input name="name" placeholder="请输入套号" class="layui-input">
                    </div>
                </div>

                <!--                <div class="layui-form-item">-->
                <!--                    <label class="layui-form-label">开模壁厚</label>-->
                <!--                    <div class="layui-input-block">-->
                <!--                        <input name="volume" placeholder="请输入开模壁厚" class="layui-input">-->
                <!--                    </div>-->
                <!--                </div>-->

            </div>

            <div class="layui-col-md6">
                <!--                <div class="layui-form-item">-->
                <!--                    <label class="layui-form-label layui-form-required">模具名称</label>-->
                <!--                    <div class="layui-input-block">-->
                <!--                        <input id="matnr" name="matnr" placeholder="请输入模具名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
                <!--                    </div>-->
                <!--                </div>-->

                <div class="layui-form-item">
                    <label class="layui-form-label">规格</label>
                    <div class="layui-input-block">
                        <input name="specs" placeholder="请输入代码" class="layui-input">
                    </div>
                </div>
                <div class="layui-form-item">
                    <label class="layui-form-label">托盘码</label>
                    <div class="layui-input-block">
                        <input name="unit" placeholder="请输入托盘码" class="layui-input">
                    </div>
                </div>

                <!--                <div class="layui-form-item">-->
                <!--                    <label class="layui-form-label">备注</label>-->
                <!--                    <div class="layui-input-block">-->
                <!--                        <input name="memo" placeholder="请输入备注" class="layui-input">-->
                <!--                    </div>-->
                <!--                </div>-->

                                <div class="layui-form-item">
                                    <label class="layui-form-label">状态</label>
                                    <div class="layui-input-block">
                                        <input name="color" placeholder="" class="layui-input">
                                    </div>
                                </div>
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">分类</label>-->
<!--                    <label class="layui-form-label">状态</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <div id="tagSelBarcode" class="ew-xmselect-tree"></div>-->
<!--                        <select id="colorBarcode" name="color" lay-filter="color" placeholder="请选择状态">-->
<!--                            <option value="">请选择状态</option>-->
<!--                            <option value="正常" name="color" class="layui-input">正常</option>-->
<!--                            <option value="报废" name="color" class="layui-input">报废</option>-->
<!--                        </select>-->
<!--                    </div>-->
<!--                </div>-->

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label layui-form-required">型材型号</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="maktx" placeholder="请输入型材型号" class="layui-input" lay-vertype="tips" lay-verify="required" required="">-->
<!--                    </div>-->
<!--                </div>-->

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">模具名称</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="matnr" placeholder="请输入模具名称" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">套号</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="name" placeholder="请输入套号" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->

<!--                &lt;!&ndash;                <div class="layui-form-item">&ndash;&gt;-->
<!--                &lt;!&ndash;                    <label class="layui-form-label">开模壁厚</label>&ndash;&gt;-->
<!--                &lt;!&ndash;                    <div class="layui-input-block">&ndash;&gt;-->
<!--                &lt;!&ndash;                        <input name="volume" placeholder="请输入开模壁厚" class="layui-input">&ndash;&gt;-->
<!--                &lt;!&ndash;                    </div>&ndash;&gt;-->
<!--                &lt;!&ndash;                </div>&ndash;&gt;-->

<!--            </div>-->

<!--            <div class="layui-col-md6">-->
<!--                &lt;!&ndash;                <div class="layui-form-item">&ndash;&gt;-->
<!--                &lt;!&ndash;                    <label class="layui-form-label layui-form-required">模具名称</label>&ndash;&gt;-->
<!--                &lt;!&ndash;                    <div class="layui-input-block">&ndash;&gt;-->
<!--                &lt;!&ndash;                        <input id="matnr" name="matnr" placeholder="请输入模具名称" class="layui-input" lay-vertype="tips" lay-verify="required" required="">&ndash;&gt;-->
<!--                &lt;!&ndash;                    </div>&ndash;&gt;-->
<!--                &lt;!&ndash;                </div>&ndash;&gt;-->

<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">规格</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="specs" placeholder="请输入代码" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->
<!--                <div class="layui-form-item">-->
<!--                    <label class="layui-form-label">托盘码</label>-->
<!--                    <div class="layui-input-block">-->
<!--                        <input name="unit" placeholder="请输入托盘码" class="layui-input">-->
<!--                    </div>-->
<!--                </div>-->

<!--                &lt;!&ndash;                <div class="layui-form-item">&ndash;&gt;-->
<!--                &lt;!&ndash;                    <label class="layui-form-label">备注</label>&ndash;&gt;-->
<!--                &lt;!&ndash;                    <div class="layui-input-block">&ndash;&gt;-->
<!--                &lt;!&ndash;                        <input name="memo" placeholder="请输入备注" class="layui-input">&ndash;&gt;-->
<!--                &lt;!&ndash;                    </div>&ndash;&gt;-->
<!--                &lt;!&ndash;                </div>&ndash;&gt;-->

<!--                                <div class="layui-form-item">-->
<!--                                    <label class="layui-form-label">状态</label>-->
<!--                                    <div class="layui-input-block">-->
<!--                                        <input name="color" placeholder="" class="layui-input">-->
<!--                                    </div>-->
<!--                                </div>-->
<!--&lt;!&ndash;                <div class="layui-form-item">&ndash;&gt;-->
<!--&lt;!&ndash;                    <label class="layui-form-label">状态</label>&ndash;&gt;-->
<!--&lt;!&ndash;                    <div class="layui-input-block">&ndash;&gt;-->
<!--&lt;!&ndash;                        <select id="colorBarcode" name="color" lay-filter="color" placeholder="请选择状态">&ndash;&gt;-->
<!--&lt;!&ndash;                            <option value="">请选择状态</option>&ndash;&gt;-->
<!--&lt;!&ndash;                            <option value="正常" name="color" class="layui-input">正常</option>&ndash;&gt;-->
<!--&lt;!&ndash;                            <option value="报废" name="color" class="layui-input">报废</option>&ndash;&gt;-->
<!--&lt;!&ndash;                        </select>&ndash;&gt;-->
<!--&lt;!&ndash;                    </div>&ndash;&gt;-->
<!--&lt;!&ndash;                </div>&ndash;&gt;-->

<!--            </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>-->
<!--    </form>-->
<!--</script>-->
            </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>
    </form>
</script>

<!-- 打印操作弹窗 -->
<div id="printDataDiv" style="display: none;padding: 20px">