From f21530d33ca23aeeba2ef073ac6b64422e4e26ca Mon Sep 17 00:00:00 2001
From: cl <1442464845@qq.com>
Date: 星期四, 30 四月 2026 12:17:55 +0800
Subject: [PATCH] 库位编号规则和和CTU保持一致
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java | 37 ++++++++++++++++++++++++++++++++++++-
1 files changed, 36 insertions(+), 1 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
index 4c75ffd..83b44d9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/AsnOrderLogController.java
@@ -1,5 +1,7 @@
package com.vincent.rsf.server.manager.controller;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vincent.rsf.framework.common.Cools;
@@ -11,7 +13,9 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.manager.entity.AsnOrderLog;
import com.vincent.rsf.server.manager.service.AsnOrderLogService;
+import com.vincent.rsf.server.manager.service.CloudWmsFeedbackResendService;
import com.vincent.rsf.server.system.controller.BaseController;
+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.*;
@@ -24,6 +28,16 @@
@Autowired
private AsnOrderLogService asnOrderLogService;
+ @Autowired
+ private CloudWmsFeedbackResendService cloudWmsFeedbackResendService;
+
+ @ApiOperation("浜戜粨鍏ュ嚭搴撳弽棣堥噸鍙戯紙鍐欏叆涓婃姤寰呭姙闃熷垪锛�")
+ @OperationLog("CloudWMS feedback resend")
+ @PreAuthorize("hasAuthority('manager:asnOrderLog:cloudWmsResend')")
+ @PostMapping("/asnOrderLog/cloudWms/resendFeedback/{id}")
+ public R resendCloudWmsFeedback(@PathVariable Long id) {
+ return cloudWmsFeedbackResendService.resendInOutFeedbackByAsnOrderLogId(id);
+ }
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@PostMapping("/asnOrderLog/page")
@@ -104,7 +118,28 @@
@PreAuthorize("hasAuthority('manager:asnOrderLog:list')")
@PostMapping("/asnOrderLog/export")
public void export(@RequestBody Map<String, Object> map, HttpServletResponse response) throws Exception {
- ExcelUtil.build(ExcelUtil.create(asnOrderLogService.list(), AsnOrderLog.class), response);
+ List<AsnOrderLog> orders = new ArrayList<>();
+ if (!Objects.isNull(map.get("ids"))) {
+ List<Long> ids = JSONArray.parseArray(JSONObject.toJSONString(map.get("ids")), Long.class);
+ if (!ids.isEmpty()) {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<AsnOrderLog>().in(AsnOrderLog::getId, ids));
+ } else {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<>());
+ }
+ } else {
+ orders = asnOrderLogService.list(new LambdaQueryWrapper<>());
+ }
+ ExcelUtil.build(ExcelUtil.create(orders, AsnOrderLog.class), response);
+ }
+
+ @ApiOperation("缁х画鏀惰揣")
+ @PreAuthorize("hasAuthority('manager:asnOrderLog:update')")
+ @PostMapping("/asnOrderLog/continue/{id}")
+ public R continuRcpt(@PathVariable Long id) {
+ if (Objects.isNull(id)) {
+ return R.error("鍙傛暟涓嶈兘涓虹┖锛侊紒");
+ }
+ return asnOrderLogService.continueRecipt(id);
}
}
--
Gitblit v1.9.1