zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/PermissionController.java
New file @@ -0,0 +1,104 @@ package com.zy.asrs.common.wms.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.Permission; import com.zy.asrs.common.wms.service.PermissionService; import com.zy.asrs.framework.annotations.ManagerAuth; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.domain.KeyValueVo; import com.zy.asrs.framework.common.DateUtils; import com.zy.asrs.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @RestController public class PermissionController extends BaseController { @Autowired private PermissionService permissionService; @RequestMapping(value = "/permission/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(permissionService.getById(String.valueOf(id))); } @RequestMapping(value = "/permission/page/auth") @ManagerAuth public R page(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false) String condition, @RequestParam(required = false) String timeRange, @RequestParam Map<String, Object> param) { LambdaQueryWrapper<Permission> wrapper = new LambdaQueryWrapper<>(); if (!Cools.isEmpty(condition)) { wrapper.like(Permission::getName, condition); } if (!Cools.isEmpty(timeRange)) { String[] range = timeRange.split(RANGE_TIME_LINK); } return R.ok(permissionService.page(new Page<>(curr, limit), wrapper)); } @RequestMapping(value = "/permission/add/auth") @ManagerAuth public R add(Permission permission) { permissionService.save(permission); return R.ok(); } @RequestMapping(value = "/permission/update/auth") @ManagerAuth public R update(Permission permission){ if (Cools.isEmpty(permission) || null==permission.getId()){ return R.error(); } permissionService.updateById(permission); return R.ok(); } @RequestMapping(value = "/permission/delete/auth") @ManagerAuth public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ permissionService.removeById(id); } return R.ok(); } @RequestMapping(value = "/permissionQuery/auth") @ManagerAuth public R query(String condition) { LambdaQueryWrapper<Permission> wrapper = new LambdaQueryWrapper<>(); wrapper.like(Permission::getName, condition); Page<Permission> page = permissionService.page(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (Permission permission : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", permission.getId()); map.put("value", permission.getName()); result.add(map); } return R.ok(result); } @RequestMapping("/permission/all/get/kv") @ManagerAuth public R getDataKV(@RequestParam(required = false) String condition) { List<KeyValueVo> vos = new ArrayList<>(); LambdaQueryWrapper<Permission> wrapper = new LambdaQueryWrapper<>(); if (!Cools.isEmpty(condition)) { wrapper.like(Permission::getName, condition); } permissionService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getName()), item.getId()))); return R.ok().add(vos); } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/RolePermissionController.java
New file @@ -0,0 +1,104 @@ package com.zy.asrs.common.wms.controller; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.RolePermission; import com.zy.asrs.common.wms.service.RolePermissionService; import com.zy.asrs.framework.annotations.ManagerAuth; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.domain.KeyValueVo; import com.zy.asrs.framework.common.DateUtils; import com.zy.asrs.common.web.BaseController; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.*; @RestController public class RolePermissionController extends BaseController { @Autowired private RolePermissionService rolePermissionService; @RequestMapping(value = "/rolePermission/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { return R.ok(rolePermissionService.getById(String.valueOf(id))); } @RequestMapping(value = "/rolePermission/page/auth") @ManagerAuth public R page(@RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "10") Integer limit, @RequestParam(required = false) String condition, @RequestParam(required = false) String timeRange, @RequestParam Map<String, Object> param) { LambdaQueryWrapper<RolePermission> wrapper = new LambdaQueryWrapper<>(); if (!Cools.isEmpty(condition)) { wrapper.like(RolePermission::getId, condition); } if (!Cools.isEmpty(timeRange)) { String[] range = timeRange.split(RANGE_TIME_LINK); } return R.ok(rolePermissionService.page(new Page<>(curr, limit), wrapper)); } @RequestMapping(value = "/rolePermission/add/auth") @ManagerAuth public R add(RolePermission rolePermission) { rolePermissionService.save(rolePermission); return R.ok(); } @RequestMapping(value = "/rolePermission/update/auth") @ManagerAuth public R update(RolePermission rolePermission){ if (Cools.isEmpty(rolePermission) || null==rolePermission.getId()){ return R.error(); } rolePermissionService.updateById(rolePermission); return R.ok(); } @RequestMapping(value = "/rolePermission/delete/auth") @ManagerAuth public R delete(@RequestParam(value="ids[]") Long[] ids){ for (Long id : ids){ rolePermissionService.removeById(id); } return R.ok(); } @RequestMapping(value = "/rolePermissionQuery/auth") @ManagerAuth public R query(String condition) { LambdaQueryWrapper<RolePermission> wrapper = new LambdaQueryWrapper<>(); wrapper.like(RolePermission::getId, condition); Page<RolePermission> page = rolePermissionService.page(new Page<>(0, 10), wrapper); List<Map<String, Object>> result = new ArrayList<>(); for (RolePermission rolePermission : page.getRecords()){ Map<String, Object> map = new HashMap<>(); map.put("id", rolePermission.getId()); map.put("value", rolePermission.getId()); result.add(map); } return R.ok(result); } @RequestMapping("/rolePermission/all/get/kv") @ManagerAuth public R getDataKV(@RequestParam(required = false) String condition) { List<KeyValueVo> vos = new ArrayList<>(); LambdaQueryWrapper<RolePermission> wrapper = new LambdaQueryWrapper<>(); if (!Cools.isEmpty(condition)) { wrapper.like(RolePermission::getId, condition); } rolePermissionService.page(new Page<>(1, 30), wrapper).getRecords().forEach(item -> vos.add(new KeyValueVo(String.valueOf(item.getId()), item.getId()))); return R.ok().add(vos); } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/Permission.java
New file @@ -0,0 +1,98 @@ package com.zy.asrs.common.wms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.zy.asrs.common.sys.entity.Resource; import com.zy.asrs.common.sys.service.ResourceService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.SpringUtils; import com.zy.asrs.common.sys.entity.User; import com.zy.asrs.common.sys.entity.Host; import com.zy.asrs.common.sys.service.UserService; import com.zy.asrs.common.sys.service.HostService; import java.io.Serializable; import java.util.Date; @Data @TableName("sys_permission") public class Permission implements Serializable { private static final long serialVersionUID = 1L; /** * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 权限名称 */ @ApiModelProperty(value= "权限名称") private String name; /** * 接口地址 */ @ApiModelProperty(value= "接口地址") private String action; /** * 所属菜单 */ @ApiModelProperty(value= "所属菜单") private Long resourceId; /** * 状态 1: 正常 0: 禁用 */ @ApiModelProperty(value= "状态 1: 正常 0: 禁用 ") private Short status; public Permission() {} public Permission(String name,String action,Long resourceId,Short status) { this.name = name; this.action = action; this.resourceId = resourceId; this.status = status; } // Permission permission = new Permission( // null, // 权限名称[非空] // null, // 接口地址[非空] // null, // 所属菜单 // null // 状态[非空] // ); public String getResourceId$(){ ResourceService service = SpringUtils.getBean(ResourceService.class); Resource resource = service.getById(this.resourceId); if (!Cools.isEmpty(resource)){ return String.valueOf(resource.getName()); } return null; } public String getStatus$(){ if (null == this.status){ return null; } switch (this.status){ case 1: return "正常"; case 0: return "禁用"; default: return String.valueOf(this.status); } } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/entity/RolePermission.java
New file @@ -0,0 +1,80 @@ package com.zy.asrs.common.wms.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.zy.asrs.common.sys.entity.Role; import com.zy.asrs.common.sys.service.RoleService; import com.zy.asrs.common.wms.service.PermissionService; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.SpringUtils; import com.zy.asrs.common.sys.entity.User; import com.zy.asrs.common.sys.entity.Host; import com.zy.asrs.common.sys.service.UserService; import com.zy.asrs.common.sys.service.HostService; import java.io.Serializable; import java.util.Date; @Data @TableName("sys_role_permission") public class RolePermission implements Serializable { private static final long serialVersionUID = 1L; /** * 编号 */ @ApiModelProperty(value= "编号") @TableId(value = "id", type = IdType.AUTO) private Long id; /** * 角色 */ @ApiModelProperty(value= "角色") private Long roleId; /** * 权限 */ @ApiModelProperty(value= "权限") private Long permissionId; public RolePermission() {} public RolePermission(Long roleId,Long permissionId) { this.roleId = roleId; this.permissionId = permissionId; } // RolePermission rolePermission = new RolePermission( // null, // 角色[非空] // null // 权限[非空] // ); public String getRoleId$(){ RoleService service = SpringUtils.getBean(RoleService.class); Role role = service.getById(this.roleId); if (!Cools.isEmpty(role)){ return String.valueOf(role.getName()); } return null; } public String getPermissionId$(){ PermissionService service = SpringUtils.getBean(PermissionService.class); Permission permission = service.getById(this.permissionId); if (!Cools.isEmpty(permission)){ return String.valueOf(permission.getName()); } return null; } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/PermissionMapper.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.common.wms.mapper; import com.zy.asrs.common.wms.entity.Permission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface PermissionMapper extends BaseMapper<Permission> { } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/mapper/RolePermissionMapper.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.common.wms.mapper; import com.zy.asrs.common.wms.entity.RolePermission; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import org.apache.ibatis.annotations.Mapper; import org.springframework.stereotype.Repository; @Mapper @Repository public interface RolePermissionMapper extends BaseMapper<RolePermission> { } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/MobileService.java
@@ -2,6 +2,7 @@ import com.zy.asrs.common.domain.param.MobileAdjustParam; import com.zy.asrs.common.openapi.entity.param.CombParam; import com.zy.asrs.framework.common.R; public interface MobileService { @@ -15,4 +16,5 @@ */ void adjust(MobileAdjustParam param, Long userId, Long hostId); R WarehouseIn(String locNo, String barcode,Long hostId); } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/PermissionService.java
New file @@ -0,0 +1,8 @@ package com.zy.asrs.common.wms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zy.asrs.common.wms.entity.Permission; public interface PermissionService extends IService<Permission> { } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/RolePermissionService.java
New file @@ -0,0 +1,8 @@ package com.zy.asrs.common.wms.service; import com.baomidou.mybatisplus.extension.service.IService; import com.zy.asrs.common.wms.entity.RolePermission; public interface RolePermissionService extends IService<RolePermission> { } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/MobileServiceImpl.java
@@ -5,11 +5,16 @@ import com.zy.asrs.common.domain.param.MobileAdjustParam; import com.zy.asrs.common.openapi.entity.param.CombParam; import com.zy.asrs.common.wms.entity.*; import com.zy.asrs.common.wms.mapper.LocDetlMapper; import com.zy.asrs.common.wms.service.*; import com.zy.asrs.framework.common.BaseRes; import com.zy.asrs.framework.common.Cools; import com.zy.asrs.framework.common.R; import com.zy.asrs.framework.exception.CoolException; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.session.ExecutorType; import org.apache.ibatis.session.SqlSession; import org.apache.ibatis.session.SqlSessionFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -40,6 +45,12 @@ private WrkMastService wrkMastService; @Autowired private WrkDetlService wrkDetlService; @Autowired private LocMastService locMastService; @Autowired private LocDetlService locDetlService; @Autowired private WaitPakinLogService waitPakinLogService; @Override @Transactional @@ -222,4 +233,53 @@ } } @Override @Transactional public R WarehouseIn(String locNo, String barcode,Long hostId) { //判断库位状态 LocMast locMast = locMastService.getOne(new LambdaQueryWrapper<LocMast>().eq(LocMast::getLocNo, locNo).eq(LocMast::getHostId,hostId)); if (Cools.isEmpty(locMast)){ return R.error("该库位不存在"); } if (!locMast.getLocSts().equals("O")){ return R.error("该库位状态为:"+locMast.getLocSts()+",禁止入库"); } //查询组托数据 List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, barcode).eq(WaitPakin::getHostId, hostId)); if (Cools.isEmpty(list)){ return R.error("未找到组托信息"); } Date now = new Date(); //插入库存数据 for (WaitPakin waitPakin: list){ Mat mat = matService.getOne(new LambdaQueryWrapper<Mat>().eq(Mat::getMatnr, waitPakin.getMatnr()).eq(Mat::getHostId, hostId)); LocDetl locDetl = new LocDetl(); locDetl.sync(mat); locDetl.setLocNo(locNo); // locDetl.setBarcode(waitPakin.getBarcode()); locDetl.setZpallet(waitPakin.getZpallet()); locDetl.setAnfme(waitPakin.getAnfme()); locDetl.setBatch(waitPakin.getBatch()); // locDetl.setWeight(waitPakin.getWeight()); locDetl.setHostId(hostId); locDetl.setModiTime(now); locDetl.setAppeTime(now); locDetlService.save(locDetl); } //修改库位状态 locMast.setLocSts("F"); locMast.setModiTime(now); locMastService.updateById(locMast); // 保存入库通知档历史档 if (!waitPakinLogService.saveToHistory(barcode, hostId)) { throw new CoolException("保存组托数据失败"); } // 删除入库通知档 if (!waitPakinService.remove(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, barcode).eq(WaitPakin::getHostId, hostId))) { throw new CoolException("删除组托数据失败"); } return R.ok("上架成功"); } } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/PermissionServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.common.wms.service.impl; import com.zy.asrs.common.wms.mapper.PermissionMapper; import com.zy.asrs.common.wms.entity.Permission; import com.zy.asrs.common.wms.service.PermissionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service("permissionService") public class PermissionServiceImpl extends ServiceImpl<PermissionMapper, Permission> implements PermissionService { } zy-asrs-common/src/main/java/com/zy/asrs/common/wms/service/impl/RolePermissionServiceImpl.java
New file @@ -0,0 +1,12 @@ package com.zy.asrs.common.wms.service.impl; import com.zy.asrs.common.wms.mapper.RolePermissionMapper; import com.zy.asrs.common.wms.entity.RolePermission; import com.zy.asrs.common.wms.service.RolePermissionService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; @Service("rolePermissionService") public class RolePermissionServiceImpl extends ServiceImpl<RolePermissionMapper, RolePermission> implements RolePermissionService { } zy-asrs-common/src/main/resources/mapper/wms/PermissionMapper.xml
New file @@ -0,0 +1,5 @@ <?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.common.wms.mapper.PermissionMapper"> </mapper> zy-asrs-common/src/main/resources/mapper/wms/RolePermissionMapper.xml
New file @@ -0,0 +1,5 @@ <?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.common.wms.mapper.RolePermissionMapper"> </mapper> zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.*; import java.util.stream.Collectors; /** * 移动端接口控制器 @@ -42,6 +43,31 @@ private LocDetlService locDetlService; @Autowired private BasDevpService basDevpService; @Autowired private RolePermissionService rolePermissionService; @Autowired private PermissionService permissionService; @RequestMapping("/pda/WarehouseIn") @ManagerAuth public R WarehouseIn(@RequestParam String locNo,@RequestParam String barcode){ return mobileService.WarehouseIn(locNo,barcode,getHostId()); } @RequestMapping("/menu/pda/auth") @ManagerAuth public R menuPda(){ List<RolePermission> rolePermissions; Long roleId = getUser().getRoleId(); rolePermissions = rolePermissionService.list(new LambdaQueryWrapper<RolePermission>().eq(RolePermission::getRoleId, getHostId())); if (Cools.isEmpty(rolePermissions)) { return R.ok(); } List<Long> collect = rolePermissions.stream().map(RolePermission::getPermissionId).distinct().collect(Collectors.toList()); List<Permission> permissions = permissionService.listByIds(collect); return R.ok().add(permissions); } /** * 根据单号检索单据数据 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.Mat; import com.zy.asrs.common.wms.entity.WaitPakin; import com.zy.asrs.common.wms.service.WaitPakinService; import com.zy.asrs.framework.annotations.ManagerAuth; @@ -23,6 +24,15 @@ @Autowired private WaitPakinService waitPakinService; @RequestMapping(value = "/waitPakin/forBarcode/auth") @ManagerAuth public R forBarcode(@RequestParam("barcode") String barcode) { List<WaitPakin> list = waitPakinService.list(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getZpallet, barcode).eq(WaitPakin::getHostId, getHostId())); if (Cools.isEmpty(list)){ return R.error("未找到组托信息"); } return R.ok(list); } @RequestMapping(value = "/waitPakin/{id}/auth") @ManagerAuth public R get(@PathVariable("id") String id) { zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WaitPakinLogController.java
@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.zy.asrs.common.wms.entity.WaitPakin; import com.zy.asrs.common.wms.entity.WaitPakinLog; import com.zy.asrs.common.wms.service.WaitPakinLogService; import com.zy.asrs.framework.annotations.ManagerAuth; @@ -37,6 +38,7 @@ @RequestParam(required = false) String timeRange, @RequestParam Map<String, Object> param) { LambdaQueryWrapper<WaitPakinLog> wrapper = new LambdaQueryWrapper<>(); wrapper.eq(WaitPakinLog::getHostId, getHostId()); if (!Cools.isEmpty(condition)) { wrapper.like(WaitPakinLog::getId, condition); } zy-asrs-wms/src/main/java/com/zy/asrs/wms/utils/CodeBuilder.java
@@ -21,14 +21,14 @@ generator.backendPrefixPath = "zy-asrs-common/"; generator.frontendPrefixPath = "zy-asrs-wms/"; generator.url="47.97.1.152:51433;databasename=jkasrs"; generator.url="127.0.0.1:1433;databasename=ncasrs"; generator.username="sa"; generator.password="Zoneyung@zy56$"; generator.table="wms_loc_main"; generator.password="sa@123"; generator.table="sys_permission"; generator.packagePath="com.zy.asrs.common.wms"; // generator.js = false; // generator.html = false; // generator.sql = false; generator.js = false; generator.html = false; generator.sql = false; // generator.controller = false; generator.build(); }