diff --git a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java index 490c2ba9e..29886e418 100644 --- a/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java +++ b/blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseTrayGoodsClient.java @@ -65,9 +65,11 @@ public interface IWarehouseTrayGoodsClient { Boolean delByTrayByCode(@RequestParam String code); /** * 通过托盘id查询托盘上面的货物 + * * @param trayId + * @param trayBarCode */ @PostMapping(GETTRAYIDLIST) - List getTrayIdList(@RequestParam String trayId); + List getTrayIdList(@RequestParam String trayId,@RequestParam String trayBarCode); } diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java index b3731cd12..d80c9dc71 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java @@ -320,6 +320,10 @@ public class DistributionStockupAppController extends BladeController { log.warn("##############allocationId: 货位状态为空 allocationId={}", allocationId); return R.fail(3002, "货位id为空"); } + if (ObjectUtils.isNull(allocationId)) { + log.warn("##############allocationId: 货位状态为空 allocationId={}", allocationId); + return R.fail(3002, "货位id为空"); + } if (Objects.isNull(stockListId)) { return R.fail(3002, "库存品id为空"); @@ -369,14 +373,15 @@ public class DistributionStockupAppController extends BladeController { @PostMapping("/scanningCode") @ApiOperation(value = "整托备货") public R scanningCodelist(@RequestBody StockupDTO stockupDTO) { + log.debug("=====整托数据：{}",stockupDTO); if (ObjectUtils.isNull(stockupDTO.getStockupId())) { return R.fail(3002, "备货id不能为空"); } if (ObjectUtils.isNull(stockupDTO.getReservationId())) { return R.fail(3002, "预约Id不能为空"); } - if (ObjectUtils.isNull(stockupDTO.getTrayId())) { - return R.fail(3002, "托盘ID不能为空"); + if (ObjectUtils.isNull(stockupDTO.getTrayBarCode())) { + return R.fail(3002, "托盘码不能为空"); } R b = distributionStockupService.addPackTrayList(stockupDTO); return b; @@ -393,10 +398,10 @@ public class DistributionStockupAppController extends BladeController { return R.data(list); } List listMarket = distributionStockupService.getLocationMarketSelection(stockupDTO); - if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.size())){ + if(!listMarket.isEmpty() && ObjectUtils.isNotNull(listMarket.get(0))){ return R.data(listMarket); } - return R.fail(3002,"当前物料未上架，请上架后在继续备货操作！！！"); + return Resp.scanFail("当前待备货的库存品未上架，请上架后在继续备货操作！！！","当前待备货的库存品未上架，请上架后在继续备货操作！！！"); } @@ -516,6 +521,7 @@ public class DistributionStockupAppController extends BladeController { WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity = new WarehouseUpdownGoodsEntity(); warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId()); warehouseUpdownGoodsEntity.setAssociationValue(stockupDTO.getPacketBarCode()); + warehouseUpdownGoodsEntity.setWarehouseId(distributionStockupEntity.getWarehouseId()); WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationInformation(warehouseUpdownGoodsEntity); entity.setAllocationTitle(locationInformation.getPositionCode()); entity.setAllocationId(stockupDTO.getAllocationId()); @@ -615,10 +621,12 @@ public class DistributionStockupAppController extends BladeController { warehouseUpdownGoodsEntity.setAllocationId(stockupDTO.getAllocationId()); warehouseUpdownGoodsEntity.setIncomingBatch(byId.getIncomingBatch()); warehouseUpdownGoodsEntity.setMarketId(byId.getMarketId()); + warehouseUpdownGoodsEntity.setAssociationId(byId.getMaterialId()); warehouseUpdownGoodsEntity.setAssociationType("4"); + warehouseUpdownGoodsEntity.setWarehouseId(byId.getWarehouseId()); WarehouseUpdownGoodsEntity locationInformation = warehouseUpdownGoodsClient.getLocationStockListInformation(warehouseUpdownGoodsEntity); if(ObjectUtils.isNull(locationInformation)){ - return Resp.scanFail("当前货位的本物料已为0，请更换货位继续！！", "当前货位的本物料已为0，请更换货位继续！！"); + return Resp.scanFail("当前货位的库存品已为零，请更换货位继续！！", "当前货位的库存品已为零，请更换货位继续！！"); } Integer i = distributionStockupService.selectPackagePrint(stockupDTO); switch (i) { @@ -659,6 +667,7 @@ public class DistributionStockupAppController extends BladeController { JSONObject jsonObject = new JSONObject(); jsonObject.put("marketId",byId.getMarketId()); jsonObject.put("materialCode",byId.getMarketCode()); + jsonObject.put("warehouseId",byId.getWarehouseId()); jsonObject.put("incomingBatch",byId.getIncomingBatch()); jsonObject.put("enterNum",1); jsonObject.put("allocationId",stockupDTO.getAllocationId()); diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java index cd9a75da9..37726adc8 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java @@ -33,6 +33,8 @@ public class StockupDTO implements Serializable { private String allocation;//库位信息 private Long allocationId;//库位信息ID + private String allocationCode;//库位信息ID + private String allocationType;//库位信息ID private String pallet;//托盘 diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml index 4dd7ae546..a05b43484 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml @@ -230,7 +230,8 @@ from logpm_distribution_reservation_stocklist ldrs left join logpm_distribution_stock_list ldst on ldst.id = ldrs.stocklist_id and ldst.is_deleted = 0 left join logpm_distribution_stock ldss on ldss.stock_list_id = ldst.id and ldss.reservation_id = #{reservationId} and ldss.is_deleted = 0 - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4' and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldst.material_id and lwug.association_type = '4' + and ldst.market_id = lwug.market_id and ldst.incoming_batch = lwug.incoming_batch and ldst.warehouse_id = lwug.warehouse_id where ldrs.reservation_id = #{reservationId} and ldrs.is_deleted = 0 group by ldst.id, ldst.storage_location, ldst.description_goods, ldst.sku,ldrs.id, diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml index 1cc4c2655..15e5a6283 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockupMapper.xml @@ -72,7 +72,7 @@ from logpm_distribution_reservation_stocklist ldrs LEFT JOIN logpm_distribution_stock_list ldsl on ldrs.stocklist_id = ldsl.id LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and ldsl.market_id = lwug.market_id - and ldsl.incoming_batch = lwug.incoming_batch + and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id where ldrs.id = #{param.deliveryDetailsId} @@ -363,7 +364,8 @@ ) realNum,lddd.id deliveryDetailsId from logpm_distribution_delivery_details lddd LEFT JOIN logpm_distribution_stock_list ldsl on lddd.stock_list_id = ldsl.id - LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4' and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch + LEFT JOIN logpm_warehouse_updown_goods lwug on lwug.association_id = ldsl.material_id and lwug.association_type = '4' + and ldsl.market_id = lwug.market_id and ldsl.incoming_batch = lwug.incoming_batch and ldsl.warehouse_id = lwug.warehouse_id where lddd.bill_lading_id = #{reservationId} GROUP BY lddd.stock_list_id,ldsl.description_goods,ldsl.sku,ldsl.cargo_norms,lddd.quantity,ldsl.cargo_unit,ldsl.tray_name,ldsl.unpack,lddd.id diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java index af13b1fec..955cd3cbe 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockupServiceImpl.java @@ -27,6 +27,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.basicdata.entity.BasicdataWarehouseEntity; import com.logpm.basicdata.feign.IBasicdataCodeClient; import com.logpm.basicdata.feign.IBasicdataWarehouseClient; +import com.logpm.distribution.bean.Resp; import com.logpm.distribution.dto.app.StockupDTO; import com.logpm.distribution.entity.*; import com.logpm.distribution.excel.DistributionStockupExcel; @@ -48,6 +49,7 @@ import org.springblade.common.constant.stocklist.StockStatusConstant; import org.springblade.common.constant.stockup.StockAssignStatusConstant; import org.springblade.common.constant.stockup.StockupStatusConstant; import org.springblade.common.exception.CustomerException; +import org.springblade.core.log.exception.ServiceException; import org.springblade.core.mp.base.BaseServiceImpl; import org.springblade.core.secure.BladeUser; import org.springblade.core.secure.utils.AuthUtil; @@ -69,7 +71,6 @@ import java.util.concurrent.atomic.AtomicReference; import java.util.function.Function; import java.util.function.Predicate; import java.util.stream.Collectors; -import java.util.stream.Stream; /** * 备货信息表 服务实现类 @@ -191,7 +192,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl distributionStockListSelfNumVOS = distributionStockupInfoService.selectStockListSelfNum(s); - if (distributionStockListSelfNumVOS.size() > 0) { + if (!distributionStockListSelfNumVOS.isEmpty()) { List listDetailEntities = new ArrayList<>(); distributionStockListSelfNumVOS.forEach(i -> { @@ -215,7 +216,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl 0) { + if (!listDetailEntities.isEmpty()) { disStockListDetailService.saveBatch(listDetailEntities); } @@ -1413,16 +1414,20 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId()); + + List trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId(),stockupDTO.getTrayBarCode()); List voList = new ArrayList<>(); List finalList = list; + if(trayIdList.isEmpty()){ + return Resp.scanFail("托盘信息错误！！！", "托盘信息错误！！！"); + } trayIdList.forEach(t -> { boolean b = finalList.stream().anyMatch(l -> l.getParcelListId().equals(t.getAssociationId())); if (b) { @@ -1439,7 +1444,7 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl list1 = new ArrayList<>(); voList.forEach(i -> { @@ -1453,7 +1458,10 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId().toString()); + String trayIdCode = ""; + List trayIdList = warehouseTrayGoodsClient.getTrayIdList(i.getTrayId().toString(),trayIdCode); if (trayPackNum.equals(trayIdList.size())) { trays.set(true); } diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java index c7762487b..d0784bf44 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/oupai/receiver/OpOldReceivingDataHandler.java @@ -18,6 +18,7 @@ import jodd.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.springblade.common.constant.RabbitConstant; import org.springblade.core.redis.cache.BladeRedis; +import org.springblade.core.tool.utils.DateUtil; import org.springframework.amqp.core.Message; import org.springframework.amqp.rabbit.annotation.RabbitHandler; import org.springframework.amqp.rabbit.annotation.RabbitListener; @@ -74,6 +75,7 @@ public class OpOldReceivingDataHandler { String thirdPackName = object.getString("thirdPackName"); + String scanTime = DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss"); QueryWrapper warehouseQueryWrapper = new QueryWrapper(); warehouseQueryWrapper.eq("code", orderPackageCode); @@ -82,6 +84,7 @@ public class OpOldReceivingDataHandler { log.info(">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> 查询包件数据 end >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> packageEntity {}", packageEntity); + //真正的处理需要的数据 try { // 保存数据 @@ -107,7 +110,7 @@ public class OpOldReceivingDataHandler { //订单自编号 reqMap.put("orderSelfNum", orderSelfNum); //扫描时间 - reqMap.put("scan_time", new Date()); + reqMap.put("scan_time", scanTime); //扫描人 reqMap.put("scan_user", ""); //车次号 @@ -122,7 +125,8 @@ public class OpOldReceivingDataHandler { reqMap.put("thirdPackName", thirdPackName); //物料名称 reqMap.put("productname", packageDetailNames); - + //包条码 + reqMap.put("unitNo", orderPackageCode); boolean isSuccess = sendPackageData(reqMap); if (isSuccess) { diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java index 6e47739ae..d1f9b4289 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/receiver/DealWithDataHandler.java @@ -48,6 +48,10 @@ public class DealWithDataHandler { String currentWarehouseId = orderStatusDTO.getCurrentWarehouse();//当前仓Id //查询destinationWarehouse logiBillNo plantId数据 Map supplyData = advanceDetailClient.getSupplyData(unitNo); + if(supplyData == null){ + log.error("##############dealWithDataHandler: unitNo={} 没有查询到数据",unitNo); + return ; + } String destinationWarehouseId = supplyData.get("destinationWarehouseId");//目的仓id if (StringUtil.isBlank(currentWarehouseId) || StringUtil.isBlank(destinationWarehouseId)) { log.warn("##############dealWithDataHandler: 仓库数据有问题currentWarehouseId={} destinationWarehouseId={}", currentWarehouseId, destinationWarehouseId); diff --git a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java index b3e3bfa5e..59c5cbde1 100644 --- a/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java +++ b/blade-service/logpm-factory/src/main/java/com/logpm/factory/zb/controller/ZbFactoryDataController.java @@ -7,6 +7,7 @@ import com.logpm.factory.comfac.service.IOrderStatusLogService; import com.logpm.factory.snm.entity.OrderStatusLog; import com.logpm.factory.zb.bean.ZbResp; import com.logpm.factory.zb.dto.ZBReceiptDTO; +import com.logpm.factory.zb.entity.ZbOrderLogEntity; import com.logpm.factory.zb.service.IZbFactoryDataService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -30,7 +31,6 @@ import java.util.Objects; @Api(value = "工厂数据", tags = "工厂数据接口") public class ZbFactoryDataController { - private RabbitTemplate rabbitTemplate; private final IOrderStatusLogService orderStatusLogService; private final IZbFactoryDataService zbFactoryDataService; @@ -56,6 +56,8 @@ public class ZbFactoryDataController { orderStatusLog.setStatus(1); orderStatusLog.setType(3); orderStatusLog.setBrand("志邦"); + + orderStatusLogService.save(orderStatusLog); // //判断数据是否已存入 diff --git a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java index fdcc391e0..15fd2f0b0 100644 --- a/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java +++ b/blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseTrayGoodsClient.java @@ -1,7 +1,7 @@ package com.logpm.warehouse.feign; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import com.baomidou.mybatisplus.core.toolkit.ObjectUtils; import com.logpm.warehouse.entity.WarehouseTrayGoodsEntity; import com.logpm.warehouse.service.IWarehouseTrayGoodsService; import com.logpm.warehouse.service.IWarehouseTrayTypeService; @@ -48,12 +48,13 @@ public class WarehouseTrayGoodsClient implements IWarehouseTrayGoodsClient { @Override @PostMapping(GETTRAYIDLIST) - public List getTrayIdList(String trayId) { + public List getTrayIdList(String trayId, String trayBarCode) { QueryWrapper queryWrapper = new QueryWrapper(); if(trayId.contains(",")){ queryWrapper.in("tray_id",trayId.split(",")); }else{ - queryWrapper.eq("tray_id",trayId); + queryWrapper.eq(ObjectUtils.isNotNull(trayId),"tray_id",trayId); + queryWrapper.eq(ObjectUtils.isNotNull(trayBarCode),"tray_code", trayBarCode); } queryWrapper.eq("association_type","3"); return warehouseTrayGoodsService.list(queryWrapper); 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 a60f3e2da..7a55187e7 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 @@ -70,6 +70,7 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { return warehouseUpdownGoodsService.getOne(Wrappers.query().lambda() .eq(ObjectUtils.isNotNull(updownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,updownGoodsEntity.getAllocationId()) .eq(WarehouseUpdownGoodsEntity::getAssociationValue,updownGoodsEntity.getAssociationValue()) + .eq(WarehouseUpdownGoodsEntity::getWarehouseId,updownGoodsEntity.getWarehouseId()) .eq(ObjectUtils.isNotNull(updownGoodsEntity.getAssociationId()),WarehouseUpdownGoodsEntity::getAssociationId,updownGoodsEntity.getAssociationId()) ); } @@ -78,10 +79,12 @@ public class WarehouseUpdownGoodsClient implements IWarehouseUpdownGoodsClient { @PostMapping(LOCATIONSTOCKLISTINFORMATION) public WarehouseUpdownGoodsEntity getLocationStockListInformation(WarehouseUpdownGoodsEntity warehouseUpdownGoodsEntity) { return warehouseUpdownGoodsService.getOne(Wrappers.query().lambda() - .eq(WarehouseUpdownGoodsEntity::getAllocationId,warehouseUpdownGoodsEntity.getAllocationId()) - .eq(WarehouseUpdownGoodsEntity::getAssociationType,warehouseUpdownGoodsEntity.getAssociationType()) - .eq(WarehouseUpdownGoodsEntity::getMarketId,warehouseUpdownGoodsEntity.getMarketId()) - .eq(WarehouseUpdownGoodsEntity::getIncomingBatch,warehouseUpdownGoodsEntity.getIncomingBatch()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAllocationId()),WarehouseUpdownGoodsEntity::getAllocationId,warehouseUpdownGoodsEntity.getAllocationId()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAssociationType()),WarehouseUpdownGoodsEntity::getAssociationType,warehouseUpdownGoodsEntity.getAssociationType()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getMarketId()),WarehouseUpdownGoodsEntity::getMarketId,warehouseUpdownGoodsEntity.getMarketId()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getAssociationId()),WarehouseUpdownGoodsEntity::getAssociationId,warehouseUpdownGoodsEntity.getAssociationId()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getIncomingBatch()),WarehouseUpdownGoodsEntity::getIncomingBatch,warehouseUpdownGoodsEntity.getIncomingBatch()) + .eq(ObjectUtils.isNotNull(warehouseUpdownGoodsEntity.getWarehouseId()),WarehouseUpdownGoodsEntity::getWarehouseId,warehouseUpdownGoodsEntity.getWarehouseId()) ); } }