From eba3ce4a22ea7bd74c6ad4a9114039c3ce43f476 Mon Sep 17 00:00:00 2001
From: 1 <1@123>
Date: 星期三, 21 一月 2026 14:52:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop-phyz' into devlop-phyz
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java | 99 ++++++++++++++++++++++++++-----------------------
1 files changed, 52 insertions(+), 47 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
index 71510d6..021ef4a 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/MobileController.java
@@ -4,7 +4,11 @@
import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.CheckObjParams;
+import com.vincent.rsf.server.api.controller.erp.params.ManualShelvingParams;
+import com.vincent.rsf.server.api.controller.erp.params.OpStockParams;
+import com.vincent.rsf.server.api.controller.erp.params.OtherReceiptParams;
+import com.vincent.rsf.server.api.service.AgvService;
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;
@@ -43,8 +47,12 @@
private TaskService taskService;
@Autowired
private WaitPakinService waitPakinService;
+ @Autowired
+ private AgvService agvService;
+
/**
* PDA鐢ㄦ埛鐧诲綍
+ *
* @param param
* @param request
* @return
@@ -65,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("鏉＄爜涓嶈兘涓虹┖锛侊紒");
}
@@ -83,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) {
@@ -106,31 +112,30 @@
return mobileService.otherReceipt(params);
}
- @PreAuthorize("hasAuthority('manager:warehouseAreas:list')")
@ApiOperation("鑾峰彇鏀惰揣鍖�")
@GetMapping("/areas/receipt")
public R getReceiptAreas() {
- return mobileService.getReceiptAreas();
+ return mobileService.getReceiptAreas(getLoginUser());
}
+ @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) {
@@ -140,7 +145,6 @@
return mobileService.getDeltByCode(params);
}
- @PreAuthorize("hasAuthority('manager:asnOrderItem:list')")
@ApiOperation("鑾峰彇鎷栫洏鏄庣粏")
@PostMapping("/asnOrderItem/container")
public R getItemByContainer(@RequestBody Map<String, Object> params) {
@@ -150,11 +154,10 @@
if (!Objects.isNull(params.get("type")) && params.get("type").equals("unbind")) {
return mobileService.getUnItemByContainer(params);
} else {
- return mobileService.getItemByContainer(params);
+ return mobileService.getItemByContainer(params, getLoginUser());
}
}
- @PreAuthorize("hasAuthority('manager:waitPakin:update')")
@ApiOperation("缁勬墭")
@PostMapping("/waitPakin/merge")
public R pikinOrder(@RequestBody WaitPakinParam waitPakin) {
@@ -168,10 +171,14 @@
if (Objects.isNull(waitPakin.getItems()) || waitPakin.getItems().isEmpty()) {
return R.error("璺熻釜鐮佷笉鑳戒负绌猴紒锛�");
}
- return R.ok(mobileService.mergeItems(waitPakin, userId));
+ try {
+ mobileService.mergeItemsWcs(waitPakin, userId);
+ } 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) {
@@ -189,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -199,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -217,19 +224,18 @@
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);
+ return mobileService.checkUpdate(params, getLoginUserId());
}
@ApiOperation("鑾峰彇涓婃灦淇℃伅")
- @PreAuthorize("hasAuthority('manager:qlyInspect:list')")
+
@PostMapping("/stock/operate/list")
public R operateToStock(@RequestBody OpStockParams params) {
if (Objects.isNull(params)) {
@@ -239,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)) {
@@ -263,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)) {
@@ -274,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -282,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);
+ 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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -305,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -315,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("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -337,4 +343,3 @@
return mobileService.generateTask(map, getLoginUserId());
}
}
-
--
Gitblit v1.9.1