Merge remote-tracking branch 'origin/master'

XiaoRuby

2023-09-24 20956b0f05f81ca47cf6c3e8f9b3b426e9cfd035

 inspect-server/src/main/java/com/yuanchu/mom/service/FinishedInspectService.java

@@ -2,15 +2,17 @@

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.extension.service.IService;
import com.yuanchu.mom.pojo.FinishedInspect;
import com.yuanchu.mom.pojo.vo.FinishedInspectVo;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * <p>
 *  服务类
 * 服务类
 * </p>
 *
 * @author 江苏鵷雏网络科技有限公司
@@ -18,10 +20,43 @@
 */
public interface FinishedInspectService extends IService<FinishedInspect> {

    @Transactional(rollbackFor = Exception.class)
    Integer addProcessInspectionSheet(FinishedInspect finishedInspect);
    /**
     * 新增检验单-->根据订单号选择产品信息
     *
     * @param orderNumber
     * @return
     */
    List<Map<String, Object>> chooseMater(String orderNumber);

    Integer inspectionConclusion(Integer finishedInspectId, Integer result);
    /**
     * 新增成品检验单
     *
     * @param finishedInspectVo
     * @return
     */
    Integer addProcessInspectionSheet(String userId, FinishedInspectVo finishedInspectVo);

    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer inspectResult, String inspectDate, String inspectUsername);

    /**
     * 上报(更新检验状态)
     * @param id
     * @return
     */
    String updateFinishInspectsById(String username,Integer id,Integer number);

    /**
     * 分页查询成品检验单列表
     * @param page
     * @param result
     * @param material
     * @return
     */
    IPage<Map<String, Object>> selectFinishedInspectPage(Page<Object> page, Integer result, String material);

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