自动化立体仓库 - WMS系统
parent: 04be6aec | 补丁 | 提交 | ignore whitespace
lsh
2024-09-09 5495ff9d968cb582c6b54324e74e92c0b3597ff2 
#优化
4个文件已修改
204 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/WrkMastController.java 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/wrkMast/wrkMast.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/wrkMast/wrkMast.html 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/wrkMast/wrkMast_detail.html 169 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/zy/asrs/controller/WrkMastController.java


@@ -10,6 +10,7 @@


import com.core.common.Cools;


import com.core.common.DateUtils;


import com.core.common.R;


import com.zy.asrs.entity.BasWrkStatus;


import com.zy.asrs.entity.WrkMast;


import com.zy.asrs.service.WrkMastService;


import com.zy.common.web.BaseController;


@@ -128,6 +129,20 @@


        }


        return R.ok(result);


    }


    @RequestMapping(value = "/sheetWrkMastQuery/auth")


    @ManagerAuth


    public R querySheet(String condition) {


        List<Map<String, Object>> result = new ArrayList<>();


        for (int i = 0;i<6;i++){


            WrkMast wrkMast = new WrkMast();


            wrkMast.setSheetNo(String.valueOf(i));


            Map<String, Object> map = new HashMap<>();


            map.put("id", wrkMast.getSheetNo());


            map.put("value", wrkMast.getSheetNo$());


            result.add(map);


        }


        return R.ok(result);


    }




    @RequestMapping(value = "/wrkMast/check/column/auth")


    @ManagerAuth




 src/main/webapp/static/js/wrkMast/wrkMast.js


@@ -274,6 +274,24 @@


    table.on('tool(wrkMast)', function(obj){


        let data = obj.data;


        switch (obj.event) {


            case 'upSheetNo':


                layer.open({


                    type: 2,


                    title: '修改工作档的机械臂相关参数',


                    maxmin: true,


                    area: ['500px', top.detailHeight],


                    shadeClose: false,


                    content: 'wrkMast_detail.html',


                    success: function(layero, index){


                        layer.getChildFrame('#data-detail-submit-save', index).hide();


                        setFormVal(layer.getChildFrame('#detail', index), data, false);


                        top.convertDisabled(layer.getChildFrame('#locNo', index), true);


                        layer.iframeAuto(index);layer.style(index, {top: (($(window).height()-layer.getChildFrame('#data-detail', index).height())/3)+"px"});


                        layero.find('iframe')[0].contentWindow.layui.form.render('select');


                        layero.find('iframe')[0].contentWindow.layui.form.render('checkbox');


                    }


                });


                break;


            // 明细展示


            case 'detlShow':


                wrkNo = data.wrkNo;




 src/main/webapp/views/wrkMast/wrkMast.html


@@ -97,6 +97,7 @@


</div>


<script type="text/html" id="toolbar">


    <div class="layui-btn-container">


        <button class="layui-btn layui-btn-normal" id="btn-update-sheet-no" lay-event="upSheetNo"><i class="layui-icon">&#xe624;</i>sheet</button>


        <button class="layui-btn layui-btn-normal" id="btn-pri-add" lay-event="priAdd"><i class="layui-icon">&#xe624;</i>增加优先级</button>


        <button class="layui-btn layui-btn-normal" id="btn-pri-red" lay-event="priRed"><i class="layui-icon">&#xe67e;</i>降低优先级</button>


        <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button>


@@ -119,6 +120,7 @@


    {{#if (d.takeNone === 'Y' && d.wrkSts === 12) { }}


    <a class="layui-btn layui-btn-danger layui-btn-xs btn-error" lay-event="takeNone">空操作</a>


    {{# } }}


    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="upSheetNo">arm</a>


    <a class="layui-btn layui-btn-xs btn-detlShow" lay-event="detlShow">明细</a>


    <a class="layui-btn layui-btn-danger layui-btn-xs btn-complete" lay-event="complete">完成</a>


    <a class="layui-btn layui-btn-primary layui-btn-xs btn-cancel" lay-event="cancel">取消</a>




 src/main/webapp/views/wrkMast/wrkMast_detail.html


@@ -1,5 +1,5 @@


<!DOCTYPE html>


<html lang="en">


<html lang="en" xmlns="http://www.w3.org/1999/html">


<head>


    <meta charset="utf-8">


    <title></title>


@@ -14,175 +14,32 @@




<!-- 详情 -->


<div id="data-detail" class="layer_self_wrap">


    <form id="detail" class="layui-form">


        <div class="layui-inline"  style="width:31%;">


    <form id="detail" class="layui-form" style="height: 100%">


        <div class="layui-inline"  >


            <label class="layui-form-label"><span class="not-null">*</span>工 作 号：</label>


            <div class="layui-input-inline">


                <input id="wrkNo" class="layui-input" type="text" onkeyup="check(this.id, 'wrkMast')">


                <input id="wrkNo" class="layui-input" disabled =“disabled” onkeyup="check(this.id, 'wrkMast')">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">工作状态：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="wrkSts" class="layui-input" type="text" style="display: none">


                <input id="wrkSts$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


        <div class="layui-inline">


            <label class="layui-form-label">机械臂：</label>


            <div class="layui-input-inline cool-auto-complete" style="height: 200px">


                <input id="sheetNo" class="layui-input" name="sheet_no" type="text" placeholder="请输入" autocomplete="off" style="display: none">


                <input id="sheetNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="工作状态" onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="basWrkStatusQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="basWrkStatusQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    <input class="cool-auto-complete-window-input" data-key="sheetWrkMastQueryBywrkSts" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="sheetWrkMastQueryBywrkStsSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">入出库类型：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="ioType" class="layui-input" type="text" style="display: none">


                <input id="ioType$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="basWrkIotypeQueryByioType" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryByioTypeSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        <div id="prompt">


            温馨提示：请谨慎修改！！！


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">堆 垛 机：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="crnNo" class="layui-input" type="text" style="display: none">


                <input id="crnNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="basCrnpQueryBycrnNo" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="basCrnpQueryBycrnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">优 先 级：</label>


            <div class="layui-input-inline">


                <input id="ioPri" class="layui-input" type="text">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">目标库位：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="locNo" class="layui-input" type="text" style="display: none">


                <input id="locNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="locMastQueryBylocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBylocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">目 标 站：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="staNo" class="layui-input" type="text" style="display: none">


                <input id="staNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="basDevpQueryBystaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">源　　站：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="sourceStaNo" class="layui-input" type="text" style="display: none">


                <input id="sourceStaNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="basDevpQueryBysourceStaNo" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="basDevpQueryBysourceStaNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">源 库 位：</label>


            <div class="layui-input-inline cool-auto-complete">


                <input id="sourceLocNo" class="layui-input" type="text" style="display: none">


                <input id="sourceLocNo$" class="layui-input cool-auto-complete-div" onclick="autoShow(this.id)" type="text" placeholder="请输入..." onfocus=this.blur()>


                <div class="cool-auto-complete-window">


                    <input class="cool-auto-complete-window-input" data-key="locMastQueryBysourceLocNo" onkeyup="autoLoad(this.getAttribute('data-key'))">


                    <select class="cool-auto-complete-window-select" data-key="locMastQueryBysourceLocNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">


                    </select>


                </div>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">拣　　料：</label>


            <div class="layui-input-inline">


                <input id="picking" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">退　　出：</label>


            <div class="layui-input-inline">


                <input id="exitMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">空　　板：</label>


            <div class="layui-input-inline">


                <input id="emptyMk" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">工作时间：</label>


            <div class="layui-input-inline">


                <input id="ioTime$" class="layui-input" type="text" autocomplete="off">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label" style="font-size: x-small">堆垛机启动时间：</label>


            <div class="layui-input-inline">


                <input id="crnStrTime$" class="layui-input" type="text" autocomplete="off">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label" style="font-size: x-small">堆垛机停止时间：</label>


            <div class="layui-input-inline">


                <input id="crnEndTime$" class="layui-input" type="text" autocomplete="off">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">拣料时间：</label>


            <div class="layui-input-inline">


                <input id="refIotime$" class="layui-input" type="text" autocomplete="off">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">备　　注：</label>


            <div class="layui-input-inline">


                <input id="memo" class="layui-input" type="text">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">条　　码：</label>


            <div class="layui-input-inline">


                <input id="barcode" class="layui-input" type="text">


            </div>


        </div>


        <div class="layui-inline"  style="width:31%;">


            <label class="layui-form-label">满　　板：</label>


            <div class="layui-input-inline">


                <input id="fullPlt" class="layui-input" type="checkBox" lay-skin="primary" lay-filter='detailCheckbox'>


            </div>


        </div>






        <hr class="layui-bg-gray">




        <div id="data-detail-btn" class="layui-btn-container layui-form-item">


            <div id="data-detail-submit-save" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="save">保存</div>


            <div id="data-detail-submit-edit" type="button" class="layui-btn layui-btn-normal" lay-submit lay-filter="edit">修改</div>


            <div id="data-detail-close" type="button" class="layui-btn" lay-submit lay-filter="close">关闭</div>


        </div>




        <div id="prompt">


            温馨提示：请仔细填写相关信息，<span class="extrude"><span class="not-null">*</span> 为必填选项。</span>


        </div>


    </form>


</div>