From 32a41ca494eed0cc37fcb3aff1e9f83e1a3792fc Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期五, 22 八月 2025 17:08:38 +0800 Subject: [PATCH] 库存调整功能接口功能优化 库存调整功能优化 --- rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java | 95 +++++++++++++++++++++++++++++++++++++++++++++-- 1 files changed, 91 insertions(+), 4 deletions(-) diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java index 8c3ba2c..ebf4be0 100644 --- a/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java +++ b/rsf-server/src/main/java/com/vincent/rsf/server/api/controller/erp/SyncOrderController.java @@ -2,10 +2,9 @@ import com.vincent.rsf.framework.common.R; import com.vincent.rsf.framework.exception.CoolException; -import com.vincent.rsf.server.api.controller.erp.params.OrderParams; -import com.vincent.rsf.server.api.controller.erp.params.SyncOrderParams; -import com.vincent.rsf.server.api.controller.erp.params.SyncTransferParams; +import com.vincent.rsf.server.api.controller.erp.params.*; import com.vincent.rsf.server.api.service.ReceiveMsgService; +import com.vincent.rsf.server.common.annotation.OperationLog; import com.vincent.rsf.server.common.utils.ExcelUtil; import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate; import com.vincent.rsf.server.system.controller.BaseController; @@ -38,7 +37,9 @@ * @return * @time 2025/3/4 13:57 */ + @ApiOperation(value = "鎺ユ敹鍚屾ERP閲囪喘鍗�") + @OperationLog("閲囪喘鍗曞悓姝�") @PostMapping("/sync/purchase") public R syncPurchases(@RequestBody List<OrderParams> orders) { if (orders.isEmpty()) { @@ -58,6 +59,7 @@ * @version 1.0 */ @ApiOperation(value = "鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)") + @OperationLog("鍑哄簱閫氱煡鍗�(DO鍗曞悓姝�)") @PostMapping("/sync/delivery") public R syncDelivery(@RequestBody List<OrderParams> orders) { if (!receiveMsgService.syncPurchasee(orders)) { @@ -75,6 +77,7 @@ * @time 2025/3/12 16:56 */ @ApiOperation(value = "璐ㄦ缁撴灉鍚屾") + @OperationLog("璐ㄦ缁撴灉鍚屾") @PostMapping("/sync/inspect") public void syncQlyInspect(HttpServletRequest request, HttpServletResponse response) { AsnOrderTemplate template = ExcelUtil.mockData(AsnOrderTemplate.class); @@ -92,6 +95,7 @@ * @version 1.0 */ @ApiOperation("鍚屾鍗曟嵁") + @OperationLog("鍗曟嵁鍚屾") @PostMapping("/sync/checks") public R syncCheckResult(@RequestBody SyncOrderParams syncOrders) { if (Objects.isNull(syncOrders)) { @@ -107,12 +111,95 @@ * @version 1.0 */ @ApiOperation("璋冩嫈鍗曞悓姝�") + @OperationLog("璋冩嫈鍗曞悓姝�") @PostMapping("/sync/transfers") public R syncTransfer(@RequestBody SyncTransferParams transferParams) { if (Objects.isNull(transferParams)) { throw new CoolException("鍙傛暟涓嶈兘涓虹┖锛侊紒"); } - return receiveMsgService.syncTransfer(transferParams); + + return receiveMsgService.syncTransfer(transferParams, getLoginUserId()); + } + + + /** + * @author Ryan + * @date 2025/8/19 + * @description: 搴撳瓨璋冩暣鍗曞悓姝� + * @version 1.0 + */ + @ApiOperation("搴撳瓨璋冩暣鍗曞悓姝�") + @OperationLog("搴撳瓨璋冩暣鍗曞悓姝�") + @PostMapping("/sync/revises") + public R syncRevise(@RequestBody SyncLocReviseParams reviseParams) { + if (Objects.isNull(reviseParams)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return receiveMsgService.syncLocRevise(reviseParams, getLoginUserId()); + } + + /** + * @author Ryan + * @date 2025/8/19 + * @description: 搴撳瓨璋冩暣鍗曞悓姝� + * @version 1.0 + */ + @ApiOperation("璐ㄦ鍗曚笂鎶�") + @OperationLog("璐ㄦ鍗曚笂鎶�") + @PostMapping("/sync/qlyInspect") + public R syncQlyReport(@RequestBody List<OrderParams> orders) { + + return R.ok(); + } + + /** + * @author Ryan + * @date 2025/8/19 + * @description: 鍗曟嵁淇敼 + * @version 1.0 + */ + @ApiOperation("鍗曟嵁淇敼") + @OperationLog("鍗曟嵁淇敼") + @PostMapping("/sync/orders/update") + public R syncOrderUpdate(@RequestBody SyncOrderParams orders) { + if (Objects.isNull(orders)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return receiveMsgService.syncOrderUpdate(orders); + } + + + /** + * @author Ryan + * @date 2025/8/19 + * @description: 鍗曟嵁鍒犻櫎 + * @version 1.0 + */ + @ApiOperation("鍗曟嵁鍒犻櫎") + @OperationLog("鍗曟嵁鍒犻櫎") + @PostMapping("/sync/orders/delete") + public R syncOrderDel(@RequestBody List<SyncOrderParams> orders) { + if (Objects.isNull(orders)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return receiveMsgService.syncOrderDelete(orders); + } + + + /** + * @author Ryan + * @date 2025/8/22 + * @description: 鐩樼偣宸紓鍗曞悓姝� + * @version 1.0 + */ + @PostMapping("/sync/check/result") + @ApiOperation("鐩樼偣宸紓鍗曞悓姝�") + @OperationLog("鐩樼偣宸紓鍗�") + public R checkResult(@RequestBody SyncCheckDiffParams syncParams) { + if (Objects.isNull(syncParams)) { + return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒"); + } + return receiveMsgService.syncCheckDiffs(syncParams); } } -- Gitblit v1.9.1