Merge remote-tracking branch 'origin/master'

cuilei

22 小时以前 f95d05316d49bcdd31d022a11d0fc4fbafb040da

 src/main/java/org/jeecg/modules/lsw/controller/LswMaterialController.java

@@ -8,6 +8,7 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.AutoLog;
import org.jeecg.common.constant.CommonConstant;
@@ -23,6 +24,8 @@
import org.springframework.web.bind.annotation.*;

import javax.servlet.http.HttpServletRequest;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;

/**
@@ -126,7 +129,6 @@

    }

    @AutoLog(value = "线边库物料信息-通过产线类型查询线边库物料")
    @ApiOperation(value = "线边库物料信息-通过产线类型查询线边库物料", notes = "线边库物料信息-通过产线类型查询线边库物料")
    @GetMapping(value = "/queryLswMaterialByProductionType")
    public Result<List<LswMaterial>> queryLswMaterialByProductionType(@RequestParam("factoryId") String factoryId) {
@@ -164,4 +166,20 @@
        }
        return Result.OK(lswMaterialList);
    }

    @ApiOperation(value = "线边库物料信息-根据物料类型查询", notes = "线边库物料信息-根据物料类型查询")
    @GetMapping(value = "/queryByMaterialCategory")
    public Result<List<LswMaterial>> queryByMaterialCategory(@RequestParam("materialCategory") String materialCategory) {
        if (StringUtils.isBlank(materialCategory)) {
            return Result.ok(Collections.emptyList());
        }
        String[] split = materialCategory.split(",");
        LambdaQueryWrapper<LswMaterial> queryWrapper = new LambdaQueryWrapper<>();
        queryWrapper.in(LswMaterial::getMaterialCategory, Arrays.asList(split));
        queryWrapper.eq(LswMaterial::getDelFlag, CommonConstant.DEL_FLAG_0);
        queryWrapper.eq(LswMaterial::getMaterialStatus, CommonConstant.STATUS_1);
        queryWrapper.orderByAsc(LswMaterial::getMaterialNumber);
        List<LswMaterial> lswMaterialList = lswMaterialService.list(queryWrapper);
        return Result.ok(lswMaterialList);
    }
}