Merge remote-tracking branch 'origin/master'

xuhy

2025-11-03 6682d7c793f4a49bf13bf2f8a0170f188a701342

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java

@@ -3,9 +3,11 @@

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.framework.web.service.TokenService;
import com.ruoyi.system.dto.InventoryDto;
import com.ruoyi.system.dto.OutboundGoodsDto;
@@ -117,6 +119,7 @@

    @ApiOperation(value = "供应商库存入库")
    @PostMapping(value = "/warehousingGoods")
    @Log(title = "库存管理-入库", businessType = BusinessType.INSERT)
    public R<?> warehousingGoods(@RequestBody @Valid List<WarehousingGoodsDto> dtos) {
        SysUser user = tokenService.getLoginUser().getUser();
        erpSupplierWarehousingService.warehousingGoods(dtos,user);
@@ -125,6 +128,7 @@

    @ApiOperation(value = "供应商库存出库")
    @PostMapping(value = "/outbountGoods")
    @Log(title = "库存管理-出库", businessType = BusinessType.UPDATE)
    public R<?> outbountGoods(@RequestBody @Valid OutboundGoodsDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        erpSupplierWarehousingService.outbountGoods(dto,user);
@@ -178,6 +182,7 @@

    @ApiOperation(value = "供应商 确认盘点")
    @PostMapping(value = "/inventoryGoods")
    @Log(title = "盘点管理-供应商确认盘点", businessType = BusinessType.UPDATE)
    public R<?> inventoryGoods(@RequestBody @Valid InventoryDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        erpGoodsService.inventoryGoods(dto,user);