自动化立体仓库 - WMS系统
parent: fdf4cd24 | 补丁 | 提交 | ignore whitespace
#
zjj
2024-06-08 baad0e3b42362d153d1341cf350bb2627eae60e6 
#
4个文件已修改
184 ■■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/StaDescController.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/static/js/wrkMast/wrkMast.js 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/wrkMast/wrkMast.html 1 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/webapp/views/wrkMast/wrkMast_detail.html 163 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 src/main/java/com/zy/asrs/controller/StaDescController.java


@@ -41,7 +41,7 @@


            String[] startStaList = param.getStartStaList().split(";");


            String[] endStaList = param.getEndStaList().split(";");


            List<StaDesc> staDescList = new ArrayList<>();


            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH);


            SqlSession sqlSession = sqlSessionFactory.openSession(ExecutorType.BATCH,false);


            StaDescMapper sqlSessionMapper = sqlSession.getMapper(StaDescMapper.class);


            for (String startSta : startStaList){


                for (String endSta : endStaList){




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


@@ -346,6 +346,24 @@


                layer.confirm('任务发送空操作异常！是否。。。。。。。。？', {title: '工作号：'+data.wrkNo, shadeClose: true}, function(){


                });


                break;


            case 'priWrkMast':


                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;


        }


    });






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


@@ -122,6 +122,7 @@


    <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>


    <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="priWrkMast">维护状态</a>


    {{#if (d.ioType === 103) { }}


        <a class="layui-btn layui-btn-warm layui-btn-xs btn-pick" lay-event="pick">拣</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,18 +14,18 @@




<!-- 详情 -->


<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%;">


        <div class="layui-inline">


            <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-input-inline cool-auto-complete" style="height: 200px">


                <input id="wrkSts" class="layui-input" name="wrk_sts" type="text" placeholder="请输入" autocomplete="off" 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="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">


@@ -33,156 +33,13 @@


                </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">


            温馨提示：大于10的工作状态请查看  基础数据<span style="font-weight: 900;color: black">→</span>工作状态


        </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>