From 16a09540001bd00f01b848f0ca125d16bf314450 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 29 八月 2025 15:45:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/devlop' into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java | 41 +++++++++++++++++++++++++++++++++++------
1 files changed, 35 insertions(+), 6 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
index 87a657c..41392fb 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/BaseInfoController.java
@@ -18,7 +18,7 @@
@RestController
@RequestMapping("/base")
-@Api(tags = "鍩虹淇℃伅鍚屾")
+@Api(tags = "鍩虹淇℃伅")
public class BaseInfoController {
@Autowired
@@ -30,7 +30,7 @@
* @description: 鐗╂枡淇℃伅鍚屾
* @version 1.0
*/
- @ApiOperation(value = "鍩虹鐗╂枡淇℃伅鍚屾", tags = "鍩虹淇℃伅鍚屾")
+ @ApiOperation(value = "鍩虹鐗╂枡淇℃伅鍚屾")
@PostMapping("/sync/base/matnrs")
public R syncMatnrs(@RequestBody List<BaseMatParms> matnrs) {
if (Objects.isNull(matnrs)) {
@@ -47,7 +47,7 @@
* @version 1.0
*/
@PostMapping("/sync/locs")
- @ApiOperation(value = "搴撲綅淇℃伅鍚屾", tags = "鍩虹淇℃伅鍚屾")
+ @ApiOperation(value = "搴撲綅淇℃伅鍚屾")
public R syncLocs(@RequestBody List<SyncLocsParams> locs) {
if (locs.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -62,7 +62,7 @@
* @version 1.0
*/
@PostMapping("/sync/matGroups")
- @ApiOperation(value = "鐗╂枡鍒嗙粍淇℃伅鍚屾", tags = "鍩虹淇℃伅鍚屾")
+ @ApiOperation(value = "鐗╂枡鍒嗙粍淇℃伅鍚屾")
public R syncMatGroup(@RequestBody List<SyncMatGroupsParams> matGroupsParams) {
if (matGroupsParams.isEmpty()) {
throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
@@ -70,7 +70,13 @@
return receiveMsgService.syncMatGroups(matGroupsParams);
}
- @ApiOperation(value = "搴撳尯鏁版嵁鍚屾", tags = "鍩虹淇℃伅鍚屾")
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 搴撳尯鏁版嵁鍚屾
+ * @version 1.0
+ */
+ @ApiOperation(value = "搴撳尯鏁版嵁鍚屾")
@PostMapping("/sync/warehouse/areas")
public R syncLocAreas(@RequestBody List<LocAreasParams> areasParams) {
if (areasParams.isEmpty()) {
@@ -80,7 +86,13 @@
}
- @ApiOperation(value = "搴撳尯鏁版嵁鍚屾", tags = "鍩虹淇℃伅鍚屾")
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 浠撳簱淇℃伅鍚屾
+ * @version 1.0
+ */
+ @ApiOperation(value = "浠撳簱鏁版嵁鍚屾")
@PostMapping("/sync/warehouse")
public R syncWarehouse(@RequestBody List<WarehouseParams> warehouseParams) {
if (warehouseParams.isEmpty()) {
@@ -88,4 +100,21 @@
}
return receiveMsgService.syncWarehouse(warehouseParams);
}
+
+ /**
+ * @author Ryan
+ * @date 2025/8/19
+ * @description: 浠撳簱淇℃伅鍚屾
+ * @version 1.0
+ */
+ @ApiOperation(value = "浼佷笟淇℃伅鍚屾")
+ @PostMapping("/sync/companies")
+ public R syncCompanys(@RequestBody List<CompaniesParam> companyParams) {
+ if (companyParams.isEmpty()) {
+ throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return receiveMsgService.syncCompanies(companyParams);
+ }
+
+
}
--
Gitblit v1.9.1