1.正式库合并以及优化 2.销售模块

liding

5 天以前 18d292f1091b8b86ad29ba76e3cbe8ffaf2c222e

 main-business/src/main/java/com/ruoyi/business/controller/OfficialInventoryController.java

@@ -4,11 +4,12 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.business.dto.OfficialInventoryDto;
import com.ruoyi.business.service.OfficialInventoryService;
import com.ruoyi.business.vo.OfficialInventoryVo;
import com.ruoyi.common.core.domain.R;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;

import java.util.List;

/**
 * <p>
@@ -31,8 +32,32 @@
     */
    @GetMapping("/list")
    public R<IPage<OfficialInventoryDto>> list(Page page, OfficialInventoryDto officialInventoryDto) {
        IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page,officialInventoryDto);
        IPage<OfficialInventoryDto> list = officialInventoryService.selectOfficialInventoryList(page, officialInventoryDto);
        return R.ok(list);
    }

    /**
     * 正式库煤种部分信息list
     */
    @GetMapping("/OfficialList")
    public R<List<OfficialInventoryVo>> officialList(OfficialInventoryVo officialInventoryVo) {
        return R.ok(officialInventoryService.selectOfficialList(officialInventoryVo));
    }

    /**
     * 正式库修改
     */
    @PostMapping("/editOfficial")
    public R editOfficial(@RequestBody OfficialInventoryDto officialInventoryDto) {
        return R.ok(officialInventoryService.editOfficial(officialInventoryDto));
    }

    /**
     * 合并
     */
    @PostMapping("/merge")
    public R merge(@RequestBody OfficialInventoryDto officialInventoryDto) {
        return R.ok(officialInventoryService.mergeAll(officialInventoryDto));
    }

}