Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-07 c28d3bb363dde2afb44c168b93379b2bf6b1f67f

 inspect-server/src/main/java/com/yuanchu/mom/mapper/FinishedInspectMapper.java

@@ -2,9 +2,10 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yuanchu.mom.pojo.FinishedInspect;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.yuanchu.mom.pojo.FinishedInspect;

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

/**
@@ -17,5 +18,12 @@
 */
public interface FinishedInspectMapper extends BaseMapper<FinishedInspect> {

    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);
    //分页查询成品检验
    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer result, String material);

    //新增检验单-->根据订单号选择产品信息
    List<Map<String, Object>> chooseMater(String orderNumber);

    //根据检验单id查询成品检验单详情
    List<Map<String, Object>> selectFinishInspectsListById(Integer id);
}