外购成品功能迁移v1

zouyu

23 小时以前 004ee58feda41620f621db1fb8773f1b56eaf71e

 inspect-server/src/main/java/com/ruoyi/inspect/service/RawMaterialOrderService.java

@@ -2,21 +2,22 @@

import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.dto.IfsInventoryQuantityCheckDto;
import com.ruoyi.basic.dto.IfsInventoryQuantityDto;
import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.basic.vo.IfsInventoryQuantityVO;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.inspect.dto.CopperInsOrderDto;
import com.ruoyi.inspect.dto.OrderSplitDTO;
import com.ruoyi.inspect.dto.SampleProductDto;
import com.ruoyi.inspect.pojo.InsOrder;
import com.ruoyi.inspect.dto.CopperInsOrderDto;
import com.ruoyi.inspect.dto.RawMaterialStandardTreeDto;
import org.springframework.web.multipart.MultipartFile;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.UnsupportedEncodingException;
import java.util.List;
import java.util.Map;

/**
 * @Author zhuo
@@ -32,7 +33,7 @@
     * @param ifsInventoryQuantity
     * @return
     */
    IPage<IfsInventoryQuantity> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);
    IPage<IfsInventoryQuantityVO> getWarehouseSubmit(IPage<IfsInventoryQuantity> page, IfsInventoryQuantity ifsInventoryQuantity);

    /**
     * 查询检验值
@@ -42,7 +43,7 @@
     */
    IPage<IfsInventoryQuantityDto> getIfsByStateOne(IPage<IfsInventoryQuantityDto> page, IfsInventoryQuantityDto ifsInventoryQuantityDto);

    int inspectionReport(List<Long> ids);
    int inspectionReport(List<Long> ids,String orderType);

    int revokeInspectionReport(Long id);

@@ -155,4 +156,6 @@
    Result importSplitOrderData(MultipartFile file, Long ifsId, HttpServletRequest request);

    boolean confirmSplitOrder(OrderSplitDTO orderSplitDTO);

    Long getOrderCountByIfsId(Long ifsId);
}