src/main/java/com/zy/asrs/controller/BasLocStsController.java
New file @@ -0,0 +1,147 @@ 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.zy.asrs.entity.BasLocSts; import com.zy.asrs.service.BasLocStsService; import com.zy.common.web.BaseController; 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @RestController public class BasLocStsController extends BaseController { @Autowired private BasLocStsService basLocStsService; @RequestMapping(value = "/basLocSts/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(basLocStsService.selectById(id)); } @RequestMapping(value = "/basLocSts/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<BasLocSts> wrapper = new EntityWrapper<>(); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(basLocStsService.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 = "/basLocSts/edit/auth") @ManagerAuth public R edit(BasLocSts basLocSts) { if (Cools.isEmpty(basLocSts)){ return R.error(); } if (null == basLocSts.getLocSts()){ basLocStsService.insert(basLocSts); } else { basLocStsService.updateById(basLocSts); } return R.ok(); } @RequestMapping(value = "/basLocSts/add/auth") @ManagerAuth(memo = "库位状态添加") public R add(BasLocSts basLocSts) { basLocSts.setModiUser(getUserId()); basLocSts.setModiTime(new Date()); basLocSts.setAppeUser(getUserId()); basLocSts.setAppeTime(new Date()); basLocStsService.insert(basLocSts); return R.ok(); } @RequestMapping(value = "/basLocSts/update/auth") @ManagerAuth(memo = "库位状态修改") public R update(BasLocSts basLocSts){ if (Cools.isEmpty(basLocSts) || null==basLocSts.getLocSts()){ return R.error(); } basLocSts.setModiUser(getUserId()); basLocSts.setModiTime(new Date()); basLocStsService.updateById(basLocSts); return R.ok(); } @RequestMapping(value = "/basLocSts/delete/auth") @ManagerAuth(memo = "库位状态删除") public R delete(@RequestParam String param){ List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class); if (Cools.isEmpty(list)){ return R.error(); } for (BasLocSts entity : list){ basLocStsService.delete(new EntityWrapper<>(entity)); } return R.ok(); } @RequestMapping(value = "/basLocSts/export/auth") @ManagerAuth(memo = "库位状态导出") public R export(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("basLocSts")); convert(map, wrapper); List<BasLocSts> list = basLocStsService.selectList(wrapper); return R.ok(exportSupport(list, fields)); } @RequestMapping(value = "/basLocStsQuery/auth") @ManagerAuth public R query(String condition) { EntityWrapper<BasLocSts> wrapper = new EntityWrapper<>(); wrapper.like("loc_desc", condition); Page<BasLocSts> page = basLocStsService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (BasLocSts basLocSts : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", basLocSts.getLocSts()); map.put("value", basLocSts.getLocDesc()); result.add(map); } return R.ok(result); } @RequestMapping(value = "/basLocSts/check/column/auth") @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<BasLocSts> wrapper = new EntityWrapper<BasLocSts>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); if (null != basLocStsService.selectOne(wrapper)){ return R.parse(BaseRes.REPEAT).add(getComment(BasLocSts.class, String.valueOf(param.get("key")))); } return R.ok(); } } src/main/java/com/zy/asrs/controller/BasLocTypeController.java
File was deleted src/main/java/com/zy/asrs/entity/BasLocSts.java
File was renamed from src/main/java/com/zy/asrs/entity/BasLocType.java @@ -14,8 +14,8 @@ import java.text.SimpleDateFormat; import java.util.Date; @TableName("asr_bas_loc_type") public class BasLocType implements Serializable { @TableName("asr_bas_loc_sts") public class BasLocSts implements Serializable { private static final long serialVersionUID = 1L; @@ -62,9 +62,9 @@ @TableField("appe_time") private Date appeTime; public BasLocType() {} public BasLocSts() {} public BasLocType(String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { public BasLocSts(String locDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { this.locDesc = locDesc; this.modiUser = modiUser; this.modiTime = modiTime; @@ -72,7 +72,7 @@ this.appeTime = appeTime; } // BasLocType basLocType = new BasLocType( // BasLocSts basLocSts = new BasLocSts( // null, // 库位状态描述 // null, // 修改人员 // null, // 修改时间 src/main/java/com/zy/asrs/entity/LocMast.java
@@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotations.TableId; import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.zy.asrs.service.BasLocTypeService; import com.zy.asrs.service.BasLocStsService; import com.zy.asrs.service.BasWhsService; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -326,10 +326,10 @@ } public String getLocSts$(){ BasLocTypeService service = SpringUtils.getBean(BasLocTypeService.class); BasLocType basLocType = service.selectById(this.locSts); if (!Cools.isEmpty(basLocType)){ return String.valueOf(basLocType.getLocDesc()); BasLocStsService service = SpringUtils.getBean(BasLocStsService.class); BasLocSts basLocSts = service.selectById(this.locSts); if (!Cools.isEmpty(basLocSts)){ return String.valueOf(basLocSts.getLocDesc()); } return null; } src/main/java/com/zy/asrs/mapper/BasLocStsMapper.java
File was renamed from src/main/java/com/zy/asrs/mapper/BasLocTypeMapper.java @@ -1,12 +1,12 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.BasLocType; import com.zy.asrs.entity.BasLocSts; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface BasLocTypeMapper extends BaseMapper<BasLocType> { public interface BasLocStsMapper extends BaseMapper<BasLocSts> { } src/main/java/com/zy/asrs/service/BasLocStsService.java
New file @@ -0,0 +1,8 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.BasLocSts; public interface BasLocStsService extends IService<BasLocSts> { } src/main/java/com/zy/asrs/service/BasLocTypeService.java
File was deleted src/main/java/com/zy/asrs/service/impl/BasLocStsServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.BasLocSts; import com.zy.asrs.mapper.BasLocStsMapper; import com.zy.asrs.service.BasLocStsService; import org.springframework.stereotype.Service; @Service("basLocStsService") public class BasLocStsServiceImpl extends ServiceImpl<BasLocStsMapper, BasLocSts> implements BasLocStsService { } src/main/java/com/zy/asrs/service/impl/BasLocTypeServiceImpl.java
File was deleted src/main/resources/mapper/BasLocStsMapper.xml
File was renamed from src/main/resources/mapper/BasLocTypeMapper.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.zy.asrs.mapper.BasLocTypeMapper"> <mapper namespace="com.zy.asrs.mapper.BasLocStsMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocType"> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasLocSts"> <id column="loc_sts" property="locSts" /> <result column="loc_desc" property="locDesc" /> <result column="modi_user" property="modiUser" /> src/main/webapp/static/js/basLocSts/basLocSts.js
File was renamed from src/main/webapp/static/js/basLocType/basLocType.js @@ -8,9 +8,9 @@ // 数据渲染 tableIns = table.render({ elem: '#basLocType', elem: '#basLocSts', headers: {token: localStorage.getItem('token')}, url: baseUrl+'/basLocType/list/auth', url: baseUrl+'/basLocSts/list/auth', page: true, limit: 16, limits: [16, 30, 50, 100, 200, 500], @@ -54,7 +54,7 @@ }); // 监听排序事件 table.on('sort(basLocType)', function (obj) { table.on('sort(basLocSts)', function (obj) { var searchData = {}; $.each($('#search-box [name]').serializeArray(), function() { searchData[this.name] = this.value; @@ -77,7 +77,7 @@ }); // 监听头工具栏事件 table.on('toolbar(basLocType)', function (obj) { table.on('toolbar(basLocSts)', function (obj) { var checkStatus = table.checkStatus(obj.config.id); switch(obj.event) { case 'addData': @@ -87,7 +87,7 @@ maxmin: true, area: ['500px', top.detailHeight], shadeClose: false, content: 'basLocType_detail.html', content: 'basLocSts_detail.html', success: function(layero, index){ layer.getChildFrame('#data-detail-submit-edit', index).hide(); clearFormVal(layer.getChildFrame('#detail', index)); @@ -110,7 +110,7 @@ } else { layer.confirm('确定删除'+(data.length===1?'此':data.length)+'条数据吗', function(){ $.ajax({ url: baseUrl+"/basLocType/delete/auth", url: baseUrl+"/basLocSts/delete/auth", headers: {'token': localStorage.getItem('token')}, data: {param: JSON.stringify(data)}, method: 'POST', @@ -144,11 +144,11 @@ exportData[this.name] = this.value; }); var param = { 'basLocType': exportData, 'basLocSts': exportData, 'fields': fields }; $.ajax({ url: baseUrl+"/basLocType/export/auth", url: baseUrl+"/basLocSts/export/auth", headers: {'token': localStorage.getItem('token')}, data: JSON.stringify(param), dataType:'json', @@ -171,7 +171,7 @@ }); // 监听行工具事件 table.on('tool(basLocType)', function(obj){ table.on('tool(basLocSts)', function(obj){ var data = obj.data; switch (obj.event) { // 详情 @@ -182,7 +182,7 @@ maxmin: true, area: [top.detailWidth, top.detailHeight], shadeClose: false, content: 'basLocType_detail.html', content: 'basLocSts_detail.html', success: function(layero, index){ setFormVal(layer.getChildFrame('#detail', index), data, true); top.convertDisabled(layer.getChildFrame('#data-detail :input', index), true); @@ -201,7 +201,7 @@ maxmin: true, area: ['500px', top.detailHeight], shadeClose: false, content: 'basLocType_detail.html', content: 'basLocSts_detail.html', success: function(layero, index){ layer.getChildFrame('#data-detail-submit-save', index).hide(); setFormVal(layer.getChildFrame('#detail', index), data, false); @@ -316,7 +316,7 @@ }; $.ajax({ url: baseUrl+"/basLocType/"+name+"/auth", url: baseUrl+"/basLocSts/"+name+"/auth", headers: {'token': localStorage.getItem('token')}, data: top.reObject(data), method: 'POST', src/main/webapp/views/basLocSts/basLocSts.html
File was renamed from src/main/webapp/views/basLocType/basLocType.html @@ -28,7 +28,7 @@ </div> <!-- 表格 --> <table class="layui-hide" id="basLocType" lay-filter="basLocType"></table> <table class="layui-hide" id="basLocSts" lay-filter="basLocSts"></table> <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> @@ -45,7 +45,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/basLocType/basLocType.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
File was renamed from src/main/webapp/views/basLocType/basLocType_detail.html @@ -18,7 +18,7 @@ <div class="layui-inline" style="width:80%;"> <label class="layui-form-label" style="font-size: x-small"><span class="not-null">*</span>库位状态代号：</label> <div class="layui-input-inline"> <input id="locSts" class="layui-input" type="text" onkeyup="check(this.id, 'basLocType')" lay-verify="required"> <input id="locSts" class="layui-input" type="text" onkeyup="check(this.id, 'basLocSts')" lay-verify="required"> </div> </div> <div class="layui-inline" style="width:80%;"> @@ -83,6 +83,6 @@ <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/basLocType/basLocType.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/basLocSts/basLocSts.js" charset="utf-8"></script> </html>
