From 83ec5bcd06eece9b9867ecb3302980b92dd17504 Mon Sep 17 00:00:00 2001 From: futian.liu <liufutianyoo@163.com> Date: 星期四, 14 十二月 2023 15:39:49 +0800 Subject: [PATCH] 修改型号查询列表 --- consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java | 36 +++++++++++++++++++----------------- 1 files changed, 19 insertions(+), 17 deletions(-) diff --git a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java index 0b28684..e956fae 100644 --- a/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java +++ b/consum-base/src/main/java/com/consum/base/config/WhWarningImportVerifyHandler.java @@ -1,20 +1,22 @@ package com.consum.base.config; -import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult; -import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler; +import java.util.HashMap; +import java.util.List; +import java.util.StringJoiner; + +import com.consum.base.core.type.StatesType; import com.consum.base.pojo.WarnConfImEntity; -import com.consum.base.service.BaseGoodsModelsServiceImpl; -import com.consum.base.service.BaseGoodsTemplateServiceImpl; -import com.consum.base.service.BaseWarehouseServiceImpl; +import com.consum.base.service.BaseGoodsModelsService; +import com.consum.base.service.BaseGoodsTemplateService; +import com.consum.base.service.BaseWarehouseService; import com.consum.model.po.BaseGoodsModels; import com.consum.model.po.BaseGoodsTemplate; import com.consum.model.po.BaseWarehouse; import com.iplatform.core.BeanContextAware; import com.walker.infrastructure.utils.CollectionUtils; -import java.util.HashMap; -import java.util.List; -import java.util.StringJoiner; +import cn.afterturn.easypoi.excel.entity.result.ExcelVerifyHandlerResult; +import cn.afterturn.easypoi.handler.inter.IExcelVerifyHandler; /** * @ClassName WhWarningImportVerifyHandler @@ -25,23 +27,22 @@ **/ public class WhWarningImportVerifyHandler implements IExcelVerifyHandler<WarnConfImEntity> { - //淇濆瓨鎵�鏈夋暟鎹� + // 淇濆瓨鎵�鏈夋暟鎹� private HashMap<String, Integer> containMap; // 褰撳墠浜烘満鏋� private Long agencyId; - private BaseWarehouseServiceImpl baseWarehouseService; - private BaseGoodsTemplateServiceImpl baseGoodsTemplateService; - private BaseGoodsModelsServiceImpl baseGoodsModelsService; + private BaseWarehouseService baseWarehouseService; + private BaseGoodsTemplateService baseGoodsTemplateService; + private BaseGoodsModelsService baseGoodsModelsService; public WhWarningImportVerifyHandler(Long agencyId) { this.agencyId = agencyId; this.containMap = new HashMap<>(); - this.baseWarehouseService = BeanContextAware.getBeanByType(BaseWarehouseServiceImpl.class); - this.baseGoodsTemplateService = BeanContextAware.getBeanByType(BaseGoodsTemplateServiceImpl.class); - this.baseGoodsModelsService = BeanContextAware.getBeanByType(BaseGoodsModelsServiceImpl.class); + this.baseWarehouseService = BeanContextAware.getBeanByType(BaseWarehouseService.class); + this.baseGoodsTemplateService = BeanContextAware.getBeanByType(BaseGoodsTemplateService.class); + this.baseGoodsModelsService = BeanContextAware.getBeanByType(BaseGoodsModelsService.class); } - @Override public ExcelVerifyHandlerResult verifyHandler(WarnConfImEntity param) { @@ -74,7 +75,8 @@ param.setBaseWarehouseId(warehouse.getId()); } - List<BaseGoodsTemplate> baseGoodsTemplates = baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, null, (short) 1, goodsTemplateName); + List<BaseGoodsTemplate> baseGoodsTemplates = baseGoodsTemplateService.queryGoodsTemplateByCategoryId(agencyId, + null, StatesType.NORMAL.getValue(), goodsTemplateName); if (CollectionUtils.isEmpty(baseGoodsTemplates)) { joiner.add("鐗╁搧鍚嶇О鏈夎"); String errMsg = joiner.toString(); -- Gitblit v1.9.1