zss
2025-03-25 9f1c4e5ef6f82e111400fe2f292453583aa2155e
报告分页查询新增委托编号和样品编号
已修改2个文件
7 ■■■■ 文件已修改
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
inspect-server/src/main/java/com/yuanchu/mom/dto/ReportPageDto.java
@@ -11,9 +11,11 @@
public class ReportPageDto extends InsReport implements Serializable {
    @ApiModelProperty(value = "委托编号")
    @ValueTableShow(value = 2,name = "委托编号")
    private String entrustCode;
    @ApiModelProperty(value = "样品编号")
    @ValueTableShow(value = 2,name = "样品编号")
    private String sampleCode;
    @ValueTableShow(value = 3,name = "提交人")
inspect-server/src/main/java/com/yuanchu/mom/service/impl/InsOrderPlanServiceImpl.java
@@ -1199,8 +1199,9 @@
                            .set(InsOrderState::getInsState, 5)
                            .set(InsOrderState::getVerifyTell, tell)
                            .set(InsOrderState::getVerifyUser, userId));
                    //如果订单类型是原理样机,则该订单直接闭环
                    List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery().eq(InsSample::getInsOrderId, insSample.getInsOrderId()));
                    //结束之后将该订单的所有样品全部出库
                    List<InsSample> insSamples = insSampleMapper.selectList(Wrappers.<InsSample>lambdaQuery()
                            .eq(InsSample::getInsOrderId, insSample.getInsOrderId()));
                    for (InsSample sample : insSamples) {
                        try{
                            outInsOrderState(laboratory, sample.getSampleCode(), insOrder.getEntrustCode());