zy-asrs-common/src/main/resources/mapper/wms/ViewStayTimeMapper.xml
@@ -11,6 +11,9 @@ <if test="viewStayTime.matnr!=null and viewStayTime.matnr!='' "> and wms_loc_detl.matnr like '%' + #{viewStayTime.matnr} + '%' </if> <if test="viewStayTime.zpallet!=null and viewStayTime.zpallet!='' "> and wms_loc_detl.zpallet like '%' + #{viewStayTime.zpallet} + '%' </if> </sql> <!-- 分页查询所有信息 --> zy-asrs-common/src/main/resources/mapper/wms/ViewWorkInMapper.xml
@@ -11,6 +11,9 @@ <if test="viewWorkIn.matnr!=null and viewWorkIn.matnr!='' "> and matnr like '%' + #{viewWorkIn.matnr} + '%' </if> <if test="viewWorkIn.zpallet!=null and viewWorkIn.zpallet!='' "> and zpallet like '%' + #{viewWorkIn.zpallet} + '%' </if> <if test="viewWorkIn.maktx!=null and viewWorkIn.maktx!='' "> and (maktx like '%' + #{viewWorkIn.maktx} + '%' or matnr like '%' + #{viewWorkIn.maktx} + '%' zy-asrs-wcs/src/main/webapp/views/crn.html
@@ -121,12 +121,12 @@ <!-- 设备任务选择 --> <div class="task-select"> <!-- 堆垛机选择 --> <div id="crn-select" class="operator-item"> <span class="select-title">堆垛机号</span> <div class="select-container"> <label><input type="radio" name="crnSelect" value="1" checked> 1号堆垛机</label> </div> </div> <!-- <div id="crn-select" class="operator-item">--> <!-- <span class="select-title">堆垛机号</span>--> <!-- <div class="select-container">--> <!-- <label><input type="radio" name="crnSelect" value="1" checked> 1号堆垛机</label>--> <!-- </div>--> <!-- </div>--> <!-- 源站/源库位 选择 --> <div id="source-select" class="operator-item"> <span class="select-title">源站/源库位</span> zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/ReportQueryController.java
@@ -24,6 +24,7 @@ /** * 日志统计控制器层 * * @author admin * @date 2018年11月23日 */ @@ -31,113 +32,115 @@ @RequestMapping("/report") public class ReportQueryController extends BaseController { @Autowired private ReportQueryMapper reportQueryMapper; @Autowired private ReportQueryMapper reportQueryMapper; //------------------库位使用统计-------------------------------------- @RequestMapping("/viewStockUseList.action") public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ ViewStockUseBean bean = new ViewStockUseBean(); bean.setPageSize(limit); bean.setPageNumber(curr); //------------------库位使用统计-------------------------------------- @RequestMapping("/viewStockUseList.action") public R queryViewStockUseListByPages(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam Map<String, Object> param) { ViewStockUseBean bean = new ViewStockUseBean(); bean.setPageSize(limit); bean.setPageNumber(curr); Page<ViewStockUseBean> page = new Page<>(curr, limit); IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean); return R.ok(list); } Page<ViewStockUseBean> page = new Page<>(curr, limit); IPage<ViewStockUseBean> list = reportQueryMapper.queryViewStockUseList(page, bean); return R.ok(list); } // 导出 @RequestMapping(value = "/viewStockUseExport.action") @ManagerAuth(memo = "库位使用统计导出") public R viewStockUseExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean()); return R.ok(exportSupport(list, fields)); } // 导出 @RequestMapping(value = "/viewStockUseExport.action") @ManagerAuth(memo = "库位使用统计导出") public R viewStockUseExport(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); List<ViewStockUseBean> list = reportQueryMapper.getViewStockUseAll(new ViewStockUseBean()); return R.ok(exportSupport(list, fields)); } //------------------库存滞留统计-------------------------------------- @RequestMapping("/viewStayTimeList.action") public Map<String,Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ ViewStayTimeBean bean = new ViewStayTimeBean(); bean.setPageSize(limit); bean.setPageNumber(curr); String locNo = String.valueOf(param.get("locNo")); if (!Cools.isEmpty(locNo) && !locNo.equals("null")) { bean.setLocNo(locNo); } //------------------库存滞留统计-------------------------------------- @RequestMapping("/viewStayTimeList.action") public Map<String, Object> queryViewStayTimeListByPages(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam Map<String, Object> param) { ViewStayTimeBean bean = new ViewStayTimeBean(); bean.setPageSize(limit); bean.setPageNumber(curr); String locNo = String.valueOf(param.get("locNo")); if (!Cools.isEmpty(locNo) && !locNo.equals("null")) { bean.setLocNo(locNo); } if (!Cools.isEmpty(param.get("zpallet"))) { bean.setZpallet(String.valueOf(param.get("zpallet"))); } Page<ViewStayTimeBean> page = new Page<>(curr, limit); IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean); return R.ok(list); } Page<ViewStayTimeBean> page = new Page<>(curr, limit); IPage<ViewStayTimeBean> list = reportQueryMapper.queryViewStayTimeList(page, bean); return R.ok(list); } // 导出 @RequestMapping(value = "/viewStayTimeExport.action") @ManagerAuth(memo = "库存滞留统计导出") public R viewStayTimeExport(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); Map map = param.getObject("exportData", Map.class); List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map); return R.ok(exportSupport(list, fields)); } // 导出 @RequestMapping(value = "/viewStayTimeExport.action") @ManagerAuth(memo = "库存滞留统计导出") public R viewStayTimeExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); Map map = param.getObject("exportData", Map.class); List<ViewStayTimeBean> list = reportQueryMapper.getViewStayTimeAll(map); return R.ok(exportSupport(list, fields)); } //------------------站点日入出库次数统计-------------------------------------- @RequestMapping("/viewInOutList.action") public Map<String, Object> viewInOutList(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam Map<String, Object> param) { ViewInOutBean bean = new ViewInOutBean(); bean.setPageSize(limit); bean.setPageNumber(curr); Page<ViewInOutBean> page = new Page<>(curr, limit); IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean); return R.ok(list); } //------------------站点日入出库次数统计-------------------------------------- @RequestMapping("/viewInOutList.action") public Map<String,Object> viewInOutList(@RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "10")Integer limit, @RequestParam Map<String, Object> param){ ViewInOutBean bean = new ViewInOutBean(); bean.setPageSize(limit); bean.setPageNumber(curr); Page<ViewInOutBean> page = new Page<>(curr, limit); IPage<ViewInOutBean> list = reportQueryMapper.queryViewInOutList(page, bean); return R.ok(list); } //------------------日入库明细统计-------------------------------------- @RequestMapping("/viewWorkInList.action") public Map<String, Object> viewWorkInList(ViewWorkInBean bean) { Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize()); IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean); return R.ok(list); } //------------------日入库明细统计-------------------------------------- @RequestMapping("/viewWorkInList.action") public Map<String,Object> viewWorkInList(ViewWorkInBean bean){ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize()); IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkInList(page, bean); return R.ok(list); } //excel导出 @RequestMapping("/viewWorkInExport.action") @ManagerAuth(memo = "日入库明细统计导出") public R viewWorkInExport(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); @SuppressWarnings("unchecked") ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class); bean.setQueryDate(bean.getQueryDate()); Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map); return R.ok(exportSupport(list, fields)); } //excel导出 @RequestMapping("/viewWorkInExport.action") @ManagerAuth(memo = "日入库明细统计导出") public R viewWorkInExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); @SuppressWarnings("unchecked") ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class); bean.setQueryDate(bean.getQueryDate()); Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkInAll(map); return R.ok(exportSupport(list, fields)); } //------------------日出库明细统计-------------------------------------- @RequestMapping("/viewWorkOutList.action") public R viewWorkOutList(ViewWorkInBean bean) { Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize()); IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean); return R.ok(list); } //------------------日出库明细统计-------------------------------------- @RequestMapping("/viewWorkOutList.action") public R viewWorkOutList(ViewWorkInBean bean){ Page<ViewWorkInBean> page = new Page<>(bean.getPageNumber(), bean.getPageSize()); IPage<ViewWorkInBean> list = reportQueryMapper.queryViewWorkOutList(page, bean); return R.ok(list); } //excel导出 @RequestMapping("/viewWorkOutExport.action") @ManagerAuth(memo = "日出库明细统计导出") public R viewWorkOutExport(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); @SuppressWarnings("unchecked") ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class); bean.setQueryDate(bean.getQueryDate()); Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map); return R.ok(exportSupport(list, fields)); } //excel导出 @RequestMapping("/viewWorkOutExport.action") @ManagerAuth(memo = "日出库明细统计导出") public R viewWorkOutExport(@RequestBody JSONObject param) { List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); @SuppressWarnings("unchecked") ViewWorkInBean bean = Cools.conver((Map<? extends String, ?>) param.get("exportData"), ViewWorkInBean.class); bean.setQueryDate(bean.getQueryDate()); Map map = JSON.parseObject(JSON.toJSONString(bean), Map.class); List<ViewWorkInBean> list = reportQueryMapper.getViewWorkOutAll(map); return R.ok(exportSupport(list, fields)); } } zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -40,7 +40,7 @@ excludeTrash(param); QueryWrapper<WrkMast> wrapper = new QueryWrapper<>(); wrapper.eq("host_id",getHostId()); System.out.println(param); wrapper.orderByDesc("io_pri"); convert(param, wrapper); return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper)); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/task/handler/WorkMastHandler.java
@@ -136,6 +136,7 @@ locMast.setModiTime(now); locMast.setPic(wrkMast.getPic()); locMast.setFullPlt(wrkMast.getFullPlt()); locMast.setOwner(wrkMast.getOwner()); if (!locMastService.updateById(locMast)) { exceptionHandle("全板入库 ===>> 修改库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); } @@ -238,6 +239,7 @@ locMast.setIoTime(now); locMast.setModiTime(now); locMast.setPic(wrkMast.getPic()); locMast.setOwner(wrkMast.getOwner()); if (!locMastService.updateById(locMast)) { exceptionHandle("并板入库 ===>> 修改库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); } @@ -294,6 +296,7 @@ locMast.setIoTime(now); locMast.setModiTime(now); locMast.setPic(picUrl); locMast.setOwner(wrkMast.getOwner()); if (!locMastService.updateById(locMast)) { exceptionHandle("库位移转 ===>> 修改目标库位状态失败;[workNo={0}],[locNo={1}]", wrkMast.getWrkNo(), wrkMast.getLocNo()); } zy-asrs-wms/src/main/webapp/static/js/locMast/locMast.js
@@ -28,7 +28,7 @@ // ,{field: 'ctnType', align: 'center',title: ''} // ,{field: 'locSts', align: 'center',title: ''} // ,{field: 'sheetNo', align: 'center',title: ''} ,{field: 'crnNo', align: 'center',title: '堆垛机号'} //,{field: 'crnNo', align: 'center',title: '堆垛机号'} ,{field: 'row1', align: 'center',title: '排', sort:true} ,{field: 'bay1', align: 'center',title: '列', sort:true} ,{field: 'lev1', align: 'center',title: '层', sort:true} zy-asrs-wms/src/main/webapp/static/js/pakStore/emptyOut.js
@@ -51,7 +51,7 @@ ,{field: 'locNo', align: 'center',title: '库位号',sort:true} ,{field: 'locSts$', align: 'center',title: '库位状态',width:200} ,{field: 'whsType$', align: 'center',title: '库位类型'} ,{field: 'crnNo', align: 'center',title: '堆垛机号'} //,{field: 'crnNo', align: 'center',title: '堆垛机号'} ,{field: 'row1', align: 'center',title: '排'} ,{field: 'bay1', align: 'center',title: '列'} ,{field: 'lev1', align: 'center',title: '层'} zy-asrs-wms/src/main/webapp/static/js/report/workOut.js
@@ -3,8 +3,8 @@ var cols = [ {field: 'ioTime$', align: 'center', title: '出库日期', width: 200} ,{field: 'locNo', align: 'center',title: '库位号'} ,{field: 'crnStrTime', align: 'center',title: '堆垛机启动时间'} ,{field: 'crnEndTime', align: 'center',title: '堆垛机停止时间'} ,{field: 'crnStrTime', align: 'center',title: '设备启动时间'} ,{field: 'crnEndTime', align: 'center',title: '设备停止时间'} ]; cols.push.apply(cols, detlCols); return cols; zy-asrs-wms/src/main/webapp/static/js/stoMan/stoQue.js
@@ -30,7 +30,7 @@ ,{field: 'locSts$', align: 'center',title: '库位状态', width: 180, style: 'color: #8E2323'} ,{field: 'whsType$', align: 'center',title: '库位类型'} ,{field: 'barcode', align: 'center',title: '托盘码'} ,{field: 'crnNo', align: 'center',title: '堆垛机号'} //,{field: 'crnNo', align: 'center',title: '堆垛机号'} ,{field: 'row1', align: 'center',title: '排'} ,{field: 'bay1', align: 'center',title: '列'} ,{field: 'lev1', align: 'center',title: '层'} zy-asrs-wms/src/main/webapp/static/js/waitPakinLog/waitPakinLog.js
@@ -3,7 +3,10 @@ var cols = [ ]; cols.push.apply(cols, detlCols); cols.push({field: 'status', align: 'center',title: '数据状态', templet:function(row){ cols.push( {field: 'modiUser$', align: 'center',title: '修改人员', hide:true} ,{field: 'modiTime$', align: 'center',title: '修改时间'} ,{field: 'status', align: 'center',title: '数据状态', templet:function(row){ var html = "<input value='status' type='checkbox' lay-skin='switch' lay-text='正常|锁定' lay-filter='tableCheckbox' disabled='disabled' table-index='"+row.LAY_TABLE_INDEX+"'"; if(row.status === 'Y'){html += " checked ";} html += ">"; @@ -15,8 +18,7 @@ html += ">"; return html; }} ,{field: 'modiUser$', align: 'center',title: '修改人员', hide:true} ,{field: 'modiTime$', align: 'center',title: '修改时间', hide:true}) ) return cols; } layui.use(['table','laydate', 'form'], function(){ zy-asrs-wms/src/main/webapp/views/locMast/locMast_detail.html
@@ -77,12 +77,12 @@ <input id="sheetNo" class="layui-input" type="text"> </div> </div> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">堆垛机号:</label> <div class="layui-input-inline"> <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled"> </div> </div> <!-- <div class="layui-inline" style="width:80%;">--> <!-- <label class="layui-form-label">堆垛机号:</label>--> <!-- <div class="layui-input-inline">--> <!-- <input id="crnNo" class="layui-input" type="text" autocomplete="off" disabled="disabled">--> <!-- </div>--> <!-- </div>--> <div class="layui-inline" style="width:80%;"> <label class="layui-form-label">排:</label> <div class="layui-input-inline"> zy-asrs-wms/src/main/webapp/views/pakStore/emptyOut.html
@@ -94,11 +94,11 @@ <input class="layui-input" type="text" name="lev1" placeholder="层" lay-verify="number" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" lay-verify="number" autocomplete="off"> </div> </div> <!-- <div class="layui-inline">--> <!-- <div class="layui-input-inline">--> <!-- <input class="layui-input" type="text" name="crn_no" placeholder="堆垛机号" lay-verify="number" autocomplete="off">--> <!-- </div>--> <!-- </div>--> <!-- 待添加 --> <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block"> zy-asrs-wms/src/main/webapp/views/pakStore/locDetlCheckQuery.html
@@ -46,11 +46,11 @@ <legend>搜索栏</legend> <!-- 搜索栏 --> <div id="search-box" class="layui-form layui-card-header"> <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_no" placeholder="堆垛机号" autocomplete="off">--> <!-- </div>--> <!-- </div>--> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="loc_no" placeholder="库位号" autocomplete="off"> zy-asrs-wms/src/main/webapp/views/report/viewStayTime.html
@@ -24,7 +24,11 @@ <input class="layui-input" type="text" name="locNo" placeholder="库位号" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off"> </div> </div> <!-- 待添加 --> <div id="data-search-btn" class="layui-btn-container layui-form-item" style="display: inline-block"> <button id="search" class="layui-btn layui-btn-primary layui-btn-radius" lay-submit lay-filter="search">搜索</button> zy-asrs-wms/src/main/webapp/views/report/viewWorkIn.html
@@ -26,6 +26,11 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="matnr" placeholder="品号" autocomplete="off"> </div> </div> zy-asrs-wms/src/main/webapp/views/report/viewWorkOut.html
@@ -26,6 +26,11 @@ </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="zpallet" placeholder="托盘码" autocomplete="off"> </div> </div> <div class="layui-inline"> <div class="layui-input-inline"> <input class="layui-input" type="text" name="matnr" placeholder="品号" autocomplete="off"> </div> </div> zy-asrs-wms/src/main/webapp/views/waitPakinLog/waitPakinLog.html
@@ -59,7 +59,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></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 type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/waitPakinLog/waitPakinLog.js?v=2" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> zy-asrs-wms/src/main/webapp/views/wrkDetlLog/wrkDetlLog.html
@@ -85,7 +85,7 @@ <script type="text/javascript" src="../../static/layui/layui.js" charset="utf-8"></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 type="text/javascript" src="../../static/js/wrkDetlLog/wrkDetlLog.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/wrkDetlLog/wrkDetlLog.js?v=1" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe> zy-asrs-wms/src/main/webapp/views/wrkMast/wrkMast_detail.html
@@ -136,7 +136,7 @@ </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label" style="font-size: x-small">堆垛机启动时间:</label> <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> zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog.html
@@ -50,17 +50,17 @@ </div> </div> </div> <div class="layui-inline"> <div class="layui-input-inline cool-auto-complete"> <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="请输入" autocomplete="off" 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">--> <!-- <div class="layui-input-inline cool-auto-complete">--> <!-- <input id="crnNo" class="layui-input" name="crn_no" type="text" placeholder="请输入" autocomplete="off" 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: 300px"> <div class="layui-input-inline"> zy-asrs-wms/src/main/webapp/views/wrkMastLog/wrkMastLog_detail.html
@@ -51,18 +51,18 @@ </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="crnNo" class="layui-input" type="text" lay-verify="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:31%;">--> <!-- <label class="layui-form-label">堆垛机号:</label>--> <!-- <div class="layui-input-inline cool-auto-complete">--> <!-- <input id="crnNo" class="layui-input" type="text" lay-verify="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:31%;"> <label class="layui-form-label">优 先 级:</label> <div class="layui-input-inline"> @@ -142,7 +142,7 @@ </div> </div> <div class="layui-inline" style="width:31%;"> <label class="layui-form-label" style="font-size: x-small">堆垛机启动时间:</label> <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>