From afc14ea2055be933d8ec14ca8e9a917752d87ad8 Mon Sep 17 00:00:00 2001
From: Ryan <creaycat@gmail.com>
Date: 星期四, 03 四月 2025 20:27:25 +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 | 162 +++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 147 insertions(+), 15 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 2cf4547..330b9e5 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
@@ -2,14 +2,13 @@
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.entity.dto.ReceiptDetlsDto;
+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.QlyIsptItem;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.controller.param.LoginParam;
import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiOperation;
import org.apache.tika.utils.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -17,7 +16,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
import java.util.Objects;
/**
@@ -34,8 +32,6 @@
@Autowired
private MobileService mobileService;
-
-
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -61,17 +57,17 @@
/**
* 鏍囧噯鎵爜鏀惰揣淇℃伅
- * @param barcode
+ * @param trackCode
* @return
*/
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
- @GetMapping("/orders/{barcode}")
+ @GetMapping("/orders/{trackCode}")
@ApiOperation("鏍囧噯鎵爜鏀惰揣")
- public R getOrderBybarcode(@PathVariable String barcode) {
- if (StringUtils.isEmpty(barcode)) {
+ public R getOrderBybarcode(@PathVariable String trackCode) {
+ if (StringUtils.isEmpty(trackCode)) {
throw new CoolException("鏉＄爜涓嶈兘涓虹┖锛侊紒");
}
- return mobileService.getOrderByCode(barcode);
+ return mobileService.getOrderByCode(trackCode);
}
/**
@@ -79,7 +75,7 @@
* @param params
* @return
*/
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody ReceiptParams params) {
@@ -89,7 +85,6 @@
return mobileService.receiptToWarehouse(params);
}
-
@PreAuthorize("hasAuthority('manager:asnOrder:list')")
@PostMapping("/orders/other")
@ApiOperation("鍏跺畠鎵爜鏀惰揣")
@@ -97,8 +92,14 @@
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
return mobileService.otherReceipt(params);
+ }
+
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
+ @ApiOperation("鑾峰彇鏀惰揣鍖�")
+ @GetMapping("/areas/receipt")
+ public R getReceiptAreas() {
+ return mobileService.getReceiptAreas();
}
@@ -110,4 +111,135 @@
}
+ @PreAuthorize("hasAuthority('manager:asnOrder:list')")
+ @GetMapping("/dynamic/fields")
+ @ApiOperation("鑾峰彇鍔ㄦ�佸瓧娈�")
+ public R getDynamicFields() {
+ return R.ok(mobileService.getDynamicFields());
+ }
+
+
+ @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
+ @ApiOperation("鑾峰彇璁㈠崟鐗╂枡鏄庣粏")
+ @GetMapping("/asnOrderItem/trackCode/{code}")
+ public R getItemByTrackCode(@PathVariable String code) {
+ if (StringUtils.isBlank(code)) {
+ return R.error("缂栫爜涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.getDeltByCode(code);
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("缁勬嫋")
+ @PostMapping("/waitPakin/merge")
+ public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
+ if (Objects.isNull(waitPakin)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (org.apache.commons.lang3.StringUtils.isBlank(waitPakin.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
+ return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ return R.ok(mobileService.mergeItems(waitPakin));
+ }
+
+ @PreAuthorize("hasAuthority('manager:waitPakin:update')")
+ @ApiOperation("缁勬嫋瑙ｇ粦")
+ @PostMapping("/waitPakin/unbind")
+ public R pakinUnBind(@RequestBody WaitPakinParam param) {
+ if (Objects.isNull(param)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ if (org.apache.commons.lang3.StringUtils.isBlank(param.getBarcode())) {
+ return R.error("鎵樼洏鐮佷笉鑳戒负绌猴紒锛�");
+ }
+ if (Objects.isNull(param.getItems()) || param.getItems().isEmpty()) {
+ 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/public/{code}")
+ public R taskToLocs(@PathVariable String code) throws Exception {
+ if (Objects.isNull(code)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return mobileService.taskGetLocs(code);
+ }
+
}
--
Gitblit v1.9.1