#

zhou zhou

3 天以前 523365960513f297024a419f94b2b42eccd9456f

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

@@ -20,12 +20,13 @@
import com.vincent.rsf.server.manager.service.CheckDiffService;
import com.vincent.rsf.server.manager.service.CheckOrderService;
import com.vincent.rsf.server.manager.service.impl.CheckDiffServiceImpl;
import com.vincent.rsf.server.manager.utils.buildPageRowsUtils;
import com.vincent.rsf.server.system.controller.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

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

@@ -44,7 +45,9 @@
    public R page(@RequestBody Map<String, Object> map) {
        BaseParam baseParam = buildParam(map, BaseParam.class);
        PageParam<CheckDiffItem, BaseParam> pageParam = new PageParam<>(baseParam, CheckDiffItem.class);
        return R.ok().add(checkDiffItemService.page(pageParam, pageParam.buildWrapper(true)));
        PageParam<CheckDiffItem, BaseParam> page = checkDiffItemService.page(pageParam, pageParam.buildWrapper(true));
        buildPageRowsUtils.userNameMap(page.getRecords());
        return R.ok().add(page);
    }

    @PreAuthorize("hasAuthority('manager:checkDiff:list')")
@@ -102,9 +105,12 @@
                // 仅在有单时更新盘点单(WkOrder)执行状态；无单盘点无盘点单，不更新
                CheckDiff checkDiff = checkDiffService.getById(checkDiffItem.getCheckId());
                if (checkDiff != null && checkDiff.getOrderId() != null) {
                    if (!checkOrderService.update(new LambdaUpdateWrapper<WkOrder>()
                            .eq(WkOrder::getId, checkDiff.getOrderId())
                            .set(WkOrder::getExceStatus, CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val))) {
                    WkOrder order = checkOrderService.getById(checkDiff.getOrderId());
                    if (order == null) {
                        throw new CoolException("盘点单不存在！！");
                    }
                    order.setExceStatus(CheckExceStatus.CHECK_ORDER_STATUS_EXCE_DONE.val);
                    if (!checkOrderService.updateById(order)) {
                        throw new CoolException("盘点单执行状态修改失败！！");
                    }
                }