From 03c3e3cfc1262e26a218a4b8340c0a53ca3065c6 Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期四, 09 四月 2026 13:37:08 +0800
Subject: [PATCH] #logo和高危修复
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
index 1a347c9..af27d42 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/MatPreparationController.java
@@ -15,6 +15,7 @@
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.common.utils.FieldsUtils;
+import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.GenWaveParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
@@ -28,6 +29,7 @@
import com.vincent.rsf.server.manager.service.OutStockService;
import com.vincent.rsf.server.manager.service.TaskService;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
+import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
@@ -39,8 +41,8 @@
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.annotation.Resource;
+import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
@RestController
@@ -59,9 +61,11 @@
PageParam<WkOrder, BaseParam> pageParam = new PageParam<>(baseParam, WkOrder.class);
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderWorkType.ORDER_WORK_TYPE_STOCK_UP.type, OrderWorkType.ORDER_WORK_TYPE_NORMAL_MATERIAL_PREPARATION.type, OrderWorkType.ORDER_WORK_TYPE_FEED_IN_MATERIAL_PREPARATION.type);
- queryWrapper.in("type", OrderType.ORDER_PRE.type,OrderType.ORDER_PRE_NOT_OUT.type);
+ queryWrapper.eq("type", OrderType.ORDER_PRE.type);
queryWrapper.in("wk_type",list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -72,7 +76,9 @@
QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
List<String> list = Arrays.asList(OrderType.ORDER_OUT.type);
queryWrapper.in("type", list);
- return R.ok().add(outStockService.page(pageParam, queryWrapper));
+ PageParam<WkOrder, BaseParam> page = outStockService.page(pageParam, queryWrapper);
+ buildPageRowsUtils.userNameMap(page.getRecords());
+ return R.ok().add(page);
}
@PreAuthorize("hasAuthority('manager:outStock:list')")
@@ -120,6 +126,7 @@
@PostMapping("/preparation/update")
@ApiOperation("鏇存柊")
public R update(@RequestBody WkOrder wkOrder) {
+ OptimisticLockUtils.requireVersion("澶囨枡鍗�", wkOrder.getVersion());
wkOrder.setType(OrderType.ORDER_OUT.type)
.setUpdateBy(getLoginUserId())
.setUpdateTime(new Date());
--
Gitblit v1.9.1