src/main/java/com/zy/asrs/controller/StaDescController.java | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/staDesc/staDesc.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
src/main/webapp/views/staDesc/staDesc_detail.html | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
src/main/java/com/zy/asrs/controller/StaDescController.java
New file @@ -0,0 +1,141 @@ package com.zy.asrs.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; import com.core.common.Cools; import com.core.common.DateUtils; import com.core.common.R; import com.zy.asrs.entity.StaDesc; import com.zy.asrs.service.StaDescService; import com.zy.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @RestController public class StaDescController extends BaseController { @Autowired private StaDescService staDescService; @RequestMapping(value = "/staDesc/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(staDescService.selectById(String.valueOf(id))); } @RequestMapping(value = "/staDesc/list/auth") @ManagerAuth public R list(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam(required = false)String orderByField, @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ excludeTrash(param); EntityWrapper<StaDesc> wrapper = new EntityWrapper<>(); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(staDescService.selectPage(new Page<>(curr, limit), wrapper)); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ for (Map.Entry<String, Object> entry : map.entrySet()){ String val = String.valueOf(entry.getValue()); if (val.contains(RANGE_TIME_LINK)){ String[] dates = val.split(RANGE_TIME_LINK); wrapper.ge(entry.getKey(), DateUtils.convert(dates[0])); wrapper.le(entry.getKey(), DateUtils.convert(dates[1])); } else { wrapper.like(entry.getKey(), val); } } } @RequestMapping(value = "/staDesc/add/auth") @ManagerAuth(memo = "站点路径添加") public R add(StaDesc staDesc) { int sameRes = staDescService.selectCount(new EntityWrapper<StaDesc>() .eq("type_no", staDesc.getTypeNo()) .eq("stn_no", staDesc.getStnNo()) .eq("crn_no", staDesc.getCrnNo()) .eq("crn_stn", staDesc.getCrnStn())); if (sameRes > 0) { return R.error("路径已存在"); } staDesc.setModiUser(getUserId()); staDesc.setModiTime(new Date()); staDesc.setAppeUser(getUserId()); staDesc.setAppeTime(new Date()); staDescService.insert(staDesc); return R.ok(); } @RequestMapping(value = "/staDesc/update/auth") @ManagerAuth(memo = "站点路径修改") public R update(StaDesc staDesc){ if (Cools.isEmpty(staDesc) || null==staDesc.getTypeId()){ return R.error(); } staDesc.setModiUser(getUserId()); staDesc.setModiTime(new Date()); staDescService.updateById(staDesc); return R.ok(); } @RequestMapping(value = "/staDesc/delete/auth") @ManagerAuth(memo = "站点路径删除") public R delete(@RequestParam String param){ List<StaDesc> list = JSONArray.parseArray(param, StaDesc.class); if (Cools.isEmpty(list)){ return R.error(); } for (StaDesc entity : list){ staDescService.delete(new EntityWrapper<>(entity)); } return R.ok(); } @RequestMapping(value = "/staDesc/export/auth") @ManagerAuth(memo = "站点路径导出") public R export(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<StaDesc> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("staDesc")); convert(map, wrapper); List<StaDesc> list = staDescService.selectList(wrapper); return R.ok(exportSupport(list, fields)); } @RequestMapping(value = "/staDescQuery/auth") @ManagerAuth public R query(String condition) { EntityWrapper<StaDesc> wrapper = new EntityWrapper<>(); wrapper.like("crn_no", condition); Page<StaDesc> page = staDescService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (StaDesc staDesc : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", staDesc.getCrnNo()); map.put("value", staDesc.getCrnNo()); result.add(map); } return R.ok(result); } @RequestMapping(value = "/staDesc/check/column/auth") @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<StaDesc> wrapper = new EntityWrapper<StaDesc>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); if (null != staDescService.selectOne(wrapper)){ return R.parse(BaseRes.REPEAT).add(getComment(StaDesc.class, String.valueOf(param.get("key")))); } return R.ok(); } } src/main/webapp/views/staDesc/staDesc.html
New file @@ -0,0 +1,95 @@ <!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/wms/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/wms/css/common.css" media="all"> </head> <body> <!-- 搜索栏 --> <div id="search-box" class="layui-form layui-card-header"> <div class="layui-inline"> <div class="layui-input-inline cool-auto-complete"> <input id="typeNo" name="type_no" class="layui-input" type="text" style="display: none"> <input id="typeNo$" 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="basWrkIotypeQueryBytypeNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryBytypeNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="stn_no" placeholder="站点编号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="crn_stn" placeholder="堆垛机站点" autocomplete="off"> </div> </div> <!--<div class="layui-inline">--> <!--<label class="layui-form-label">编 号:</label>--> <!--<div class="layui-input-inline">--> <!--<input class="layui-input" type="text" name="id" placeholder="请输入" autocomplete="off">--> <!--</div>--> <!--</div>--> <!--<div class="layui-inline">--> <!--<label class="layui-form-label">堆垛机站点:</label>--> <!--<div class="layui-input-inline cool-auto-complete">--> <!--<input id="crnStn" class="layui-input" name="crn_stn" type="text" placeholder="请输入" autocomplete="off" style="display: none">--> <!--<input id="crnStn$" 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="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))">--> <!--<select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple">--> <!--</select>--> <!--</div>--> <!--</div>--> <!--</div>--> <!-- 待添加 --> <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block;margin-left: 15px"> <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button> <button id="reset" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="reset">重置</button> </div> </div> <!-- 表格 --> <div class="layui-form"> <table class="layui-hide" id="staDesc" lay-filter="staDesc"></table> </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> <button class="layui-btn layui-btn-sm" id="btn-add" lay-event="addData">新增</button> <button class="layui-btn layui-btn-sm" id="btn-delete" lay-event="deleteData">删除</button> <button class="layui-btn layui-btn-primary layui-btn-sm" id="btn-export" lay-event="exportData">导出</button> </div> </script> <script type="text/html" id="operate"> <a class="layui-btn layui-btn-xs btn-edit" lay-event="edit">编辑</a> </script> <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/staDesc/staDesc.js" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> </body> </html> src/main/webapp/views/staDesc/staDesc_detail.html
New file @@ -0,0 +1,156 @@ <!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/wms/layui/css/layui.css" media="all"> <link rel="stylesheet" href="../../static/wms/css/cool.css" media="all"> <link rel="stylesheet" href="../../static/wms/css/common.css" media="all"> </head> <body> <!-- 详情 --> <div id="data-detail" class="layer_self_wrap"> <form id="detail" class="layui-form" style="text-align: center"> <!-- <div class="layui-inline" style="display: none"> <label class="layui-form-label"><span class="not-null">*</span>编 号:</label> <div class="layui-input-inline"> <input id="id" class="layui-input" type="text" placeholder="编号"> </div> </div> --> <div class="layui-inline" style="width:31%;display:none"> <label class="layui-form-label"><span class="not-null">*</span>路径ID:</label> <div class="layui-input-inline"> <input id="typeId" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="number" > </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>入出库类型:</label> <div class="layui-input-inline cool-auto-complete"> <input id="typeNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none"> <input id="typeNo$" 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="basWrkIotypeQueryBytypeNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basWrkIotypeQueryBytypeNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">作业类型:</label> <div class="layui-input-inline"> <input id="typeDesc" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>作业站点:</label> <div class="layui-input-inline cool-auto-complete"> <input id="stnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" style="display: none"> <input id="stnNo$" 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="basDevpQueryBystnNo" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basDevpQueryBystnNoSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">站点名称:</label> <div class="layui-input-inline"> <input id="stnDesc" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>堆垛机号:</label> <div class="layui-input-inline cool-auto-complete"> <input id="crnNo" class="layui-input" type="text" onkeyup="check(this.id, 'staDesc')" lay-verify="required|number" 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:80%;"> <label class="layui-form-label">堆垛机站点:</label> <div class="layui-input-inline cool-auto-complete"> <input id="crnStn" class="layui-input" type="text" lay-verify="number" style="display: none"> <input id="crnStn$" 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="basDevpQueryBycrnStn" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="basDevpQueryBycrnStnSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:80%;"> <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%;display: none"> <label class="layui-form-label">修改人员:</label> <div class="layui-input-inline cool-auto-complete"> <input id="modiUser" class="layui-input" type="text" lay-verify="number" style="display: none"> <input id="modiUser$" 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="userQueryBymodiUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="userQueryBymodiUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">修改时间:</label> <div class="layui-input-inline"> <input id="modiTime$" class="layui-input" type="text" autocomplete="off"> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">创 建 者:</label> <div class="layui-input-inline cool-auto-complete"> <input id="appeUser" class="layui-input" type="text" lay-verify="number" style="display: none"> <input id="appeUser$" 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="userQueryByappeUser" onkeyup="autoLoad(this.getAttribute('data-key'))"> <select class="cool-auto-complete-window-select" data-key="userQueryByappeUserSelect" onchange="confirmed(this.getAttribute('data-key'))" multiple="multiple"> </select> </div> </div> </div> <div class="layui-inline" style="width:31%;display: none"> <label class="layui-form-label">添加时间:</label> <div class="layui-input-inline"> <input id="appeTime$" class="layui-input" type="text" autocomplete="off"> </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> </body> <script type="text/javascript" src="../../static/wms/js/jquery/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../static/wms/layui/layui.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/common.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/cool.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/wms/js/staDesc/staDesc.js" charset="utf-8"></script> </html>