From b778c28b598eecd0687f0612f9236c6e957de89f Mon Sep 17 00:00:00 2001 From: verou <857149855@qq.com> Date: 星期四, 03 四月 2025 16:59:34 +0800 Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop --- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 90 +++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 83 insertions(+), 7 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java index 3de8e21..b9cd28e 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java @@ -1,13 +1,11 @@ package com.vincent.rsf.server.api.controller; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; -import com.vincent.rsf.server.api.controller.params.OtherReceiptParams; -import com.vincent.rsf.server.api.controller.params.ReceiptParams; +import com.vincent.rsf.server.api.controller.params.*; import com.vincent.rsf.server.api.service.MobileService; import com.vincent.rsf.server.manager.controller.params.WaitPakinParam; -import com.vincent.rsf.server.manager.entity.AsnOrderItem; +import com.vincent.rsf.server.manager.entity.QlyIsptItem; import com.vincent.rsf.server.system.controller.BaseController; import com.vincent.rsf.server.system.controller.param.LoginParam; import io.swagger.annotations.Api; @@ -87,7 +85,6 @@ return mobileService.receiptToWarehouse(params); } - @PreAuthorize("hasAuthority('manager:asnOrder:list')") @PostMapping("/orders/other") @ApiOperation("鍏跺畠鎵爜鏀惰揣") @@ -129,9 +126,8 @@ if (StringUtils.isBlank(code)) { return R.error("缂栫爜涓嶈兘涓虹┖锛侊紒"); } - return R.ok(mobileService.getDeltByCode(code)); + return mobileService.getDeltByCode(code); } - @PreAuthorize("hasAuthority('manager:waitPakin:update')") @ApiOperation("缁勬嫋") @@ -163,7 +159,87 @@ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�"); } return R.ok(mobileService.unBind(param)); + } + @ApiOperation("鎶ユ") + @GetMapping("/asnOrder/inspect/{code}") + @PreAuthorize("hasAuthority('manager:waitPakin:list')") + public R getAsnOdrers(@PathVariable String code) { + if (Objects.isNull(code)) { + throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.inspect(code, getLoginUserId()); + } + + @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); + } + + @ApiOperation("蹇�熻川妫�淇℃伅") + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") + @PostMapping("/inspect/query") + public R checkObjs(@RequestBody CheckObjParams params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.checkObjs(params); + } + + + @ApiOperation("蹇甫璐ㄦ") + @PreAuthorize("hasAuthority('manager:qlyInspect:update')") + @PostMapping("/inspect/check/update") + public R checkUpdate(@RequestBody QlyIsptItem params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.checkUpdate(params); + } + + @ApiOperation("鑾峰彇涓婃灦淇℃伅") + @PreAuthorize("hasAuthority('manager:qlyInspect:list')") + @PostMapping("/stock/operate/list") + public R operateToStock(@RequestBody OpStockParams params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.operateToStock(params); + } + + @ApiOperation("浜哄伐涓婃灦") + @PreAuthorize("hasAuthority('manager:qlyInspect:update')") + @PostMapping("/stock/operate") + public R publicToStock(@RequestBody PublicToStockParams params) { + if (Objects.isNull(params)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + 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)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.taskToStock(code); + } + + @ApiOperation("浠诲姟涓婃灦") + @PreAuthorize("hasAuthority('manager:qlyInspect:update')") + @PostMapping("/task/stock") + public R taskToLocs(@PathVariable String code) throws Exception { + if (Objects.isNull(code)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return mobileService.taskGetLocs(code); } } -- Gitblit v1.9.1