diff --git a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java index 00291ffa5..70eb729ed 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-api/src/main/java/com/bsd/pjcloud/supermarket/api/feign/RemoteSupermarketSpuService.java @@ -53,11 +53,11 @@ public interface RemoteSupermarketSpuService { /** * 根据spu id 查询spu详情,详情包括辅助条码和包装单位基本信息 - * @param id + * @param ids * @return */ @GetMapping("/supermarketSpu/ad/SpuDetails") - R getSupermarketSpuDetailById(@RequestParam("id")Long id); + R> getSupermarketSpuDetailById(@RequestParam List ids); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java index 32536b3f6..158f5c38a 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpCgDdController.java @@ -11,6 +11,7 @@ import com.bsd.pjcloud.common.core.util.BeanUtils; import com.bsd.pjcloud.common.core.util.R; import com.bsd.pjcloud.common.log.annotation.SysLog; import com.bsd.pjcloud.common.security.annotation.Inner; +import com.bsd.pjcloud.flow.task.constant.TaskCheckStatusEnum; import com.bsd.pjcloud.flow.task.dto.ProcessNodeRecordParamDto; import com.bsd.pjcloud.flow.task.utils.GetCheckReasonUtils; import com.bsd.pjcloud.flow.task.vo.CheckStatusAndReasonVo; @@ -203,7 +204,7 @@ public class SmErpCgDdController { //只查询未关联的 wrapper.eq(SmErpCgPlanEntity::getLinkStatus,"0"); //todo 审核成功条件 -// wrapper.eq(SmErpCgPlanEntity::getCheckStatus,); + wrapper.eq(SmErpCgPlanEntity::getCheckStatus, TaskCheckStatusEnum.RESULT); return R.ok(smErpCgPlanService.pageCgsqScope(page, wrapper)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java index 0b3c584dc..fe3ffa3d2 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/controller/SmErpSpuController.java @@ -260,13 +260,13 @@ public class SmErpSpuController { /** * 根据spu id 查询spu详情,详情包括辅助条码和包装单位基本信息 - * @param id + * @param ids * @return */ @Operation(summary = "spu详情" , description = "spu详情" ) @GetMapping("/ad/SpuDetails" ) - public R getSupermarketSpuDetailById(@RequestParam("id")Long id) { - return R.ok(smErpSpuService.getSupermarketSpuDetailById(id)); + public R> getSupermarketSpuDetailById(@RequestParam List ids) { + return R.ok(smErpSpuService.getSupermarketSpuDetailById(ids)); } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java index 79403e9f0..ecf22cce7 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/SmErpSpuService.java @@ -16,6 +16,7 @@ import com.bsd.pjcloud.supermarket.vo.cgplan.ErpSpuWithUnitPageVo; import com.bsd.pjcloud.supermarket.vo.sm.smspu.SmErpPageScopeVo; import org.springdoc.core.annotations.ParameterObject; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.annotation.RequestBody; import java.util.ArrayList; import java.util.List; @@ -58,10 +59,10 @@ public interface SmErpSpuService extends IService { /** * 根据id查询商品详情 - * @param id + * @param ids * @return */ - SmErpSpuDetailsVo getSupermarketSpuDetailById(Long id); + List getSupermarketSpuDetailById(List ids); /** diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java index a79229d3a..1cef19be3 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/java/com/bsd/pjcloud/supermarket/service/impl/SmErpSpuServiceImpl.java @@ -388,22 +388,28 @@ public class SmErpSpuServiceImpl extends ServiceImpl smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); - List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id)); - SmErpSpuDetailsVo smErpSpuDetailsVo = BeanUtils.toBean(smErpSpuEntity, SmErpSpuDetailsVo.class); - List smErpUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SmErpUnitVo.class); - List smErpAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SmErpAuxiliaryCodeVo.class); - smErpSpuDetailsVo.setSupermarketUnitEntityList(smErpUnitVoList); - smErpSpuDetailsVo.setSupermarketAuxiliaryCodeEntityList(smErpAuxiliaryCodeVos); + public List getSupermarketSpuDetailById(List ids) { + List smErpSpuEntities = baseMapper.selectByIds(ids); + List smErpSpuDetailsVos = new ArrayList<>(); + smErpSpuEntities.forEach(smErpSpuEntity -> { + Long id = smErpSpuEntity.getId(); + List smErpUnitEntityList = smErpUnitService.list(new LambdaQueryWrapper().eq(SmErpUnitEntity::getSpuId, id)); + List supermarketAuxiliaryCodeEntities = smErpAuxiliaryCodeService.list(new LambdaQueryWrapper().eq(SmErpAuxiliaryCodeEntity::getSpuId, id)); + SmErpSpuDetailsVo smErpSpuDetailsVo = BeanUtils.toBean(smErpSpuEntity, SmErpSpuDetailsVo.class); + List smErpUnitVoList = BeanUtils.toBean(smErpUnitEntityList, SmErpUnitVo.class); + List smErpAuxiliaryCodeVos = BeanUtils.toBean(supermarketAuxiliaryCodeEntities, SmErpAuxiliaryCodeVo.class); + smErpSpuDetailsVo.setSupermarketUnitEntityList(smErpUnitVoList); + smErpSpuDetailsVo.setSupermarketAuxiliaryCodeEntityList(smErpAuxiliaryCodeVos); - //库存 - LambdaQueryWrapper stocmEq = new LambdaQueryWrapper() - .eq(SmErpStockEntity::getErpSpuId, id); - SmErpStockEntity smErpStockEntity = smErpStockMapper.selectOne(stocmEq); - smErpSpuDetailsVo.setStock(smErpStockEntity.getCurrentStock()); - return smErpSpuDetailsVo; + //库存 + LambdaQueryWrapper stocmEq = new LambdaQueryWrapper() + .eq(SmErpStockEntity::getErpSpuId, id); + SmErpStockEntity smErpStockEntity = smErpStockMapper.selectOne(stocmEq); + smErpSpuDetailsVo.setStock(smErpStockEntity.getCurrentStock()); + smErpSpuDetailsVos.add(smErpSpuDetailsVo); + }); + + return smErpSpuDetailsVos; } diff --git a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml index eb7e667fb..605d15a1f 100644 --- a/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml +++ b/pjcloud-supermarket/pjcloud-supermarket-biz/src/main/resources/mapper/SmErpSpuMapper.xml @@ -74,7 +74,7 @@ left join sm_erp_stock st on es.id = st.erp_spu_id - u.status = 0 and es.status = 0 + u.status = 0 and es.status = 0 and es.del_flag = 0 and u.del_flag = 0 AND es.id = #{supermarketSpuQueryDTO.id}