修改

jinlin

2023-12-15 da2330bb7951c602ebe72a9f53ff13d0895b3349

 modules/mainPart/src/main/java/com/zt/life/modules/configItemOutbound/controller/ConfigItemOutboundController.java

@@ -14,6 +14,7 @@
import com.zt.common.validator.group.UpdateGroup;
import com.zt.life.modules.configItemOutbound.dto.ConfigItemOutboundDto;
import com.zt.life.modules.configItemOutbound.model.ConfigItemOutbound;
import com.zt.life.modules.configItemOutbound.model.OutboundConfigItem;
import com.zt.life.modules.configItemOutbound.service.ConfigItemOutboundService;
import com.zt.life.modules.configItemWarehouse.model.WarehouseConfigItem;
import com.zt.life.modules.configItemWarehouse.service.WarehouseConfigItemService;
@@ -56,6 +57,7 @@

    @Autowired
    private WarehouseConfigItemService configItemService;

    @GetMapping("page")
    @ApiOperation("分页")
    @ApiImplicitParams({
@@ -74,17 +76,8 @@

    @GetMapping("getDto")
    @ApiOperation("信息")
    public Result<ConfigItemOutboundDto> getDto(Long projectId, Long changeId) {
        ConfigItemOutboundDto data = configItemOutboundService.getDto(projectId, changeId);
        if (changeId!=null) {
            for (WarehouseConfigItem configItem  : data.getConfigOutboundList()) {
                Long configItemId = configItem.getId();
                OssDto ossDto = sysOssConfigService.getOssByBusiType(configItemId, "config_item_warehouse");
                if (ossDto != null) {
                    configItem.setFiles(ossDto);
                }
            }
        }
    public Result<ConfigItemOutboundDto> getDto(Long projectId, Long outboundId) {
        ConfigItemOutboundDto data = configItemOutboundService.getDto(projectId, outboundId);
        return Result.ok(data);
    }

@@ -127,14 +120,21 @@
    @GetMapping("getItemList")
    @ApiOperation("获取入库配置项列表")
    public PageResult<WarehouseConfigItem> getItemList(Long projectId,String ids) {
        String type ="outbound";
        List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId,ids,type);
        List<WarehouseConfigItem> resultList = configItemService.warehouseConfigList(projectId, ids);
        return PageResult.ok(resultList);
    }

    @GetMapping("exportConfigOutbound")
    @ApiOperation("打印变更申请单")
    @LogOperation("打印变更申请单")
    @ApiOperation("打印出库申请单")
    @LogOperation("打印出库申请单")
    public void exportConfigOutbound(Long id, HttpServletRequest request, HttpServletResponse response) {
        configItemOutboundService.exportConfigOutbound(id,request, response);
    }

    @GetMapping("outbound")
    @ApiOperation("出库")
    @LogOperation("出库")
    public void downloadFiles(HttpServletResponse response, HttpServletRequest request, Long id) {
        configItemOutboundService.downloadFiles(response, request, id);
    }
}