From 49190ef6af020bb5c14720a7cbef4ce5b640b0a4 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 01 四月 2025 09:59:51 +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 | 73 ++++++++++++++++++++++++++++++------
1 files changed, 61 insertions(+), 12 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 cc8ee72..bfa87a9 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,15 +1,16 @@
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.entity.dto.ReceiptDetlsDto;
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.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 +18,6 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletRequest;
-import java.util.List;
import java.util.Objects;
/**
@@ -34,8 +34,6 @@
@Autowired
private MobileService mobileService;
-
-
/**
* PDA鐢ㄦ埛鐧诲綍
* @param param
@@ -61,17 +59,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 +77,7 @@
* @param params
* @return
*/
- @PreAuthorize("hasAuthority('manager:warehouseAreasItem:save')")
+ @PreAuthorize("hasAuthority('manager:warehouseAreas:save')")
@PostMapping("/orders/confirm")
@ApiOperation("纭鏀惰揣")
public R confirmReceipt(@RequestBody ReceiptParams params) {
@@ -97,7 +95,6 @@
if (Objects.isNull(params)) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
}
-
return mobileService.otherReceipt(params);
}
@@ -117,4 +114,56 @@
}
+ @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));
+
+ }
+
}
--
Gitblit v1.9.1