#乐观锁

zhou zhou

11 小时以前 2f8e173048d22c5b40612c3538b9c1aa5a5397f6

 rsf-server/src/main/java/com/vincent/rsf/server/manager/controller/CheckOrderController.java

@@ -11,10 +11,8 @@
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
import com.vincent.rsf.server.common.utils.ExcelUtil;
import com.vincent.rsf.server.manager.controller.params.AsnOrderAndItemsParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderItemParams;
import com.vincent.rsf.server.manager.controller.params.CheckOrderParams;
import com.vincent.rsf.server.manager.controller.params.OrderOutTaskParam;
import com.vincent.rsf.server.common.utils.OptimisticLockUtils;
import com.vincent.rsf.server.manager.controller.params.*;
import com.vincent.rsf.server.manager.entity.WkOrder;
import com.vincent.rsf.server.manager.entity.WkOrderItem;
import com.vincent.rsf.server.manager.entity.excel.CheckOrderTemplate;
@@ -31,7 +29,7 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.util.*;
import java.util.stream.Collectors;

@@ -89,6 +87,7 @@
    @OperationLog("Update 字典数据集")
    @PostMapping("/check/update")
    public R update(@RequestBody WkOrder order) {
        OptimisticLockUtils.requireVersion("盘点单", order.getVersion());
        order.setUpdateTime(null);
        order.setUpdateBy(getLoginUserId());
        if (!checkOrderService.updateById(order)) {
@@ -215,13 +214,13 @@


    @ApiOperation("获取在库物料列表")
    @PostMapping("/check/locs/{matnrs}")
    @PostMapping("/check/locs")
    @PreAuthorize("hasAuthority('manager:check:list')")
    public R getAllLocByMatnr(@PathVariable String[] matnrs) {
        if (Objects.isNull(matnrs)) {
    public R getAllLocByMatnr(@RequestBody CheckLocQueryParams params) {
        if (Objects.isNull(params)) {
            return R.error("参数不能为空！！");
        }
        return checkOrderService.getAllLocByMatnr(Arrays.asList(matnrs));
        return checkOrderService.getAllLocByMatnr(params);
    }