#

zhou zhou

3 天以前 2812a2504ec3d0a98fa7e6204e6048584723adab

 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;
@@ -62,6 +63,7 @@
        QueryWrapper<WkOrder> queryWrapper = pageParam.buildWrapper(true);
        List<String> asList = Arrays.asList(OrderType.ORDER_IN.type);
        queryWrapper.in("type", asList);
        pageParam.setSearchCount(false);
        return R.ok().add(asnOrderService.page(pageParam, queryWrapper));
    }

@@ -146,6 +148,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)) {