From 65775e1357468c9abcf29d212eb0669d8282bf7a Mon Sep 17 00:00:00 2001
From: verou <857149855@qq.com>
Date: 星期五, 11 四月 2025 16:38:40 +0800
Subject: [PATCH] fix:收货单字段修改
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/MobileController.java | 110 ++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 104 insertions(+), 6 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 bfa87a9..aaffe4f 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;
@@ -18,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
+import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -80,13 +80,12 @@
@PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
- public R confirmReceipt(@RequestBody ReceiptParams params) {
+ public R confirmReceipt(@RequestBody Map<String, Object> params) {
if (Objects.isNull(params)) {
throw new CoolException("璇锋眰鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
return mobileService.receiptToWarehouse(params);
}
-
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/orders/other")
@@ -132,6 +131,15 @@
return mobileService.getDeltByCode(code);
}
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
+ @PostMapping("/asnOrderItem/container")
+ public R getItemByContainer(@RequestBody Map<String, Object> params) {
+ if (Objects.isNull(params)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getItemByContainer(params);
+ }
@PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬嫋")
@@ -163,7 +171,97 @@
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 List<QlyIsptItem> params) {
+ if (Objects.isNull(params) || params.isEmpty()) {
+ 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/public/{code}")
+ public R taskToLocs(@PathVariable String code) throws Exception {
+ if (Objects.isNull(code)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.taskGetLocs(code);
+ }
+
+ @ApiOperation("涓�閿敹璐�")
+ @PostMapping("/complete/{id}")
+ @PreAuthorize("hasAuthority('manager:asnOrder:update')")
+ public R completeOrder(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.completeOrder(id, getLoginUserId());
}
}
--
Gitblit v1.9.1