From 6594f958af186a6f90a653ae12c196e6016d72f2 Mon Sep 17 00:00:00 2001 From: yxt_djz Date: Wed, 18 Jan 2023 09:07:35 +0800 Subject: [PATCH] 2 --- .../PurchaseRequisitionStoreFeign.java | 2 - ...PurchaseRequisitionStoreFeignFallback.java | 2 - .../PurchaseRequisitionTobaccoFeign.java | 2 - ...rchaseRequisitionTobaccoFeignFallback.java | 2 - ...urchaseRequisitionTobaccoDetailsFeign.java | 2 - ...equisitionTobaccoDetailsFeignFallback.java | 2 - .../gdinstorage/GdInstorageCountMapper.xml | 25 ++++++------ .../InventoryInformationService.java | 6 --- .../ProductInformationMapper.java | 2 + .../ProductInformationService.java | 38 +++++++++++-------- .../PurchaseRequisitionMapper.java | 28 ++++++++++++-- .../PurchaseRequisitionService.java | 3 +- .../PurchaseRequisitionStoreService.java | 3 -- .../PurchaseRequisitionTobaccoMapper.java | 1 - ...PurchaseRequisitionTobaccoDetailsRest.java | 1 - ...chaseRequisitionTobaccoDetailsService.java | 4 -- 16 files changed, 65 insertions(+), 58 deletions(-) diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java index 0e6cbc94..79bc163e 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeign.java @@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionStoreFeign.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java index d3c44ee9..4f3c23f2 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitionstore/PurchaseRequisitionStoreFeignFallback.java @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionStoreFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java index 7c2aa0a1..f648058b 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeign.java @@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionTobaccoFeign.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java index 85bf581c..ef467527 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobacco/PurchaseRequisitionTobaccoFeignFallback.java @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionTobaccoFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java index b9f02b6f..ad527d28 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeign.java @@ -33,8 +33,6 @@ import com.yxt.common.core.vo.PagerVo; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionTobaccoDetailsFeign.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java index 56a37d6b..83ca3d2c 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java +++ b/yxt_supervise/supervise-portal/supervise-portal-api/src/main/java/com/yxt/anrui/portal/api/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsFeignFallback.java @@ -30,8 +30,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import org.springframework.stereotype.Component; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionTobaccoDetailsFeignFallback.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml index 1a58e3c7..058baa2b 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/gdinstorage/GdInstorageCountMapper.xml @@ -2,16 +2,19 @@ \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java index 629783f0..9e763058 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/inventoryinformation/InventoryInformationService.java @@ -35,12 +35,8 @@ import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; import com.yxt.supervise.portal.api.inventoryinformation.*; import com.yxt.supervise.portal.api.productinformation.ProductInformation; import com.yxt.supervise.portal.api.productinformation.ProductInformationVo; -import com.yxt.supervise.portal.api.productnum.ProductNum; -import com.yxt.supervise.portal.api.purchaserequisitionpro.PurchaseRequisitionPro; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; import com.yxt.supervise.portal.biz.productinformation.ProductInformationService; -import com.yxt.supervise.portal.biz.productnum.ProductNumService; -import io.swagger.annotations.ApiModelProperty; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; import com.yxt.common.base.service.MybatisBaseService; @@ -50,8 +46,6 @@ import com.yxt.common.core.vo.PagerVo; import org.apache.poi.hssf.usermodel.*; import org.apache.poi.ss.usermodel.CellType; -import org.apache.poi.ss.usermodel.HorizontalAlignment; -import org.apache.poi.ss.util.CellRangeAddress; import org.springframework.stereotype.Service; import javax.annotation.Resource; diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationMapper.java index 3a37e0a8..a572dceb 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationMapper.java @@ -67,4 +67,6 @@ public interface ProductInformationMapper extends BaseMapper @Select("SELECT * FROM `product_information` WHERE (brandSid IN(SELECT CODE FROM restricted_brand) " + "AND categoryKey IN(SELECT dictKey FROM restricted_category) AND CODE = #{code}) or (categoryKey in('081101','081102','081103'))") ProductInformationVo limitJudgement(String code); + @Select("select * from product_information where sid=#{sid}") + ProductInformation fetchBySid(@Param("sid") String dtoSid); } \ No newline at end of file diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java index e33e82a4..8254e561 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/productinformation/ProductInformationService.java @@ -37,6 +37,7 @@ import com.yxt.supervise.portal.api.dictcommon.DictCommonDetailsVo; import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfo; import com.yxt.supervise.portal.api.manufacturerinfo.ManufacturerInfoVo; import com.yxt.supervise.portal.api.productinformation.*; +import com.yxt.supervise.portal.api.supplierbankinfo.SupplierBankInfo; import com.yxt.supervise.portal.api.supplierinfo.SupplierInfo; import com.yxt.supervise.portal.api.supplierinfo.SupplierInfoVo; import com.yxt.supervise.portal.api.warehouseinfo.WarehouseInfo; @@ -47,6 +48,7 @@ import com.yxt.supervise.portal.api.warehouseshelves.WarehouseShelvesVo; import com.yxt.supervise.portal.biz.brandinfo.BrandInfoService; import com.yxt.supervise.portal.biz.dictcommon.DictCommonService; import com.yxt.supervise.portal.biz.manufacturerinfo.ManufacturerInfoService; +import com.yxt.supervise.portal.biz.supplierbankinfo.SupplierBankInfoService; import com.yxt.supervise.portal.biz.supplierinfo.SupplierInfoService; import com.yxt.supervise.portal.biz.warehouseposition.WarehousePositionService; import com.yxt.supervise.portal.biz.warehouseshelves.WarehouseShelvesService; @@ -100,6 +102,8 @@ public class ProductInformationService extends MybatisBaseService createQueryWrapper(ProductInformationQuery query) { // todo: 这里根据具体业务调整查询条件 @@ -137,7 +141,7 @@ public class ProductInformationService extends MybatisBaseService selectAll(); @Select(" SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) name ,1,convert(SUM(packageTotalPrice),decimal(12,2)) billTotalPrice, " + - " (SELECT convert(SUM(prodValue),decimal(12,2)) FROM gd_instorage_count gic WHERE gic.supplierCodeUnified=pr.supplierOnlyCode and gic.prodCode in(select prodcode from gd_rescategory_prod) ) prodValue, " + - " MAX(pr.`arrivalDate`) arrivalDate FROM `supplier_bank_info` sbi " + - "LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " + + "(SELECT convert(SUM(colq16),decimal(12,2)) FROM gd_instorage gic WHERE gic.colex=pr.supplierOnlyCode " + + "and gic.colh7 in(select prodcode from gd_rescategory_prod) ) prodValue," + + "MAX(pr.`arrivalDate`) arrivalDate " + + "FROM `supplier_bank_info` sbi " + + "LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified" + "LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + - " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " + + " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " + " GROUP BY pr.supplierOnlyCode ORDER BY sbi.name;") List> ztspglhzb(); @Select("SELECT MAX(sbi.name) name,code,SUM(packageTotalPrice) billTotalPrice,MAX(purchaseDate) billDate,MAX(arrivalDate) arrivalDate FROM `purchase_requisition` pr " + @@ -64,4 +66,22 @@ public interface PurchaseRequisitionMapper extends BaseMapper> suplierZtyz( @Param("codeUnified") String supplierCode); + + + //该方法是放弃了监管商品的索引表来判断 商品是否有在途的情况 + @Select(" SELECT codeUnified,NAME,1,billTotalPrice,prodValue,billTotalPrice-prodValue bp FROM(" + + " SELECT MAX(sbi.codeUnified) codeUnified, MAX(sbi.name) NAME ,1," + + " CONVERT(SUM(packageTotalPrice),DECIMAL(12,2)) billTotalPrice, " + + " ( SELECT CONVERT(SUM(colq16),DECIMAL(12,2)) FROM gd_instorage gic " + + " LEFT JOIN `product_information` PI ON pi.code=gic.colh7 " + + " WHERE gic.supplierCodeUnified=pr.supplierOnlyCode AND pi.categoryKey IN(SELECT categoryKey FROM `restricted_category`) " + + " AND pi.brandsid IN(SELECT CODE FROM `restricted_brand`) ) prodValue, " + + " MAX(pr.`arrivalDate`) arrivalDate " + + " FROM `supplier_bank_info` sbi " + + " LEFT JOIN `purchase_requisition` pr ON pr.supplierOnlyCode=sbi.codeUnified " + + " LEFT JOIN `purchase_requisition_pro` prp ON pr.sid=prp.mainsid " + + " WHERE pr.purchaseState=1 AND pr.bankState=1 AND sbi.`purchaseRequisition`=1 AND sbi.`bankState`=1 " + + " GROUP BY pr.supplierOnlyCode ORDER BY sbi.name) t " + + " where codeUnified=#{codeUnified} and(billTotalPrice-prodValue)>0 ;") + List> suplierZtyz2( @Param("codeUnified") String supplierCode); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java index e748c505..52af2b23 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisition/PurchaseRequisitionService.java @@ -420,7 +420,8 @@ public class PurchaseRequisitionService extends MybatisBaseService> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode()); + // List> suplierZtyz=baseMapper.suplierZtyz(pr.getSupplierCode()); 临时注释掉 2023-01-16 + List> suplierZtyz=baseMapper.suplierZtyz2(pr.getSupplierCode()); if(suplierZtyz.size()>0){ return objectResultBean.setMsg("供应商有在途商品!"); } diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java index 0c61b57d..8cf74e08 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitionstore/PurchaseRequisitionStoreService.java @@ -36,11 +36,8 @@ import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.vo.PagerVo; import org.apache.commons.lang3.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.List; - /** * Project: yxt-supervise(宇信通监管)
* File: PurchaseRequisitionStoreService.java
diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java index 5e519ab4..f24a1a8a 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobacco/PurchaseRequisitionTobaccoMapper.java @@ -28,7 +28,6 @@ package com.yxt.supervise.portal.biz.purchaserequisitiontobacco; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; -import com.yxt.supervise.portal.api.salesdata.SalesData; import org.apache.ibatis.annotations.Insert; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java index 9aff6a5f..75e23338 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsRest.java @@ -32,7 +32,6 @@ import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; -import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; diff --git a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java index 0cdd6d7f..ba7f6ea9 100644 --- a/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java +++ b/yxt_supervise/supervise-portal/supervise-portal-biz/src/main/java/com/yxt/supervise/portal/biz/purchaserequisitiontobaccodetails/PurchaseRequisitionTobaccoDetailsService.java @@ -31,21 +31,17 @@ import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.text.csv.CsvReader; import cn.hutool.core.text.csv.CsvUtil; import cn.hutool.core.util.CharsetUtil; -import cn.hutool.poi.excel.ExcelUtil; import cn.hutool.poi.excel.sax.handler.RowHandler; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.yxt.anrui.portal.api.purchaserequisitionstore.PurchaseRequisitionStore; -import com.yxt.anrui.portal.api.purchaserequisitiontobacco.PurchaseRequisitionTobacco; import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetails; import com.yxt.anrui.portal.api.purchaserequisitiontobaccodetails.PurchaseRequisitionTobaccoDetailsQuery; import com.yxt.common.base.config.component.FileUploadComponent; import com.yxt.common.base.service.MybatisBaseService; import com.yxt.common.base.utils.PagerUtil; import com.yxt.common.core.query.PagerQuery; -import com.yxt.common.core.result.FileUploadResult; -import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.vo.PagerVo; import com.yxt.supervise.portal.biz.purchaserequisitionstore.PurchaseRequisitionStoreService; import lombok.extern.slf4j.Slf4j;