业务管理相关页面添加`批号`查询条件

zouyu

2025-09-29 12c5c9b4eaaac1dc51cd0be88864260535394541

业务管理相关页面添加`批号`查询条件

 inspect-server/src/main/java/com/ruoyi/inspect/dto/InsOrderPlanDTO.java

@@ -32,4 +32,7 @@
    @ApiModelProperty("是否复核")
    private Integer isCheck;

    @ApiModelProperty("批号")
    private String updateBatchNo;

}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/ReportPageDto.java

@@ -42,4 +42,7 @@
    @ApiModelProperty(value = "只看自己标识")
    private Integer createOrderUser;

    @ApiModelProperty(value = "更新后的ifs批次号")
    private String updateBatchNo;

}

 inspect-server/src/main/java/com/ruoyi/inspect/dto/UnqualifiedHandlerDto.java

@@ -68,6 +68,9 @@
    @ApiModelProperty("批号")
    private String lotBatchNo;

    @ApiModelProperty("更新后的ifs批号")
    private String updateBatchNo;

    @ApiModelProperty("wdr号")
    private String waivDevRejNo;


 inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java

@@ -42,9 +42,11 @@
import com.ruoyi.inspect.mapper.InsOrderMapper;
import com.ruoyi.inspect.mapper.InsProductMapper;
import com.ruoyi.inspect.mapper.InsSampleMapper;
import com.ruoyi.inspect.mapper.InsUnqualifiedHandlerMapper;
import com.ruoyi.inspect.pojo.IfsSplitOrderRecord;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.pojo.InsReport;
import com.ruoyi.inspect.pojo.InsUnqualifiedHandler;
import com.ruoyi.inspect.service.IfsSplitOrderRecordService;
import com.ruoyi.inspect.service.InsOrderService;
import com.ruoyi.inspect.service.InsReportService;
@@ -100,6 +102,8 @@
    private IfsApiUtils ifsApiUtils;

    private IfsSplitOrderRecordService ifsSplitOrderRecordService;

    private InsUnqualifiedHandlerMapper insUnqualifiedHandlerMapper;


    @Override
@@ -597,16 +601,13 @@
        if (!ifsInventoryQuantity.getInspectStatus().equals(2)) {
            throw new ErrorException("不合格的原材料才能让步放行");
        }

        // todo:需要判断oa流程是否是让步放行
        String toLocation = insOrderService.moveRawMaterial(ifsInventoryQuantity);

        ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
        return ifsInventoryQuantityMapper.update(null, new LambdaUpdateWrapper<IfsInventoryQuantity>()
                .set(IfsInventoryQuantity::getInspectStatus, 4)
                .set(IfsInventoryQuantity::getToLocation, toLocation)
                .eq(IfsInventoryQuantity::getId, ifsInventoryId));

        return true;
                .eq(IfsInventoryQuantity::getId, ifsInventoryId))>0;
    }

    /**

 inspect-server/src/main/java/com/ruoyi/inspect/vo/InsOrderPlanVO.java

@@ -78,4 +78,7 @@
    @ApiModelProperty(value = "是否为拆分订单(0:否 1:是)")
    private Integer isSplitOrder;

    @ApiModelProperty(value = "更新后的ifs批次号")
    private String updateBatchNo;

}

 inspect-server/src/main/java/com/ruoyi/inspect/vo/UnqualifiedHandlerVO.java

@@ -68,6 +68,9 @@
    @ApiModelProperty("批号")
    private String lotBatchNo;

    @ApiModelProperty("更新后的ifs批号")
    private String updateBatchNo;

    @ApiModelProperty("wdr号")
    private String waivDevRejNo;


 inspect-server/src/main/resources/mapper/InsReportMapper.xml

@@ -18,7 +18,8 @@
        io.laboratory,
        io.ifs_inventory_id,
        iiq.is_copper,
        ip.son_laboratory
        ip.son_laboratory,
        iiq.update_batch_no
        from ins_report ir
        left join ins_order io on io.id = ir.ins_order_id
        LEFT JOIN ifs_inventory_quantity iiq ON iiq.id = io.ifs_inventory_id

 inspect-server/src/main/resources/mapper/InsSampleMapper.xml

@@ -193,7 +193,8 @@
        ira.url_s,
        ira.temp_url_pdf,
        iiq.is_copper,
        iiq.is_split_order
        iiq.is_split_order,
        iiq.update_batch_no
        FROM
        ins_order io
        LEFT JOIN ins_sample isa ON isa.ins_order_id = io.id