rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -1,16 +1,29 @@ package com.vincent.rsf.server.api.controller.pda; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.api.entity.dto.ContainerWaveDto; import com.vincent.rsf.server.api.entity.params.ContainerWaveParam; import com.vincent.rsf.server.api.service.PdaOutStockService; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.WkOrder; import com.vincent.rsf.server.manager.entity.WkOrderItem; import com.vincent.rsf.server.manager.service.OutStockItemService; import com.vincent.rsf.server.manager.service.OutStockService; import com.vincent.rsf.server.system.controller.BaseController; import com.vincent.rsf.server.system.entity.DictData; import com.vincent.rsf.server.system.service.DictDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -21,6 +34,10 @@ @Autowired private PdaOutStockService pdaOutStockService; @Resource private OutStockService outStockService; @Resource private OutStockItemService outStockItemService; @PreAuthorize("hasAuthority('manager:task:list')") @GetMapping("/outStockTaskItem/{barcode}") @@ -61,4 +78,12 @@ return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId()); } // @PreAuthorize("hasAuthority('manager:outStock:list')") @PostMapping("/outStockItem/page") public R page(@RequestBody JSONObject param) { return R.ok().add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0) .eq(WkOrderItem::getOrderCode, param.getString("orderId")))); } } rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/SysInfoController.java
New file @@ -0,0 +1,64 @@ package com.vincent.rsf.server.api.controller.pda; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.server.common.domain.BaseParam; import com.vincent.rsf.server.common.domain.PageParam; import com.vincent.rsf.server.manager.entity.BasStation; import com.vincent.rsf.server.manager.service.BasStationService; import com.vincent.rsf.server.manager.service.TransferService; import com.vincent.rsf.server.system.controller.BaseController; import com.vincent.rsf.server.system.entity.DictData; import com.vincent.rsf.server.system.service.DictDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.util.List; import java.util.Map; @Api(tags = "PDA获取信息接口") @RequestMapping("/pda") @RestController public class SysInfoController extends BaseController { @Resource private DictDataService dictDataService; @Resource private BasStationService basStationService; @ApiOperation("容器类型") // @PreAuthorize("hasAuthority('manager:basStation:list')") @GetMapping("/info/palletType/list") public R getPalletType() { return R.ok().add(dictDataService.list(new LambdaQueryWrapper<>(DictData.class) .eq(DictData::getDictTypeId, 16).eq(DictData::getDeleted, 0))); } // @PreAuthorize("hasAuthority('manager:basStation:list')") @PostMapping("/basStation/page") public R getBasStation(@RequestBody Map<String, Object> map) { BaseParam baseParam = buildParam(map, BaseParam.class); PageParam<BasStation, BaseParam> pageParam = new PageParam<>(baseParam, BasStation.class); PageParam<BasStation, BaseParam> page = basStationService.page(pageParam, pageParam.buildWrapper(true)); for (BasStation station : page.getRecords()) { if (!Cools.isEmpty(station.getCrossZoneArea())) { List<Long> longs1 = JSONObject.parseArray(station.getCrossZoneArea(), Long.class); station.setAreaIds(longs1); } if (!Cools.isEmpty(station.getContainerType())) { List<Long> longs1 = JSONObject.parseArray(station.getContainerType(), Long.class); station.setContainerTypes(longs1); } } return R.ok().add(page); } } rsf-server/src/main/java/com/vincent/rsf/server/system/controller/BaseController.java
@@ -49,6 +49,14 @@ }); map.remove("meta"); } // 移除筛选条件里面的 $ for (String key : map.keySet()) { Object value = map.get(key); if (key.equals("orderBy")) { String newValue = value.toString().replace("$", ""); map.replace("orderBy", value, newValue); } } T t = null; try { t = clz.getDeclaredConstructor().newInstance(); rsf-server/src/main/java/com/vincent/rsf/server/system/controller/MenuController.java
@@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.common.collect.Lists; import com.vincent.rsf.common.utils.Utils; import com.vincent.rsf.framework.common.Cools; import com.vincent.rsf.framework.common.R; @@ -43,6 +44,95 @@ @PreAuthorize("hasAuthority('system:menu:list')") @PostMapping("/menu/tree") public R tree(@RequestBody Map<String, Object> map) { String authType = map.get("authType") == null ? "0" : map.get("authType").toString(); if (!Cools.isEmpty(map.get("authType")) && !authType.equals("0")) { List<Menu> treeData = Lists.newArrayList(); if (authType.equals("1")) { // PDA权限 Menu menu = new Menu(); menu.setId(1L); menu.setCode("1"); menu.setName("入库"); Menu cmenu = new Menu(); cmenu.setId(11L); cmenu.setCode("1"); cmenu.setName("空托入库"); Menu cmenu1 = new Menu(); cmenu1.setId(12L); cmenu1.setCode("2"); cmenu1.setName("单据组托"); List<Menu> menus = Lists.newArrayList(); menus.add(cmenu); menus.add(cmenu1); menu.setChildren(menus); treeData.add(menu); Menu menu1 = new Menu(); menu1.setId(2L); menu1.setCode("2"); menu1.setName("出库"); treeData.add(menu1); Menu menu2 = new Menu(); menu2.setId(3L); menu2.setCode("3"); menu2.setName("综合"); treeData.add(menu2); return R.ok().add(treeData); } else if (authType.equals("2")) { // 仓库权限 Menu menu = new Menu(); menu.setId(1L); menu.setCode("1"); menu.setName("仓库"); Menu cmenu = new Menu(); cmenu.setId(11L); cmenu.setCode("1"); cmenu.setName("箱壳2#2F"); Menu cmenu1 = new Menu(); cmenu1.setId(12L); cmenu1.setCode("2"); cmenu1.setName("箱壳3#2F"); List<Menu> menus = Lists.newArrayList(); menus.add(cmenu); menus.add(cmenu1); menu.setChildren(menus); treeData.add(menu); Menu menu1 = new Menu(); menu1.setId(2L); menu1.setCode("2"); menu1.setName("物料分组"); Menu bmenu2 = new Menu(); bmenu2.setId(21L); bmenu2.setCode("1"); bmenu2.setName("原料"); Menu bmenu = new Menu(); bmenu.setId(22L); bmenu.setCode("1"); bmenu.setName("半成品"); Menu bmenu1 = new Menu(); bmenu1.setId(23L); bmenu1.setCode("2"); bmenu1.setName("成品"); List<Menu> menus1 = Lists.newArrayList(); menus1.add(bmenu); menus1.add(bmenu1); menu1.setChildren(menus1); treeData.add(menu1); return R.ok().add(treeData); } } // PageParam<Menu, BaseParam> param = new PageParam<>(buildParam(map, BaseParam.class), Menu.class); // QueryWrapper<Menu> wrapper = param.buildWrapper(true, queryWrapper -> queryWrapper.orderByAsc("sort")); // List<Menu> menus = menuService.list(wrapper);
