Merge remote-tracking branch 'origin/master'

zss

2023-09-05 2f50c3b23a14aa649e58c63d62862b6e0eada7ac

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

@@ -4,13 +4,15 @@
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.vo.FinishedInspectVo1;
import org.springframework.transaction.annotation.Transactional;

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

/**
 * <p>
 *  服务类
 * 服务类
 * </p>
 *
 * @author 江苏鵷雏网络科技有限公司
@@ -21,7 +23,32 @@
    @Transactional(rollbackFor = Exception.class)
    Integer addProcessInspectionSheet(FinishedInspect finishedInspect);

    Integer inspectionConclusion(Integer finishedInspectId, Integer result);
    Integer inspectionConclusion(String username, Integer finishedInspectId, Integer result);

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

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

    /**
     * 新增过程检验单
     *
     * @param finishedInspectVo1
     * @return
     */
    String addProcess(String userId, FinishedInspectVo1 finishedInspectVo1);

    /**
     * 新增过程检验单-->选择设备
     * @param mtid
     * @param father
     * @param name
     * @return
     */
    List<Map<String,Object>> chooseDev(Integer technologyId, String father, String name);
}