src/main/java/com/zy/asrs/controller/BasWhsController.java
@@ -5,8 +5,8 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.baomidou.mybatisplus.mapper.Wrapper; import com.baomidou.mybatisplus.plugins.Page; import com.zy.asrs.entity.BasWhs; import com.zy.asrs.service.BasWhsService; import com.zy.asrs.entity.BasWhsType; import com.zy.asrs.service.BasWhsTypeService; import com.zy.common.web.BaseController; import com.core.annotations.ManagerAuth; import com.core.common.BaseRes; @@ -22,12 +22,12 @@ public class BasWhsController extends BaseController { @Autowired private BasWhsService basWhsService; private BasWhsTypeService basWhsTypeService; @RequestMapping(value = "/basWhs/{id}/auth") @ManagerAuth public R get(@PathVariable("id") Long id) { return R.ok(basWhsService.selectById(String.valueOf(id))); return R.ok(basWhsTypeService.selectById(String.valueOf(id))); } @RequestMapping(value = "/basWhs/list/auth") @@ -38,10 +38,10 @@ @RequestParam(required = false)String orderByType, @RequestParam Map<String, Object> param){ excludeTrash(param); EntityWrapper<BasWhs> wrapper = new EntityWrapper<>(); EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>(); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} return R.ok(basWhsService.selectPage(new Page<>(curr, limit), wrapper)); return R.ok(basWhsTypeService.selectPage(new Page<>(curr, limit), wrapper)); } private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){ @@ -59,36 +59,36 @@ @RequestMapping(value = "/basWhs/add/auth") @ManagerAuth(memo = "库位类型添加") public R add(BasWhs basWhs) { basWhs.setModiUser(getUserId()); basWhs.setModiTime(new Date()); basWhs.setAppeUser(getUserId()); basWhs.setAppeTime(new Date()); basWhsService.insert(basWhs); public R add(BasWhsType basWhsType) { basWhsType.setModiUser(getUserId()); basWhsType.setModiTime(new Date()); basWhsType.setAppeUser(getUserId()); basWhsType.setAppeTime(new Date()); basWhsTypeService.insert(basWhsType); return R.ok(); } @RequestMapping(value = "/basWhs/update/auth") @ManagerAuth(memo = "库位类型修改") public R update(BasWhs basWhs){ if (Cools.isEmpty(basWhs) || null==basWhs.getId()){ public R update(BasWhsType basWhsType){ if (Cools.isEmpty(basWhsType) || null== basWhsType.getId()){ return R.error(); } basWhs.setModiUser(getUserId()); basWhs.setModiTime(new Date()); basWhsService.updateById(basWhs); basWhsType.setModiUser(getUserId()); basWhsType.setModiTime(new Date()); basWhsTypeService.updateById(basWhsType); return R.ok(); } @RequestMapping(value = "/basWhs/delete/auth") @ManagerAuth(memo = "库位类型删除") public R delete(@RequestParam String param){ List<BasWhs> list = JSONArray.parseArray(param, BasWhs.class); List<BasWhsType> list = JSONArray.parseArray(param, BasWhsType.class); if (Cools.isEmpty(list)){ return R.error(); } for (BasWhs entity : list){ basWhsService.delete(new EntityWrapper<>(entity)); for (BasWhsType entity : list){ basWhsTypeService.delete(new EntityWrapper<>(entity)); } return R.ok(); } @@ -97,24 +97,24 @@ @ManagerAuth(memo = "库位类型导出") public R export(@RequestBody JSONObject param){ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class); EntityWrapper<BasWhs> wrapper = new EntityWrapper<>(); EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>(); Map<String, Object> map = excludeTrash(param.getJSONObject("basWhs")); convert(map, wrapper); List<BasWhs> list = basWhsService.selectList(wrapper); List<BasWhsType> list = basWhsTypeService.selectList(wrapper); return R.ok(exportSupport(list, fields)); } @RequestMapping(value = "/basWhsQuery/auth") @ManagerAuth public R query(String condition) { EntityWrapper<BasWhs> wrapper = new EntityWrapper<>(); EntityWrapper<BasWhsType> wrapper = new EntityWrapper<>(); wrapper.like("whs_desc", condition); Page<BasWhs> page = basWhsService.selectPage(new Page<>(0, 10), wrapper); Page<BasWhsType> page = basWhsTypeService.selectPage(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (BasWhs basWhs : page.getRecords()){ for (BasWhsType basWhsType : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", basWhs.getId()); map.put("value", basWhs.getWhsDesc()); map.put("id", basWhsType.getId()); map.put("value", basWhsType.getWhsDesc()); result.add(map); } return R.ok(result); @@ -123,9 +123,9 @@ @RequestMapping(value = "/basWhs/check/column/auth") @ManagerAuth public R query(@RequestBody JSONObject param) { Wrapper<BasWhs> wrapper = new EntityWrapper<BasWhs>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); if (null != basWhsService.selectOne(wrapper)){ return R.parse(BaseRes.REPEAT).add(getComment(BasWhs.class, String.valueOf(param.get("key")))); Wrapper<BasWhsType> wrapper = new EntityWrapper<BasWhsType>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val")); if (null != basWhsTypeService.selectOne(wrapper)){ return R.parse(BaseRes.REPEAT).add(getComment(BasWhsType.class, String.valueOf(param.get("key")))); } return R.ok(); } src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -33,23 +33,17 @@ @Autowired private LocDetlService locDetlService; @Autowired private BasWhsService basWhsService; private BasWhsTypeService basWhsTypeService; @Resource private WrkMastService wrkMastService; @Resource private AdjDetlService adjDetlService; @Resource private LocDetlMapper locDetlMapper; @Resource private CommonService commonService; @Resource private WrkMastLogService wrkMastLogService; @Resource private WrkDetlLogService wrkDetlLogService; @@ -83,7 +77,9 @@ excludeTrash(param); EntityWrapper<LocMast> wrapper = new EntityWrapper<>(); convert(param, wrapper); if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));} if (!Cools.isEmpty(orderByField)) { wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType)); } return R.ok(locMastService.selectPage(new Page<>(curr, limit), wrapper)); } @@ -282,8 +278,8 @@ public R init(LocMastInitParam param) { try{ List<LocMast> list = new ArrayList<>(); BasWhs basWhs = basWhsService.selectByIdentifying(param.getIdentifying()); if (Cools.isEmpty(basWhs)){ BasWhsType basWhsType = basWhsTypeService.selectByIdentifying(param.getIdentifying()); if (Cools.isEmpty(basWhsType)) { return R.error("库型不存在！！！"); } for (int r=param.getStartRow(); r<=param.getEndRow(); r++){ @@ -296,14 +292,12 @@ try{ Shelves shelves = new Shelves(param.getEndRow() - param.getStartRow() + 1, param.getCrnAmount(),param.getStartRow()); for (List<Integer> node : shelves.nodes){ if (node.contains(r)) { if (!Cools.isEmpty(param.getStaCrn()) && param.getStaCrn() > 0){ crnNo = shelves.nodes.indexOf(node) + param.getStaCrn(); }else { crnNo = shelves.nodes.indexOf(node) + 1; } break; } } @@ -327,7 +321,7 @@ locMast.setAppeTime(now); locMast.setModiUser(getUserId()); locMast.setModiTime(now); locMast.setWhsType(basWhs.getId()); locMast.setWhsType(basWhsType.getId()); list.add(locMast); } } src/main/java/com/zy/asrs/entity/BasWhsType.java
File was renamed from src/main/java/com/zy/asrs/entity/BasWhs.java @@ -14,8 +14,8 @@ import java.text.SimpleDateFormat; import java.util.Date; @TableName("asr_bas_whs") public class BasWhs implements Serializable { @TableName("asr_bas_whs_type") public class BasWhsType implements Serializable { private static final long serialVersionUID = 1L; @@ -67,9 +67,9 @@ @ApiModelProperty(value= "标识") private String identifying; public BasWhs() {} public BasWhsType() {} public BasWhs(String whsDesc,Long modiUser,Date modiTime,Long appeUser,Date appeTime) { public BasWhsType(String whsDesc, Long modiUser, Date modiTime, Long appeUser, Date appeTime) { this.whsDesc = whsDesc; this.modiUser = modiUser; this.modiTime = modiTime; src/main/java/com/zy/asrs/entity/LocMast.java
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.annotations.TableName; import com.baomidou.mybatisplus.enums.IdType; import com.zy.asrs.service.BasLocStsService; import com.zy.asrs.service.BasWhsService; import com.zy.asrs.service.BasWhsTypeService; import com.zy.system.entity.User; import com.zy.system.service.UserService; import com.core.common.Cools; @@ -197,10 +197,10 @@ public String getWhsType$(){ BasWhsService service = SpringUtils.getBean(BasWhsService.class); BasWhs basWhs = service.selectById(this.whsType); if (!Cools.isEmpty(basWhs)){ return String.valueOf(basWhs.getWhsDesc()); BasWhsTypeService service = SpringUtils.getBean(BasWhsTypeService.class); BasWhsType basWhsType = service.selectById(this.whsType); if (!Cools.isEmpty(basWhsType)){ return String.valueOf(basWhsType.getWhsDesc()); } return null; } src/main/java/com/zy/asrs/entity/OrderDetlPakin.java
@@ -20,6 +20,7 @@ import java.io.Serializable; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Objects; @Data @TableName("man_order_detl_pakin") @@ -418,6 +419,7 @@ } public String getPakinPakoutStatus$(){ if (Objects.isNull(pakinPakoutStatus)) {return null;} switch (this.pakinPakoutStatus){ case 1: return "Y"; src/main/java/com/zy/asrs/entity/RowLastno.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.BasWhsService; import com.zy.asrs.service.BasWhsTypeService; import com.zy.asrs.service.RowLastnoTypeService; import com.zy.system.entity.User; import com.zy.system.service.UserService; @@ -383,10 +383,10 @@ public String getTypeId$() { RowLastnoTypeService rowLastnoTypeService = SpringUtils.getBean(RowLastnoTypeService.class); RowLastnoType rowLastnoType = rowLastnoTypeService.selectById(this.typeId.longValue()); BasWhsService basWhsService = SpringUtils.getBean(BasWhsService.class); BasWhs basWhs = basWhsService.selectById(rowLastnoType.getType().longValue()); BasWhsTypeService basWhsTypeService = SpringUtils.getBean(BasWhsTypeService.class); BasWhsType basWhsType = basWhsTypeService.selectById(rowLastnoType.getType().longValue()); if (!Cools.isEmpty(rowLastnoType)){ return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+basWhs.getWhsDesc(); return rowLastnoType.getTypeName()+"<==>"+rowLastnoType.getMemo()+"<==>"+ basWhsType.getWhsDesc(); } return typeId.toString(); } src/main/java/com/zy/asrs/mapper/BasWhsMapper.java
@@ -1,15 +1,15 @@ package com.zy.asrs.mapper; import com.baomidou.mybatisplus.mapper.BaseMapper; import com.zy.asrs.entity.BasWhs; import com.zy.asrs.entity.BasWhsType; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; import org.springframework.stereotype.Repository; @Mapper @Repository public interface BasWhsMapper extends BaseMapper<BasWhs> { public interface BasWhsMapper extends BaseMapper<BasWhsType> { BasWhs selectByIdentifying(@Param("identifying") String identifying); BasWhsType selectByIdentifying(@Param("identifying") String identifying); } src/main/java/com/zy/asrs/service/BasWhsService.java
File was deleted src/main/java/com/zy/asrs/service/BasWhsTypeService.java
New file @@ -0,0 +1,8 @@ package com.zy.asrs.service; import com.baomidou.mybatisplus.service.IService; import com.zy.asrs.entity.BasWhsType; public interface BasWhsTypeService extends IService<BasWhsType> { BasWhsType selectByIdentifying(String Identifying); } src/main/java/com/zy/asrs/service/impl/BasWhsServiceImpl.java
File was deleted src/main/java/com/zy/asrs/service/impl/BasWhsTypeServiceImpl.java
New file @@ -0,0 +1,15 @@ package com.zy.asrs.service.impl; import com.baomidou.mybatisplus.service.impl.ServiceImpl; import com.zy.asrs.entity.BasWhsType; import com.zy.asrs.mapper.BasWhsMapper; import com.zy.asrs.service.BasWhsTypeService; import org.springframework.stereotype.Service; @Service("basWhsService") public class BasWhsTypeServiceImpl extends ServiceImpl<BasWhsMapper, BasWhsType> implements BasWhsTypeService { @Override public BasWhsType selectByIdentifying(String identifying) { return this.baseMapper.selectByIdentifying(identifying); } } src/main/java/com/zy/common/CodeBuilder.java
@@ -17,10 +17,10 @@ // generator.table="sys_host"; // sqlserver generator.sqlOsType = SqlOsType.SQL_SERVER; generator.url="127.0.0.1:1433;databasename=source"; generator.url="127.0.0.1:1433;databasename=jsxswms"; generator.username="sa"; generator.password="sa@123"; generator.table="asr_app_version"; generator.password="Skyouc#23"; generator.table="asr_bas_whs"; generator.packagePath="com.zy.asrs"; generator.build(); } src/main/resources/application.yml
@@ -1,5 +1,5 @@ server: port: 8081 port: 8080 servlet: context-path: /@pom.build.finalName@ @@ -22,9 +22,10 @@ # url: jdbc:sqlserver://192.168.4.191:50948;databasename=source # username: sa # password: sa@123 url: jdbc:sqlserver://127.0.0.1:62316;databasename=source # url: jdbc:sqlserver://127.0.0.1:62316;databasename=source username: sa password: sa@123 password: Skyouc#23 url: jdbc:sqlserver://127.0.0.1:1433;databasename=jsxswms mvc: static-path-pattern: /** redis: @@ -39,8 +40,12 @@ mybatis-plus: mapper-locations: classpath:mapper/*.xml # global-config: # field-strategy: 0 configuration: log-impl: org.apache.ibatis.logging.stdout.StdOutImpl logging: file: path: /stock/out/@pom.build.finalName@/logs super: src/main/resources/mapper/BasWhsMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="com.zy.asrs.mapper.BasWhsMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhs"> <resultMap id="BaseResultMap" type="com.zy.asrs.entity.BasWhsType"> <id column="id" property="id" /> <result column="whs_desc" property="whsDesc" /> <result column="modi_user" property="modiUser" /> @@ -16,7 +16,7 @@ <select id="selectByIdentifying" resultMap="BaseResultMap"> select top 1 * from asr_bas_whs from asr_bas_whs_type where 1=1 and identifying = #{identifying} </select> src/main/webapp/static/js/cool.js
@@ -67,7 +67,7 @@ function confirmed(val){ var inputDom = $("input[data-key="+val.substring(0,val.length - 6)+"]"); var selectDom = $("select[data-key="+val+"]"); console.log(val.substring(0, val.length - 6)) selectDom.dblclick(function(){ inputDom.focus(); selectDom.css("display","none"); @@ -103,6 +103,7 @@ if (index !== -1){ return str.substring(0, index); } return str; } @@ -116,6 +117,7 @@ var banMsg; var tips; // 主键校验 function check(id, domain) { var param = { src/main/webapp/views/basWhs/basWhs.html
@@ -31,7 +31,7 @@ <!-- 表格 --> <div class="layui-form"> <table class="layui-hide" id="basWhs" lay-filter="basWhs"></table> <table class="layui-hide" id="basWhsType" lay-filter="basWhsType"></table> </div> <script type="text/html" id="toolbar"> <div class="layui-btn-container"> @@ -49,7 +49,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/basWhs/basWhs.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/basWhsType/basWhsType.js" charset="utf-8"></script> <iframe id="detail-iframe" scrolling="auto" style="display:none;"></iframe>
@@ -26,7 +26,7 @@ <div class="layui-inline" style="width:80%;"> <label class="layui-form-label"><span class="not-null">*</span>编 号：</label> <div class="layui-input-inline"> <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhs')"> <input id="id" class="layui-input" type="text" onkeyup="check(this.id, 'basWhsType')"> </div> </div> <div class="layui-inline" style="width:80%;"> @@ -91,6 +91,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/basWhs/basWhs.js" charset="utf-8"></script> <script type="text/javascript" src="../../static/js/basWhsType/basWhsType.js" charset="utf-8"></script> </html> Binary files differ
