#乐观锁

zhou zhou

17 小时以前 2f8e173048d22c5b40612c3538b9c1aa5a5397f6

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

@@ -16,6 +16,7 @@
import com.vincent.rsf.server.common.domain.BaseParam;
import com.vincent.rsf.server.common.domain.KeyValVo;
import com.vincent.rsf.server.common.domain.PageParam;
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.BatchUpdateParam;
import com.vincent.rsf.server.manager.entity.excel.AsnOrderTemplate;
@@ -23,8 +24,11 @@
import com.vincent.rsf.server.manager.service.AsnOrderService;
import com.vincent.rsf.server.manager.service.impl.PurchaseItemServiceImpl;
import com.vincent.rsf.server.manager.service.impl.PurchaseServiceImpl;
import com.vincent.rsf.server.system.constant.DictTypeCode;
import com.vincent.rsf.server.system.constant.SerialRuleCode;
import com.vincent.rsf.server.system.controller.BaseController;
import com.vincent.rsf.server.system.entity.DictData;
import com.vincent.rsf.server.system.service.impl.DictDataServiceImpl;
import com.vincent.rsf.server.system.utils.SerialRuleUtils;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -33,7 +37,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;

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

@RestController
@@ -48,6 +52,8 @@
    private PurchaseServiceImpl purchaseService;
    @Autowired
    private PurchaseItemServiceImpl purchaseItemService;
    @Autowired
    private DictDataServiceImpl dictDataService;

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @PostMapping("/asnOrder/page")
@@ -59,6 +65,21 @@
        queryWrapper.in("type", asList);
        return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
    }

    @ApiOperation("获取首页表头数据")
    @PostMapping("/asnOrder/dashbord/header")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R getDashbord() {
        return asnOrderService.getDashbord();
    }

    @ApiOperation("获取出入库趋势图")
    @PostMapping("/asnOrder/stock/trand")
    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    public R getStockTrand() {
        return R.ok().add(asnOrderService.getStockTrand());
    }


    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @PostMapping("/asnOrder/list")
@@ -78,6 +99,31 @@
    public R get(@PathVariable("id") Long id) {
        return R.ok().add(asnOrderService.getById(id));
    }

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @OperationLog("表单查询")
    @GetMapping("/asnOrder/wrkType/{id}")
    public R getWrkType(@PathVariable("id") String value) {
//        WkOrder byId = asnOrderService.getById(id);
//        if (Cools.isEmpty(byId)) {
//            return R.ok().add(new DictData());
//        }
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_BUSINESS_TYPE).eq(DictData::getValue, value));
        return R.ok().add(dictData);
    }

    @PreAuthorize("hasAuthority('manager:asnOrder:list')")
    @OperationLog("表单查询")
    @GetMapping("/asnOrder/orderType/{id}")
    public R getOrderType(@PathVariable("id") String value) {
//        WkOrder byId = asnOrderService.getById(id);
//        if (Cools.isEmpty(byId)) {
//            return R.ok().add(new DictData());
//        }
        DictData dictData = dictDataService.getOne(new LambdaQueryWrapper<DictData>().eq(DictData::getDictTypeCode, DictTypeCode.DICT_SYS_ORDER_TYPE).eq(DictData::getValue, value));
        return R.ok().add(dictData);
    }


    @PreAuthorize("hasAuthority('manager:asnOrder:save')")
    @OperationLog("Create ASN单据")
@@ -101,6 +147,7 @@
    @PostMapping("/asnOrder/update")
    @ApiOperation("更新")
    public R update(@RequestBody WkOrder wkOrder) {
        OptimisticLockUtils.requireVersion("ASN单据", wkOrder.getVersion());
        wkOrder.setUpdateBy(getLoginUserId());
        wkOrder.setUpdateTime(new Date());
        if (!asnOrderService.updateById(wkOrder)) {
@@ -152,7 +199,7 @@
        }
        List<AsnOrderTemplate> orderTemplates = new ArrayList<>();
        for (WkOrder order : orders) {
            List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getAsnId, order.getId()));
            List<WkOrderItem> orderItems = asnOrderItemService.list(new LambdaQueryWrapper<WkOrderItem>().eq(WkOrderItem::getOrderId, order.getId()));
            for (WkOrderItem item : orderItems) {
                if (Objects.isNull(item)) {
                    continue;