齐套性检查、上下料查询相关接口

cuilei

7 小时以前 7f43845a6289a2ba7c6c1c313501674b59892cb7

齐套性检查、上下料查询相关接口

 src/main/java/org/jeecg/modules/mes/controller/MesKittingCompletenessCheckController.java

@@ -21,6 +21,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.List;
import java.util.Map;

/**
* @Description: 齐套性检查记录
@@ -52,9 +53,10 @@
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<MesKittingCompletenessCheck> queryWrapper = QueryGenerator.initQueryWrapper(mesKittingCompletenessCheck, req.getParameterMap());
       Map<String, String[]> parameterMap = req.getParameterMap();
       QueryWrapper<MesKittingCompletenessCheck> queryWrapper = QueryGenerator.initQueryWrapper(mesKittingCompletenessCheck, parameterMap);
       Page<MesKittingCompletenessCheck> page = new Page<MesKittingCompletenessCheck>(pageNo, pageSize);
       IPage<MesKittingCompletenessCheck> pageList = mesKittingCompletenessCheckService.page(page, queryWrapper);
       IPage<MesKittingCompletenessCheck> pageList = mesKittingCompletenessCheckService.queryPageList(page, parameterMap);
       return Result.OK(pageList);
   }


 src/main/java/org/jeecg/modules/mes/controller/MesMaterialLoadingController.java

@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.util.Arrays;
import java.util.Map;

/**
* @Description: 上料
@@ -50,9 +51,10 @@
                                  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                  HttpServletRequest req) {
       QueryWrapper<MesMaterialLoading> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialLoading, req.getParameterMap());
       Map<String, String[]> parameterMap = req.getParameterMap();
       QueryWrapper<MesMaterialLoading> queryWrapper = QueryGenerator.initQueryWrapper(mesMaterialLoading, parameterMap);
       Page<MesMaterialLoading> page = new Page<MesMaterialLoading>(pageNo, pageSize);
       IPage<MesMaterialLoading> pageList = mesMaterialLoadingService.page(page, queryWrapper);
       IPage<MesMaterialLoading> pageList = mesMaterialLoadingService.queryPageList(page, parameterMap);
       return Result.OK(pageList);
   }


 src/main/java/org/jeecg/modules/mes/entity/MesMaterialLoading.java

@@ -94,4 +94,7 @@
    @TableField(exist = false)
    @ApiModelProperty(value = "工单号")
    private String workOrderCode;
    @TableField(exist = false)
    @ApiModelProperty(value = "设备名称")
    private String equipmentName;
}

 src/main/java/org/jeecg/modules/mes/mapper/MesKittingCompletenessCheckMapper.java

@@ -1,6 +1,11 @@
package org.jeecg.modules.mes.mapper;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;

@@ -14,4 +19,7 @@
 */
public interface MesKittingCompletenessCheckMapper extends BaseMapper<MesKittingCompletenessCheck> {
    List<MesKittingCompletenessCheck> queryCompletenessCheckByWorkOrderId(@Param("workOrderId") String workOrderId);

    IPage<MesKittingCompletenessCheck> queryPageList(Page<MesKittingCompletenessCheck> page,
                                                     @Param(Constants.WRAPPER) Wrapper<MesKittingCompletenessCheck> queryWrapper);
}

 src/main/java/org/jeecg/modules/mes/mapper/MesMaterialLoadingMapper.java

@@ -1,6 +1,11 @@
package org.jeecg.modules.mes.mapper;

import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import org.apache.ibatis.annotations.Param;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
import org.jeecg.modules.mes.entity.MesMaterialUnloading;
@@ -16,4 +21,7 @@
public interface MesMaterialLoadingMapper extends BaseMapper<MesMaterialLoading> {
    List<MesMaterialUnloading> queryUnloadingByLoadingId(@Param("loadingId") String loadingId);
    List<MesMaterialLoading> queryLoadingByWorkOrderId(@Param("workOrderId") String workOrderId);

    IPage<MesMaterialLoading> queryPageList(Page<MesMaterialLoading> page,
                                            @Param(Constants.WRAPPER) Wrapper<MesMaterialLoading> queryWrapper);
}

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesKittingCompletenessCheckMapper.xml

@@ -6,4 +6,12 @@
                 left join mes_production_work_order mpwo on mkcc.work_order_id = mpwo.id
                 where mkcc.work_order_id = #{workOrderId}
    </select>
    <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesKittingCompletenessCheck">
        SELECT
            t1.*,
            t2.work_order_code workOrderCode
        FROM mes_kitting_completeness_check t1
        LEFT JOIN mes_production_work_order t2 ON t1.work_order_id = t2.id
        ${ew.customSqlSegment}
    </select>
</mapper>

 src/main/java/org/jeecg/modules/mes/mapper/xml/MesMaterialLoadingMapper.xml

@@ -2,7 +2,7 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="org.jeecg.modules.mes.mapper.MesMaterialLoadingMapper">
    <select id="queryUnloadingByLoadingId" resultType="org.jeecg.modules.mes.entity.MesMaterialUnloading">
        select * from mes_material_unloading where loading_id = #{loadingId} and del_flag = 0
        select * from mes_material_unloading where loading_id = #{loadingId} and del_flag = 0 order by create_time desc
    </select>
    <select id="queryLoadingByWorkOrderId" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
        select mml.* ,mpwo.work_order_code as workOrderCode
@@ -11,4 +11,14 @@
        where mml.work_order_id = #{workOrderId}
          and mml.del_flag = 0
    </select>
    <select id="queryPageList" resultType="org.jeecg.modules.mes.entity.MesMaterialLoading">
        SELECT
            t1.*,
            t2.work_order_code workOrderCode,
            t3.equipment_name equipmentName
        FROM mes_material_loading t1
        LEFT JOIN mes_production_work_order t2 ON t1.work_order_id = t2.id
        LEFT JOIN eam_equipment t3 ON t1.equipment_id = t3.id
        ${ew.customSqlSegment}
    </select>
</mapper>

 src/main/java/org/jeecg/modules/mes/service/IMesKittingCompletenessCheckService.java

@@ -1,9 +1,12 @@
package org.jeecg.modules.mes.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;

import java.util.List;
import java.util.Map;

/**
 * @Description: 齐套性检查记录
@@ -15,4 +18,6 @@
    List<MesKittingCompletenessCheck> queryCompletenessCheckByWorkOrderId(String workOrderId);

    void batchSave(List<MesKittingCompletenessCheck> mesKittingCompletenessCheckList);

    IPage<MesKittingCompletenessCheck> queryPageList(Page<MesKittingCompletenessCheck> page, Map<String, String[]> parameterMap);
}

 src/main/java/org/jeecg/modules/mes/service/IMesMaterialLoadingService.java

@@ -1,10 +1,13 @@
package org.jeecg.modules.mes.service;

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
import org.jeecg.modules.mes.entity.MesMaterialUnloading;

import java.util.List;
import java.util.Map;

/**
 * @Description: 上料
@@ -15,4 +18,6 @@
public interface IMesMaterialLoadingService extends IService<MesMaterialLoading> {
    List<MesMaterialUnloading> queryUnloadingByLoadingId(String loadingId);
    List<MesMaterialLoading> queryLoadingByWorkOrderId(String workOrderId);

    IPage<MesMaterialLoading> queryPageList(Page<MesMaterialLoading> page, Map<String, String[]> parameterMap);
}

 src/main/java/org/jeecg/modules/mes/service/impl/MesKittingCompletenessCheckServiceImpl.java

@@ -1,5 +1,9 @@
package org.jeecg.modules.mes.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.modules.mes.entity.MesKittingCompletenessCheck;
@@ -11,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
import java.util.Map;

/**
 * @Description: 齐套性检查记录
@@ -44,4 +49,31 @@
        //保存齐套检查记录
        saveBatch(mesKittingCompletenessCheckList);
    }

    @Override
    public IPage<MesKittingCompletenessCheck> queryPageList(Page<MesKittingCompletenessCheck> page, Map<String, String[]> parameterMap) {
        QueryWrapper<MesKittingCompletenessCheck> queryWrapper = Wrappers.query();
        String[] factoryIds = parameterMap.get("factoryId");
        if (factoryIds != null && factoryIds.length > 0) {
            queryWrapper.eq("t2.factory_id", factoryIds[0]);
        }
        String[] workOrderIds = parameterMap.get("workOrderId");
        if (workOrderIds != null && workOrderIds.length > 0) {
            queryWrapper.eq("t1.work_order_id", workOrderIds[0]);
        }
        String[] materialNumbers = parameterMap.get("materialNumber");
        if (materialNumbers != null && materialNumbers.length > 0) {
            queryWrapper.like("t1.material_number", materialNumbers[0]);
        }
        String[] materialNames = parameterMap.get("materialName");
        if (materialNames != null && materialNames.length > 0) {
            queryWrapper.like("t1.material_name", materialNames[0]);
        }
        String[] checkFlags = parameterMap.get("checkFlag");
        if (checkFlags != null && checkFlags.length > 0) {
            queryWrapper.eq("t1.check_flag", checkFlags[0]);
        }
        queryWrapper.orderByDesc("t1.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
}

 src/main/java/org/jeecg/modules/mes/service/impl/MesMaterialLoadingServiceImpl.java

@@ -1,5 +1,9 @@
package org.jeecg.modules.mes.service.impl;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.jeecg.modules.mes.entity.MesMaterialLoading;
import org.jeecg.modules.mes.entity.MesMaterialUnloading;
@@ -8,6 +12,7 @@
import org.springframework.stereotype.Service;

import java.util.List;
import java.util.Map;

/**
 * @Description: 上料
@@ -27,4 +32,35 @@
    public List<MesMaterialLoading> queryLoadingByWorkOrderId(String workOrderId) {
        return baseMapper.queryLoadingByWorkOrderId(workOrderId);
    }

    @Override
    public IPage<MesMaterialLoading> queryPageList(Page<MesMaterialLoading> page, Map<String, String[]> parameterMap) {
        QueryWrapper<MesMaterialLoading> queryWrapper = Wrappers.query();
        String[] factoryIds = parameterMap.get("factoryId");
        if (factoryIds != null && factoryIds.length > 0) {
            queryWrapper.eq("t2.factory_id", factoryIds[0]);
        }
        String[] workOrderIds = parameterMap.get("workOrderId");
        if (workOrderIds != null && workOrderIds.length > 0) {
            queryWrapper.eq("t1.work_order_id", workOrderIds[0]);
        }
        String[] materialNumbers = parameterMap.get("materialNumber");
        if (materialNumbers != null && materialNumbers.length > 0) {
            queryWrapper.like("t1.material_number", materialNumbers[0]);
        }
        String[] materialNames = parameterMap.get("materialName");
        if (materialNames != null && materialNames.length > 0) {
            queryWrapper.like("t1.material_name", materialNames[0]);
        }
        String[] batchNumbers = parameterMap.get("batchNumber");
        if (batchNumbers != null && batchNumbers.length > 0) {
            queryWrapper.like("t1.batch_number", batchNumbers[0]);
        }
        String[] equipmentIds = parameterMap.get("equipmentId");
        if (equipmentIds != null && equipmentIds.length > 0) {
            queryWrapper.eq("t1.equipment_id", equipmentIds[0]);
        }
        queryWrapper.orderByDesc("t1.create_time");
        return this.baseMapper.queryPageList(page, queryWrapper);
    }
}