From 9bb62e919e8c85e7cfca55f0af90da5e48dcedeb Mon Sep 17 00:00:00 2001
From: chen.lin <1442464845@qq.com>
Date: 星期五, 30 一月 2026 17:08:39 +0800
Subject: [PATCH] 查询库存明细-订单号
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 46 insertions(+), 8 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
index 5bedb8f..c70bf3d 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/ErpQueryController.java
@@ -1,23 +1,24 @@
package com.vincent.rsf.server.api.controller.erp;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
-import com.vincent.rsf.server.api.controller.erp.params.*;
+import com.vincent.rsf.server.api.controller.erp.params.InventoryQueryConditionParam;
+import com.vincent.rsf.server.api.controller.erp.params.QueryOrderParam;
+import com.vincent.rsf.server.api.service.ReceiveMsgService;
+import com.vincent.rsf.server.common.annotation.OperationLog;
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.PageParam;
-import com.vincent.rsf.framework.common.R;
-
import com.vincent.rsf.server.manager.entity.Loc;
-import com.vincent.rsf.server.manager.service.MatnrGroupService;
+import com.vincent.rsf.server.manager.service.*;
import com.vincent.rsf.server.system.controller.BaseController;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
-import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
import java.util.Objects;
@@ -36,6 +37,7 @@
@Autowired
private ReceiveMsgService receiveMsgService;
+
@Autowired
private MatnrGroupService matnrGroupService;
@@ -46,6 +48,7 @@
* @version 1.0
*/
@ApiOperation(value = "鏌ヨ鍒嗙被淇℃伅")
+ @OperationLog("鐗╂枡鍒嗙被鍒楄〃")
@PostMapping("/query/matnr/group")
public R syncMatGroup() {
return R.ok().add(matnrGroupService.list());
@@ -58,6 +61,7 @@
* @version 1.0
*/
@ApiOperation(value = "鏌ヨ鍗曟嵁鐘舵�佸強鏄庣粏")
+ @OperationLog("鏌ヨ璁㈠崟鐘舵�佸強鏄庣粏")
@PostMapping("/query/order")
public R queryOrderStatus(@RequestBody QueryOrderParam queryParams) {
if (Objects.isNull(queryParams)) {
@@ -75,6 +79,7 @@
*/
@PostMapping("/query/locs/detls")
@ApiOperation(value = "搴撲綅淇℃伅鏌ヨ")
+ @OperationLog("搴撲綅鏄庣粏鍒楄〃")
public R syncLocDetls(@RequestBody Map<String, Object> map) {
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<Loc, BaseParam> pageParam = new PageParam<>(baseParam, Loc.class);
@@ -82,5 +87,38 @@
return receiveMsgService.syncLocsDetl(pageParam, wrapper);
}
+ /**
+ * @author Ryan
+ * @date 2025/8/21
+ * @description: 璋冩嫈鍗曚俊鎭煡璇�
+ * @version 1.0
+ */
+ @PostMapping("/query/transfer")
+ @ApiOperation("鏌ヨ璋冩嫈鍗曞強鏄庣粏")
+ @OperationLog("璋冩嫈鍗曞強鏄庣粏鏌ヨ")
+ public R queryTransfer(@RequestBody QueryOrderParam queryParams) {
+ if (Objects.isNull(queryParams)) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return receiveMsgService.queryTransfer(queryParams);
+ }
+
+ /**
+ * ERP搴撳瓨鏌ヨ鏄庣粏锛堜緵open-api妯″潡璋冪敤锛�
+ * 瀵瑰簲open-api鐨� /inventory/details 鎺ュ彛
+ * @param condition 鏌ヨ鏉′欢
+ * @return 搴撳瓨鏄庣粏鍒楄〃
+ */
+ @PostMapping("/inventory/details")
+ @ApiOperation(value = "ERP搴撳瓨鏌ヨ鏄庣粏", hidden = true)
+ @OperationLog("ERP搴撳瓨鏌ヨ鏄庣粏")
+ public R erpQueryInventoryDetails(@RequestBody InventoryQueryConditionParam condition) {
+ // 鍙傛暟楠岃瘉
+ if (condition == null) {
+ return R.error("鏌ヨ鏉′欢涓嶈兘涓虹┖");
+ }
+
+ return receiveMsgService.erpQueryInventoryDetails(condition);
+ }
}
--
Gitblit v1.9.1