diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java index 32309c6de..9dad1db83 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownGoodsClient.java @@ -49,7 +49,7 @@ public interface IWarehouseUpdownGoodsClient { *改货位有无物品 */ @GetMapping(TOP + "/selectCountByAllo") - Integer selectCountByAllo(@RequestParam Long alloId); + Integer selectCountByAllo(@RequestParam List alloId); /** *货架有无物品 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java index c905cb4e9..ba665c0cb 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAllocationController.java @@ -16,6 +16,7 @@ */ package com.logpm.basicdata.controller; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.logpm.basicdata.dto.BasicdataGoodsAllocationDTO; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; @@ -145,6 +146,28 @@ public class BasicdataGoodsAllocationController extends BladeController { return R.status(basicdataGoodsAllocationService.deleteLogic(Func.toLongList(ids))); } + /** + * 货位 禁用 + */ + @PostMapping("/disable") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "禁用", notes = "传入ids") + public R disable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + R r =basicdataGoodsAllocationService.disableGoodsAllocation(ids); + return r; + } + + /** + * 货位 启用 + */ + @PostMapping("/enable") + @ApiOperationSupport(order = 7) + @ApiOperation(value = "启用", notes = "传入ids") + public R enable(@ApiParam(value = "主键集合", required = true) @RequestParam String ids) { + R r =basicdataGoodsAllocationService.enableGoodsAllocation(ids); + return r; + } + /** * 导出数据 diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java index cca5c11d9..b97a8a909 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsAreaController.java @@ -16,9 +16,12 @@ */ package com.logpm.basicdata.controller; + import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; +import com.logpm.basicdata.excel.BasicdataGoodsAllocationExcel; import com.logpm.basicdata.excel.BasicdataGoodsAreaExcel; +import com.logpm.basicdata.excel.BasicdataGoodsAreaImporter; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; import com.logpm.basicdata.service.IBasicdataGoodsAreaService; import com.logpm.basicdata.vo.BasicdataGoodsAreaVO; @@ -45,7 +48,10 @@ import org.springblade.core.boot.ctrl.BladeController; import org.springblade.core.tool.utils.DateUtil; import org.springblade.core.excel.util.ExcelUtil; import org.springblade.core.tool.constant.BladeConstant; +import org.springframework.web.multipart.MultipartFile; import springfox.documentation.annotations.ApiIgnore; + +import java.util.ArrayList; import java.util.Map; import java.util.List; import java.util.Objects; @@ -248,6 +254,30 @@ public class BasicdataGoodsAreaController extends BladeController { // return R.status(distributionStockupService.deleteLogic(Func.toLongList(ids))); } + /** + * 导入货区 + */ + @PostMapping("import-basicMaterial") + @ApiOperationSupport(order = 12) + @ApiOperation(value = "导入货区", notes = "传入excel") + public R importWarehousingEntry(MultipartFile file) { + log.info("传入>>>>>>>{}",file); + BasicdataGoodsAreaImporter basicdataGoodsAreaImporter = new BasicdataGoodsAreaImporter(basicdataGoodsAreaService); + ExcelUtil.save(file,basicdataGoodsAreaImporter,BasicdataGoodsAreaExcel.class); + return R.success("操作成功"); + } + + /** + * 导出模板 + */ + @GetMapping("/exportmb-BasicdataGoodsArea") + @ApiOperationSupport(order = 9) + @ApiOperation(value = "导出模板") + public void exportBasicdataGoodsAllocation(@ApiIgnore @RequestParam Map BasicdataGoodsAllocation, BladeUser bladeUser, HttpServletResponse response) { + List list = new ArrayList<>(); + ExcelUtil.export(response, "货区" + DateUtil.time(), "货区数据表", list, BasicdataGoodsAreaExcel.class); + } + diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java index 330a25b17..5277e558a 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataGoodsShelfController.java @@ -160,7 +160,7 @@ public class BasicdataGoodsShelfController extends BladeController { } /** - * 货区 禁用 + * 货架 禁用 */ @PostMapping("/disable") @ApiOperationSupport(order = 7) @@ -172,7 +172,7 @@ public class BasicdataGoodsShelfController extends BladeController { } /** - * 货区 启用 + * 货架 启用 */ @PostMapping("/enable") @ApiOperationSupport(order = 7) diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java index d0aff6f26..9a4dfc7d5 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaExcel.java @@ -53,23 +53,16 @@ public class BasicdataGoodsAreaExcel implements Serializable { * 货架 */ @ColumnWidth(20) - @ExcelProperty("货架") + @ExcelProperty("货区状态") private String shelfName; - /** - * 货位名称 - */ - @ColumnWidth(20) - @ExcelProperty("货位名称") - private String allocationName; - - - /** - * 货位总件数 - */ - @ColumnWidth(20) - @ExcelProperty("货位总件数") - private Integer allocationNub; +// +// /** +// * 货位总件数 +// */ +// @ColumnWidth(20) +// @ExcelProperty("货位总件数") +// private Integer allocationNub; // // /** @@ -86,12 +79,12 @@ public class BasicdataGoodsAreaExcel implements Serializable { // @ExcelProperty("品牌") // private String brand; // - /** - * 客户姓名 - */ - @ColumnWidth(20) - @ExcelProperty("客户姓名") - private String customerName; +// /** +// * 客户姓名 +// */ +// @ColumnWidth(20) +// @ExcelProperty("客户姓名") +// private String customerName; // /** // * 物料名称 // */ diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaImporter.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaImporter.java new file mode 100644 index 000000000..ca14cff1e --- /dev/null +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/excel/BasicdataGoodsAreaImporter.java @@ -0,0 +1,28 @@ +package com.logpm.basicdata.excel; + + + +import com.logpm.basicdata.service.IBasicdataGoodsAreaService; +import lombok.RequiredArgsConstructor; +import org.springblade.core.excel.support.ExcelImporter; + +import java.util.List; + + +/** + * @program: LogisticsPlatform-Service + * @description: + * @author: lmy + * @create: 2023-08-31 10:26 + **/ +@RequiredArgsConstructor +public class BasicdataGoodsAreaImporter implements ExcelImporter { + + private final IBasicdataGoodsAreaService service; + + + @Override + public void save(List data) { + service.importGoodsArea(data); + } +} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml index b314e0926..98c118b85 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAllocationMapper.xml @@ -111,6 +111,15 @@ and warehouse.name like concat('%', #{po.warehouseName},'%') + + + and goods_allocation.column_num = #{po.columnNum} + + + and goods_allocation.layer_num = #{po.layerNum} + + + and goods_allocation.goods_allocation_name like concat('%', #{po.goodsAllocationName},'%') AND goods_allocation.goods_shelf_id=#{po.goodsShelfId} diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java index a7233f9d2..13e12f922 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataGoodsAllocationService.java @@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.FreightSpaceVO; import org.springblade.core.mp.base.BaseService; import org.springblade.core.mp.support.Query; +import org.springblade.core.tool.api.R; import javax.servlet.http.HttpServletResponse; import java.util.List; @@ -92,5 +93,12 @@ public interface IBasicdataGoodsAllocationService extends BaseService ids); + + void importGoodsArea(List data); } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java index 00e784dd7..44bace222 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAllocationServiceImpl.java @@ -18,6 +18,7 @@ package com.logpm.basicdata.service.impl; import cn.hutool.extra.qrcode.QrCodeUtil; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; import com.logpm.basic.entity.BasicPrintTemplateEntity; @@ -36,6 +37,7 @@ import com.logpm.basicdata.vo.BasicdataGoodsAllocationVO; import com.logpm.basicdata.vo.BasicdataNodeVO; import com.logpm.basicdata.vo.FreightSpaceVO; import com.logpm.basicdata.vo.WarehouseAllocationInfoVO; +import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; import org.springblade.common.constant.printTemplate.PrintTemplateStatusConstant; import org.springblade.common.utils.QRCodeUtil; @@ -45,6 +47,7 @@ import org.springblade.core.mp.support.Condition; import org.springblade.core.mp.support.Query; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; +import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.Func; import org.springblade.core.tool.utils.ObjectUtil; import org.springframework.beans.BeanUtils; @@ -85,6 +88,8 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl selectBasicdataGoodsAllocationPage(IPage page, BasicdataGoodsAllocationVO BasicdataGoodsAllocation) { @@ -255,4 +260,26 @@ public class BasicdataGoodsAllocationServiceImpl extends BaseServiceImpl().lambda() + .set(BasicdataGoodsAllocationEntity::getEnableStatus, 1) + .in(BasicdataGoodsAllocationEntity::getId, Func.toLongList(ids))); + return update?R.success("成功"):R.fail("失败"); + } + + @Override + public R disableGoodsAllocation(String ids) { + //查询该货区有无货物 + Integer integer = warehouseUpdownGoodsClient.selectCountByArea(Func.toLongList(ids)); + if (integer>0){ + return R.fail("有货物,无法禁用"); + } + boolean update = this.update(new UpdateWrapper().lambda() + .set(BasicdataGoodsAllocationEntity::getEnableStatus, 2) + .in(BasicdataGoodsAllocationEntity::getId, Func.toLongList(ids))); + return update?R.success("成功"):R.fail("失败"); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java index 8b94b0172..4127db493 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsAreaServiceImpl.java @@ -22,6 +22,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.toolkit.SqlHelper; +import com.logpm.basic.entity.BasicMaterialEntity; import com.logpm.basicdata.entity.BasicdataGoodsAllocationEntity; import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity; import com.logpm.basicdata.entity.BasicdataGoodsShelfEntity; @@ -41,9 +42,11 @@ import com.logpm.basicdata.vo.BasicdataWarehouseVO; import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper; import com.logpm.warehouse.feign.IWarehouseUpdownGoodsClient; import lombok.AllArgsConstructor; +import lombok.extern.log4j.Log4j2; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; +import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; @@ -54,6 +57,7 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.interceptor.TransactionAspectSupport; import java.util.*; +import java.util.function.Function; import java.util.stream.Collectors; /** @@ -64,6 +68,7 @@ import java.util.stream.Collectors; */ @Service @AllArgsConstructor +@Log4j2 public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl implements IBasicdataGoodsAreaService { private final BasicdataGoodsAreaMapper basicdataGoodsAreaMapper; @@ -222,7 +227,7 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl0){ - return R.fail("有货物,无法删除"); + return R.fail("有货物,无法禁用"); } //禁用对应下面的货架货位 basicdataGoodsShelfService.update(new UpdateWrapper().lambda() @@ -237,4 +242,15 @@ public class BasicdataGoodsAreaServiceImpl extends BaseServiceImpl data) { + log.info("传入参数>>>>>>>>>>>>>>>>{},>>>>>>>>{}",data); + ArrayList arrayList = new ArrayList<>(); + for (BasicdataGoodsAreaExcel datum : data) { + BasicdataGoodsAreaEntity copy = BeanUtil.copy(datum, BasicdataGoodsAreaEntity.class); + arrayList.add(copy); + } + this.saveBatch(arrayList); + } + } diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java index 22399c22d..7fd707d8c 100644 --- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java +++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataGoodsShelfServiceImpl.java @@ -455,7 +455,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0)return R.fail(basicdataGoodsAllocationEntity.getGoodsAllocationName()+"有货物存在"); longs.add(id); } @@ -502,7 +502,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0)return R.fail(basicdataGoodsAllocationEntity.getGoodsAllocationName()+"有货物存在"); longs.add(id); } @@ -542,7 +542,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0)return R.fail(basicdataGoodsAllocationEntity.getGoodsAllocationName()+"有货物存在"); longs.add(id); } @@ -559,7 +559,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0)return R.fail(basicdataGoodsAllocationEntity.getGoodsAllocationName()+"有货物存在"); longs.add(id); } @@ -588,7 +588,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0)return R.fail(basicdataGoodsAllocationEntity.getGoodsAllocationName()+"有货物存在"); longs.add(id); } @@ -636,7 +636,7 @@ public class BasicdataGoodsShelfServiceImpl extends BaseServiceImpl0){ - return R.fail("有货物,无法删除"); + return R.fail("有货物,无法禁用"); } //禁用对应下面的货位 boolean update = basicdataGoodsAllocationService.update(new UpdateWrapper().lambda() diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java index b1fe8a953..90f3aa1c3 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/pan/service/impl/PanFactoryDataServiceImpl.java @@ -480,16 +480,15 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { distributionStockArticleEntity.setOrderReceiveStatus(OrderReceiveStatusConstant.bufenshouhuo.getValue()); id = distributionStockArticleClient.addData(distributionStockArticleEntity); + distributionStockArticleEntity.setId(id); if (id == 0) { logger.warn("#################handleDataToPlatform: 保存订单信息失败 orderSelfNum={}", orderSelfNum); throw new CustomerException(405, "保存订单信息失败"); } } - id = distributionStockArticleEntity.getId(); - //保存包件信息 - saveOrderPackage(unitNo, distributionStockArticleEntity, id, basicdataWarehouseEntity, waybillNoNum); - + //保存包件信息 + saveOrderPackage(unitNo, distributionStockArticleEntity, basicdataWarehouseEntity, waybillNoNum); String waybillNumber = distributionStockArticleEntity.getWaybillNumber(); if(!waybillNumber.contains(waybillNoNum)){ @@ -564,7 +563,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { * @param id * @param basicdataWarehouseEntity */ - private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, Long id, BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) { + private void saveOrderPackage(String unitNo, DistributionStockArticleEntity distributionStockArticleEntity, BasicdataWarehouseEntity basicdataWarehouseEntity, String waybillNo) { DistributionParcelListEntityVO vo = advanceDetailClient.getByUnitNo(unitNo); WarehouseWaybillEntity warehouseWaybill = warehouseWaybillClient.findByWaybillNo(waybillNo); @@ -574,7 +573,7 @@ public class PanFactoryDataServiceImpl implements IPanFactoryDataService { entity.setConditions(1); entity.setWarehouse(distributionStockArticleEntity.getWarehouse()); entity.setWarehouseId(distributionStockArticleEntity.getWarehouseId()); - entity.setStockArticleId(id); + entity.setStockArticleId(distributionStockArticleEntity.getId()); entity.setOrderPackageStatus(OrderPackageStatusConstant.yiruku.getValue()); entity.setOrderPackageFreezeStatus(OrderPackageFreezeStatusConstant.weidongjie.getValue()); entity.setOrderPackageReservationStatus(OrderPackageReservationStatusConstant.daiyuyue.getValue()); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java index b609e1879..f7ea4197b 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownGoodsClient.java @@ -30,8 +30,8 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { @Override @GetMapping(TOP + "/selectCountByAllo") - public Integer selectCountByAllo(Long alloId) { - return warehouseUpdownGoodsService.selectCountByAllo(alloId); + public Integer selectCountByAllo(List alloIds) { + return warehouseUpdownGoodsService.selectCountByAllo(alloIds); } @Override diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java index e792c49e9..2bcfe4698 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownGoodsService.java @@ -67,7 +67,7 @@ public interface IWarehouseUpdownGoodsService extends BaseService alloIds); List findPackageByUpdownTypeId(Long updownTypeId); diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java index f98c88b7c..051dffd47 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownGoodsServiceImpl.java @@ -70,10 +70,10 @@ public class WarehouseUpdownGoodsServiceImpl extends BaseServiceImpl alloIds) { return baseMapper.selectCount(new QueryWrapper().lambda() .eq(WarehouseUpdownGoodsEntity::getIsDeleted,0) - .eq(WarehouseUpdownGoodsEntity::getAllocationId,alloId) + .in(WarehouseUpdownGoodsEntity::getAllocationId,alloId) ).intValue(); }