From 3cc9e4551c42c1eb40c09f181857f2e0b1aa8355 Mon Sep 17 00:00:00 2001
From: lbq <1065079612@qq.com>
Date: 星期四, 05 三月 2026 08:14:34 +0800
Subject: [PATCH] 实现PDA灌桶入库呼叫新料功能，优化Web页面
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java | 47 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 43 insertions(+), 4 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
index d3a69e6..9977501 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/pda/InBoundController.java
@@ -1,19 +1,22 @@
package com.vincent.rsf.server.api.controller.pda;
+import com.vincent.rsf.framework.common.Cools;
import com.vincent.rsf.framework.common.R;
+import com.vincent.rsf.server.api.controller.erp.params.InventoryQueryConditionParam;
import com.vincent.rsf.server.api.entity.params.PdaGeneralParam;
import com.vincent.rsf.server.api.service.InBoundService;
+import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
-import java.util.Map;
+import javax.annotation.Resource;
@Api(tags = "PDA鍏ュ簱鎿嶄綔鎺ュ彛")
@RequestMapping("/pda")
@@ -22,13 +25,49 @@
@Autowired
private InBoundService inBoundService;
+ @Resource
+ private ReceiveMsgService receiveMsgService;
- @PreAuthorize("hasAuthority('manager:task:list')")
@PostMapping("/in/emptyContainer/warehousing")
@ApiOperation("绌哄鍣ㄥ叆搴�")
public R emptyContainerWarehousing(@RequestBody PdaGeneralParam param) {
+ return inBoundService.generateTasks(param, getLoginUserId());
+ }
- return R.ok();
+ @PostMapping("/check/agvStation")
+ @ApiOperation("妫�鏌ュ崟鎹粍鎵� agv绔欑偣")
+ public R checkAgvStation(@RequestBody PdaGeneralParam param) {
+ return inBoundService.checkAgvStation(param, getLoginUserId());
+ }
+
+ @PostMapping("/check/non/order")
+ @ApiOperation("闈炶鍗曞嚭搴�")
+ public R checkNonOrder(@RequestBody PdaGeneralParam param) {
+ if (Cools.isEmpty(param.getTransferStationNo())) {
+ return R.error("鐩爣绔欑偣涓虹┖锛侊紒锛�");
+ }
+ if (Cools.isEmpty(param.getLocNo())) {
+ return R.error("璇烽�夋嫨璧风偣搴撲綅锛侊紒锛�");
+ }
+ return inBoundService.checkNonOrder(param, getLoginUserId());
+ }
+
+ /**
+ * 搴撳瓨鏌ヨ鏄庣粏
+ *
+ * @param condition 鏌ヨ鏉′欢
+ * @return 搴撳瓨鏄庣粏鍒楄〃
+ */
+ @PostMapping("/inventory/details")
+ @ApiOperation(value = "搴撳瓨鏌ヨ鏄庣粏", hidden = true)
+ @OperationLog("搴撳瓨鏌ヨ鏄庣粏")
+ public R queryInventoryDetails(@RequestBody InventoryQueryConditionParam condition) {
+ // 鍙傛暟楠岃瘉
+ if (condition == null) {
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖");
+ }
+
+ return receiveMsgService.erpQueryInventoryDetails(condition);
}
}
--
Gitblit v1.9.1