rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/AgvController.java
@@ -25,7 +25,6 @@ private AgvService agvService; @ApiOperation("站点绑定查询") @PreAuthorize("hasAuthority('manager:basStation:list')") @PostMapping("/staBind/list") public R getStaBindList(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { @@ -35,7 +34,6 @@ } @ApiOperation("站点查询") @PreAuthorize("hasAuthority('manager:basStation:list')") @PostMapping("/staMsg/select") public R getStaMsgSelect(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { @@ -44,7 +42,6 @@ return agvService.getStaMsgSelect(params); } @PreAuthorize("hasAuthority('manager:basStation:list')") @ApiOperation("站点绑定") @PostMapping("/AGV/staBind") public R getAGVStaBind(@RequestBody WaitPakinParam waitPakinPda) { @@ -54,7 +51,6 @@ return agvService.getAGVStaBind(waitPakinPda); } @PreAuthorize("hasAuthority('manager:basStation:list')") @ApiOperation("站点解绑") @PostMapping("/AGV/staUnBind") public R getAGVStaUnBind(@RequestBody Map<String, Object> params) { @@ -64,7 +60,6 @@ return agvService.AGVStaUnBind(params); } @PreAuthorize("hasAuthority('manager:basStation:list')") @ApiOperation("AGV启动入库") @PostMapping("/AGV/task/start") public R AGVInTaskStart(@RequestBody WaitPakinParam waitPakinPda) { @@ -74,7 +69,6 @@ return agvService.AGVInTaskStart(waitPakinPda, getLoginUserId()); } @PreAuthorize("hasAuthority('manager:basStation:list')") @ApiOperation("AGV绑定&入库") @PostMapping("/AGV/bindAndIn/start") public R AGVBindAndInTaskStart(@RequestBody WaitPakinParam waitPakinPda) { rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
@@ -23,11 +23,10 @@ @Autowired private InBoundService inBoundService; @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/in/emptyContainer/warehousing") @ApiOperation("空容器入库") public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) { return inBoundService.generateTasks(param,getLoginUserId()); return inBoundService.generateTasks(param, getLoginUserId()); } } rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -49,8 +49,10 @@ private WaitPakinService waitPakinService; @Autowired private AgvService agvService; /** * PDA用户登录 * * @param param * @param request * @return @@ -71,16 +73,15 @@ return mobileService.login(param, request); } /** * 标准扫码收货信息 * * @param trackCode * @return */ @PreAuthorize("hasAuthority('manager:asnOrder:list')") @GetMapping("/orders/{trackCode}") @ApiOperation("标准扫码收货") public R getOrderBybarcode(@PathVariable String trackCode) { public R getOrderBybarcode(@PathVariable String trackCode) { if (StringUtils.isEmpty(trackCode)) { throw new CoolException("条码不能为空！！"); } @@ -89,20 +90,19 @@ /** * 确认收货信息 * * @param params * @return */ @PreAuthorize("hasAuthority('manager:warehouseAreas:save')") @PostMapping("/orders/confirm") @ApiOperation("确认收货") public R confirmReceipt(@RequestBody Map<String, Object> params) { if (Objects.isNull(params)) { throw new CoolException("请求参数不能为空！！"); } if (Objects.isNull(params)) { throw new CoolException("请求参数不能为空！！"); } return mobileService.receiptToWarehouse(params, getLoginUserId()); } @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping("/orders/other") @ApiOperation("其它扫码收货") public R getOtherReceipt(@RequestBody OtherReceiptParams params) { @@ -112,38 +112,30 @@ return mobileService.otherReceipt(params); } @PreAuthorize("hasAuthority('manager:warehouseAreas:list')") @ApiOperation("获取收货区") @GetMapping("/areas/receipt") public R getReceiptAreas() { return mobileService.getReceiptAreas(getLoginUser()); } @PreAuthorize("hasAuthority('manager:warehouseAreas:list')") @ApiOperation("获取可用库区") @GetMapping("/areas/user/all") public R getAreasUserAll() { return mobileService.getAreasUserAll(getLoginUser()); } @PreAuthorize("hasAuthority('manager:asnOrder:list')") @GetMapping("/orders/asn") @ApiOperation("获取通知单") public R getAllAsnOrders() { return R.ok(mobileService.getAllAsnOrders()); } @PreAuthorize("hasAuthority('manager:asnOrder:list')") @GetMapping("/dynamic/fields") @ApiOperation("获取动态字段") public R getDynamicFields() { return R.ok(mobileService.getDynamicFields()); } @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") @ApiOperation("获取订单物料明细") @PostMapping("/asnOrderItem/trackCode") public R getItemByTrackCode(@RequestBody Map<String, Object> params) { @@ -153,7 +145,6 @@ return mobileService.getDeltByCode(params); } @PreAuthorize("hasAuthority('manager:asnOrderItem:list')") @ApiOperation("获取拖盘明细") @PostMapping("/asnOrderItem/container") public R getItemByContainer(@RequestBody Map<String, Object> params) { @@ -163,17 +154,16 @@ if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) { return mobileService.getUnItemByContainer(params); } else { return mobileService.getItemByContainer(params,getLoginUser()); return mobileService.getItemByContainer(params, getLoginUser()); } } @PreAuthorize("hasAuthority('manager:waitPakin:update')") @ApiOperation("组托") @PostMapping("/waitPakin/merge") public R pikinOrder(@RequestBody WaitPakinParam waitPakin) { Long userId = getLoginUserId(); if (Objects.isNull(waitPakin)) { return R.error( "参数不能为空！！"); return R.error("参数不能为空！！"); } if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) { return R.error("托盘码不能为空！！"); @@ -181,15 +171,14 @@ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) { return R.error("跟踪码不能为空！！"); } try{ try { mobileService.mergeItemsWcs(waitPakin, userId); } catch (Exception e){ } catch (Exception e) { return R.error(e.getMessage()); } return R.ok(); } @PreAuthorize("hasAuthority('manager:waitPakin:update')") @ApiOperation("组拖解绑") @PostMapping("/waitPakin/unbind") public R pakinUnBind(@RequestBody WaitPakinParam param) { @@ -207,7 +196,7 @@ @ApiOperation("报检") @GetMapping("/asnOrder/inspect/{code}") @PreAuthorize("hasAuthority('manager:waitPakin:list')") public R getAsnOdrers(@PathVariable String code) { if (Objects.isNull(code)) { throw new CoolException("参数不能为空！！"); @@ -217,17 +206,17 @@ @ApiOperation("提交报检") @GetMapping("/inspect/confirm/{id}") @PreAuthorize("hasAuthority('manager:waitPakin:list')") public R confirmInspect(@PathVariable String id) { if (Objects.isNull(id)) { throw new CoolException("参数不能为空！"); } return mobileService.confirmIspt(id); return mobileService.confirmIspt(id); } @ApiOperation("快速质检信息") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") // @PostMapping("/inspect/query") // @PostMapping("/inspect/query") public R checkObjs(@RequestBody CheckObjParams params) { if (Objects.isNull(params)) { return R.error("参数不能为空！！"); @@ -235,9 +224,8 @@ return mobileService.checkObjs(params); } @ApiOperation("快速质检") @PreAuthorize("hasAuthority('manager:qlyInspect:update')") @PostMapping("/inspect/check/update") public R checkUpdate(@RequestBody List<QlyIsptItem> params) { if (Objects.isNull(params) || params.isEmpty()) { @@ -247,7 +235,7 @@ } @ApiOperation("获取上架信息") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/stock/operate/list") public R operateToStock(@RequestBody OpStockParams params) { if (Objects.isNull(params)) { @@ -257,21 +245,22 @@ } @ApiOperation("人工上架") @PreAuthorize("hasAuthority('manager:qlyInspect:update')") @PostMapping("/stock/operate") public R publicToStock(@RequestBody ManualShelvingParams params) { if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode()) || Cools.isEmpty(params.getBarcode())) { if (Cools.isEmpty(params.getItemList()) || Cools.isEmpty(params.getLocCode()) || Cools.isEmpty(params.getBarcode())) { return R.error("参数不能为空！！"); } WaitPakin waitPakin = waitPakinService.getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode())); WaitPakin waitPakin = waitPakinService .getOne(new LambdaQueryWrapper<WaitPakin>().eq(WaitPakin::getBarcode, params.getBarcode())); return taskService.generateFlatWarehouseTasks(waitPakin, params.getLocCode(), getLoginUserId()); // return mobileService.publicToStock(params, getLoginUserId()); // return mobileService.publicToStock(params, getLoginUserId()); } @ApiOperation("获取任务信息") @PreAuthorize("hasAuthority('manager:qlyInspect:list')") @PostMapping("/task/stock/{code}") public R taskToStock(@PathVariable String code) { if (Objects.isNull(code)) { @@ -281,7 +270,7 @@ } @ApiOperation("任务上架") @PreAuthorize("hasAuthority('manager:qlyInspect:update')") @PostMapping("/task/public/{code}") public R taskToLocs(@PathVariable String code) throws Exception { if (Objects.isNull(code)) { @@ -292,7 +281,7 @@ @ApiOperation("一键收货") @PostMapping("/complete/{id}") @PreAuthorize("hasAuthority('manager:asnOrder:update')") public R completeOrder(@PathVariable Long id) { if (Objects.isNull(id)) { return R.error("参数不能为空！！"); @@ -300,20 +289,19 @@ return mobileService.completeOrder(id, getLoginUserId()); } @ApiOperation("获取不良托盘物料") @PostMapping("/defect/matnrs") @PreAuthorize("hasAuthority('manager:asnOrder:list')") public R getAsnDefectItemByCode(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { return R.error("参数不能为空！！"); } return mobileService.getItemByContainer(map,getLoginUser()); return mobileService.getItemByContainer(map, getLoginUser()); } @ApiOperation("获取订单不良物料") @PostMapping("/defect/{trackCode}") @PreAuthorize("hasAuthority('manager:asnOrder:list')") public R defectProducts(@PathVariable String trackCode) { if (Objects.isNull(trackCode)) { return R.error("参数不能为空！！"); @@ -323,7 +311,7 @@ @ApiOperation("获取组拖入库信息") @PostMapping("/pakin/info/{barcode}") @PreAuthorize("hasAuthority('manager:waitPakin:list')") public R getPakinInStock(@PathVariable String barcode) { if (Objects.isNull(barcode)) { return R.error("参数不能为空！！"); @@ -333,21 +321,21 @@ @ApiOperation("获取上架站点信息") @GetMapping("/inStock/sites") @PreAuthorize("hasAuthority('manager:deviceSite:list')") public R getTarSite() { return mobileService.getDeviceSites(); } @ApiOperation("获取推荐库位列表信息") @GetMapping("/locs/list") @PreAuthorize("hasAuthority('manager:deviceSite:list')") public R getLocs() { return mobileService.getRecommondLocs(); } @ApiOperation("生成任务列表") @PostMapping("/pakin/task") @PreAuthorize("hasAuthority('manager:deviceSite:list')") public R pakinToTask(@RequestBody Map<String, Object> map) { if (Objects.isNull(map)) { return R.error("参数不能为空！！"); @@ -355,4 +343,3 @@ return mobileService.generateTask(map, getLoginUserId()); } }
@@ -20,7 +20,6 @@ @Autowired private PdaCheckOrderService pdaCheckOrderService; @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/getCheckList") @ApiOperation("查询盘点差异单列表") public R getCheckList(@RequestBody Map<String, String> map) { @@ -28,15 +27,13 @@ return pdaCheckOrderService.getCheckList(map.get("code")); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/getCheckTaskItemList") @ApiOperation("查询盘点任务列表") public R getCheckTaskItemList(@RequestBody Map<String, String> map) { return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"),map.get("checkCode")); return pdaCheckOrderService.getCheckTaskItemList(map.get("barcode"), map.get("checkCode")); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/getCheckTaskItemList2") @ApiOperation("查询盘点任务列表,直接扫容器码") public R getCheckTaskItemList2(@RequestBody Map<String, String> map) { @@ -44,7 +41,6 @@ return pdaCheckOrderService.getCheckTaskItemList2(map.get("barcode")); } @PreAuthorize("hasAuthority('manager:task:list')") @GetMapping("/getCheckDiffReasonList") @ApiOperation("查询盘点差异原因") public R getCheckDiffReasonList() { @@ -52,14 +48,12 @@ return pdaCheckOrderService.getCheckDiffReasonList(); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/saveCheckDiff") @ApiOperation("保存盘点数据") public R saveCheckDiff(@RequestBody SaveCheckDiffParams saveCheckDiffParams) { return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams,getLoginUserId()); return pdaCheckOrderService.saveCheckDiff(saveCheckDiffParams, getLoginUserId()); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/selectAddMatnr") @ApiOperation("查询需要添加的物料") public R selectAddMatnr(@RequestBody Map<String, String> map) { rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/PdaOutStockController.java
@@ -42,7 +42,6 @@ @Autowired private DictDataService dictDataService; @PreAuthorize("hasAuthority('manager:task:list')") @GetMapping("/outStockTaskItem/{barcode}") @ApiOperation("快速拣货查询") public R getOutStockTaskItem(@PathVariable String barcode) { @@ -50,7 +49,6 @@ return pdaOutStockService.getOutStockTaskItem(barcode); } @PreAuthorize("hasAuthority('manager:task:list')") @GetMapping("/saveOutTaskSts/{barcode}") @ApiOperation("快速拣货") public R saveOutTaskSts(@PathVariable String barcode) { @@ -58,7 +56,6 @@ return pdaOutStockService.saveOutTaskSts(barcode); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/getWaveList") @ApiOperation("查询波次列表") public R getWaveListItem(@RequestBody Map<String, String> map) { @@ -66,7 +63,6 @@ return pdaOutStockService.getWaveListItem(map.get("barcode")); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/getContainerWaveList") @ApiOperation("根据容器码查询波次及出库单") public R getContainerWaveList(@RequestBody Map<String, String> map) { @@ -74,66 +70,64 @@ return pdaOutStockService.getContainerWaveList(map); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/saveWavePick") @ApiOperation("根据容器码查询波次及出库单") public R saveWavePick(@RequestBody ContainerWaveParam containerWaveParam) { return pdaOutStockService.saveWavePick(containerWaveParam,getLoginUserId()); return pdaOutStockService.saveWavePick(containerWaveParam, getLoginUserId()); } @PreAuthorize("hasAuthority('manager:task:list')") @PostMapping("/callForEmptyContainers") @ApiOperation("呼叫空容器") public R callForEmptyContainers(@RequestBody CallForEmptyContainersParam containerWaveParam) { return pdaOutStockService.callForEmptyContainers(containerWaveParam,getLoginUserId()); return pdaOutStockService.callForEmptyContainers(containerWaveParam, getLoginUserId()); } // @PreAuthorize("hasAuthority('manager:outStock:list')") // @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")))); return R.ok() .add(outStockItemService.list(new LambdaQueryWrapper<>(WkOrderItem.class).eq(WkOrderItem::getDeleted, 0) .eq(WkOrderItem::getOrderCode, param.getString("orderId")))); } @PostMapping("/orderOut/getType") public R orderOutGetType(@RequestBody OrderOutGeneralParam param) { if (Cools.isEmpty(param)){ if (Cools.isEmpty(param)) { return R.ok(); } List<DictData> dictData = dictDataService.list(new LambdaQueryWrapper<DictData>() .eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE) .in(DictData::getValue, param.getType()) ); .in(DictData::getValue, param.getType())); return R.ok(dictData); } @RequestMapping(value = "/orderOut/list") public R pdaPageList(@RequestParam(required = true)String orderNo, @RequestParam(defaultValue = "1")Integer curr, @RequestParam(defaultValue = "5")Integer limit){ public R pdaPageList(@RequestParam(required = true) String orderNo, @RequestParam(defaultValue = "1") Integer curr, @RequestParam(defaultValue = "5") Integer limit) { Page<WkOrder> page = new Page<>(curr, limit); LambdaQueryWrapper<WkOrder> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>(); wkOrderLambdaQueryWrapper.eq(WkOrder::getType, OrderType.ORDER_OUT.type); wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo),WkOrder::getCode, orderNo); wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrder::getCode, orderNo); Page<WkOrder> wkOrderPage = outStockService.page(page, wkOrderLambdaQueryWrapper); return R.ok(wkOrderPage); } @RequestMapping(value = "/orderOut/detlList") public R orderOutDetlList(@RequestParam(required = true)String orderNo){ public R orderOutDetlList(@RequestParam(required = true) String orderNo) { if (Cools.isEmpty(orderNo)){ if (Cools.isEmpty(orderNo)) { return R.error("订单号为空"); } LambdaQueryWrapper<WkOrderItem> wkOrderLambdaQueryWrapper = new LambdaQueryWrapper<>(); // wkOrderLambdaQueryWrapper.eq(WkOrderItem::getType, OrderType.ORDER_OUT.type); wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo),WkOrderItem::getOrderCode, orderNo); // wkOrderLambdaQueryWrapper.eq(WkOrderItem::getType, OrderType.ORDER_OUT.type); wkOrderLambdaQueryWrapper.eq(!Cools.isEmpty(orderNo), WkOrderItem::getOrderCode, orderNo); List<WkOrderItem> list = outStockItemService.list(wkOrderLambdaQueryWrapper); return R.ok(list); @@ -141,18 +135,16 @@ @PostMapping("/orderOut/getOutLocView") public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) { //参数 param.getOrderItemId()//出库预览 // 参数 param.getOrderItemId()//出库预览 return R.ok(); } // // @PostMapping("/orderOut/getOutLocRun") // public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) { // //参数 param.getOrderItemId()//出库执行 // // return R.ok(); // } // // @PostMapping("/orderOut/getOutLocRun") // public R orderOutGetOutLocView(@RequestBody OrderOutGeneralParam param) { // //参数 param.getOrderItemId()//出库执行 // // return R.ok(); // } }
