From cd146ec4e1f80c6666d7696f75c060c052145d30 Mon Sep 17 00:00:00 2001
From: cy <1664593601@qq.com>
Date: 星期六, 02 十二月 2023 20:59:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 18 +++---------------
1 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index fc14402..f78775b 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -22,7 +22,7 @@
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseWarehouseServiceImpl;
+import com.consum.base.service.BaseWarehouseService;
import com.consum.base.service.LWhFormTransferCoreService;
import com.consum.base.service.LWhFormTransferService;
import com.consum.base.service.LWhProcureModelService;
@@ -81,7 +81,7 @@
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
@Autowired
- private BaseWarehouseServiceImpl baseWarehouseService;
+ private BaseWarehouseService baseWarehouseService;
/**
* @Description 鏂板
@@ -426,6 +426,7 @@
}
}
+ // TODO 浣跨敤浜轰慨鏀硅皟鐢�
return ResponseValue.success();
}
@@ -497,19 +498,6 @@
return ResponseValue.success(result);
}
-
- @ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
- @ApiImplicitParams({
- @ApiImplicitParam(name = "agencyId", value = "鏈烘瀯id", required = true, dataType = "Long", paramType = "query")
- })
- @GetMapping("/query/detail")
- public ResponseValue queryDepartmentTransferOrder(Long agencyId) {
-
- TransferInfoVO transferInfoVO = new TransferInfoVO();
-
- lWhFormTransferService.queryDepartmentTransferOrder();
- return ResponseValue.success(transferInfoVO);
- }
@ApiOperation(value = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�", notes = "鏌ヨ閮ㄩ棬涓嬬殑鍒嗗彂鍗�")
@ApiImplicitParams({
--
Gitblit v1.9.1