修改备货能扫码非本批次的的库存品-- 待完成1.2

blade-gateway/src/main/resources/bootstrap.yml

@@ -1,5 +1,8 @@
 server:
   port: 13000
+
+
+
 spring:
   cloud:
     gateway:

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DisStockOrdercodeRecoEntity.java

@@ -50,6 +50,10 @@ public class DisStockOrdercodeRecoEntity extends TenantEntity {
 	 */
 	@ApiModelProperty(value = "码值类型 1 库存品明细")
 	private String codeType;
+
+
+	@ApiModelProperty(value = "库存品ID")
+	private Long stockListId;
 	/**
 	 * 预留1
 	 */

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/entity/DistributionParcelListEntity.java

@@ -78,7 +78,7 @@ public class DistributionParcelListEntity extends TenantEntity {
 	@ApiModelProperty(value = "仓库ID")
 	private Long warehouseId;
 	/**
-	 * 状态
+	 * 包件类型 1 定制品  2 库存品  3零担
 	 */
 	@ApiModelProperty(value = "状态")
 	private Integer conditions;

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListInfoVO.java

@@ -11,7 +11,7 @@ public class DistributionStockupStockListInfoVO implements Serializable {
 
 	private Long reservationId;//预约单id
 
-		private Long stockListId;//库存品id
+	private Long stockListId;//库存品id
 
 	private String customer;//客户
 	private String deliveryAddress;//地址

blade-service-api/logpm-distribution-api/src/main/java/com/logpm/distribution/vo/DistributionStockupStockListVO.java

@@ -3,6 +3,8 @@ package com.logpm.distribution.vo;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
 
 @Data
 public class DistributionStockupStockListVO implements Serializable {
@@ -22,6 +24,11 @@ public class DistributionStockupStockListVO implements Serializable {
 
 	private Integer planNum;//计划数量
 
+	/**
+	 * 物品编码
+	 */
+	private String cargoNumber;
+
 	private String cargoUnit;//单位
 
 	private Integer realNum;//实际数量
@@ -34,4 +41,12 @@ public class DistributionStockupStockListVO implements Serializable {
 	private Integer unpack;//是否拆包 0 没有 1 拆了
 	private String sourceType;//是否拆包 1 订单 2导入
 
+	// 货位ID 集合
+	private String allocations;
+
+	/**
+	 * 货位信息集合
+	 */
+	private List<Map<String,Object>> allocationList;
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/entity/WarehouseUpdownGoodsEntity.java

@@ -62,7 +62,7 @@ public class WarehouseUpdownGoodsEntity extends TenantEntity {
 	@ApiModelProperty(name = "关联值",notes = "")
 	private String associationValue ;
 	/** 关联类型;1.订单号  2运单号 3包件码 */
-	@ApiModelProperty(name = "关联类型",notes = "1.订单号  2运单号 3包件码")
+	@ApiModelProperty(name = "关联类型",notes = "1.订单号  2运单号 3包件码 4库存品")
 	private String associationType ;
 	/** 货物名称 */
 	@ApiModelProperty(name = "货物名称",notes = "")

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseGoodsAllocationClient.java

@@ -23,6 +23,8 @@ import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 货位 Feign接口类
  *
@@ -52,4 +54,12 @@ public interface IWarehouseGoodsAllocationClient {
     @GetMapping(TOP+ "/updateAllocationCache")
     Boolean updateAllocationCache(@RequestParam("ids") String ids);
 
+
+	/**
+	 * 跟新货位缓存
+	 */
+	@GetMapping(TOP+ "/getAllocationInforByIds")
+	List<WarehouseGoodsAllocationEntity> getAllocationInforByIds(@RequestParam("ids") String [] ids);
+
+
 }

blade-service-api/logpm-warehouse-api/src/main/java/com/logpm/warehouse/feign/IWarehouseUpdownTypeClient.java

@@ -65,4 +65,8 @@ public interface IWarehouseUpdownTypeClient {
 	@GetMapping(TOP + "/upShelfPackage")
 	boolean upShelfPackage(@RequestParam String orderPackageCode, @RequestParam Long locationId, @RequestParam Long warehouseId);
 
+	@GetMapping(TOP + "/findUpdownTypeInforByAllocationId")
+	R findUpdownTypeInforByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId);
+	@GetMapping(TOP + "/findAllGoodsByAllocationId")
+	R findAllGoodsByAllocationId(@RequestParam Long allocationId, @RequestParam Long warehouseId);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockConfigInfoVO.java

@@ -0,0 +1,24 @@
+package com.logpm.distribution.dto.app;
+
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class StockConfigInfoVO {
+
+	/**
+	 * 客户
+	 */
+	private String customer;
+
+	/**
+	 * 地址
+	 */
+	private String address;//地址
+
+	/**
+	 * 库存扫码记录
+	 */
+	private List<StockConfigOrderPackageListVO> stockConfigOrderPackageListVOS;
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockConfigOrderPackageListVO.java

@@ -0,0 +1,36 @@
+package com.logpm.distribution.dto.app;
+
+import lombok.Data;
+
+import java.util.Date;
+
+
+/**
+ * 配置包条码 扫码完成展示列表
+ */
+@Data
+public class StockConfigOrderPackageListVO {
+
+
+	/**
+	 * 入库批次
+	 */
+	private String incomingBatch;
+
+
+	/**
+	 * 码
+	 */
+	private String code;
+
+	/**
+	 * 码
+	 */
+	private Integer num;
+
+	/**
+	 * 创建时间
+	 */
+	private Date createTime;
+
+}

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/dto/app/StockupDTO.java

@@ -31,6 +31,8 @@ public class StockupDTO implements Serializable {
 
 	private String descriptionGoods;//物料名称
 
+	private String cargoNumber;//物料编码
+
 	private String allocation;//库位信息
 	private Long allocationId;//库位信息ID
 	private String allocationCode;//库位信息ID

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.java

@@ -70,6 +70,7 @@ public interface DistributionReservationMapper extends BaseMapper<DistributionRe
 	List<DistributionStockupOrderListVO> selectStockupOrderList(@Param("reservationId")Long reservationId,@Param("isZero") String isZero);
 
     List<DistributionStockupStockListVO> selectStockupStockList(@Param("reservationId")Long reservationId);
+    List<DistributionStockupStockListVO> selectStockupStockListNew(@Param("reservationId")Long reservationId);
 
     Integer selectOrderNumByReservationId(@Param("reservationId")Long reservationId);
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionReservationMapper.xml

@@ -297,6 +297,65 @@
         ldst.cargo_norms,  ldrs.reservation_num,  ldst.cargo_unit,  ldst.tray_name,  ldst.source_type
     </select>
 
+    <select id="selectStockupStockListNew" resultType="com.logpm.distribution.vo.DistributionStockupStockListVO">
+        SELECT
+<!--        ldslNew.id AS stockListId,-->
+        ldslNew.sku AS sku,
+        ldslNew.cargo_number AS cargoNumber,
+        ldslNew.description_goods AS materialName,
+        ldslNew.cargo_norms AS cargoNorms,
+        ldslNew.cargo_unit AS cargoUnit,
+        ldslNew.tray_name AS trayName,
+        ldslNew.unpack AS unpack,
+        ldslNew.source_type AS sourceType,
+        ldslNew.source_type,
+        count(ldss.id) AS realNum,
+<!--        t.deliveryDetailsId AS deliveryDetailsId,-->
+        t.reservation_num as planNum,
+
+        CASE
+        WHEN ldslNew.source_type = '2' THEN
+        (
+        SELECT
+        group_concat(DISTINCT lwug.allocation_id) AS allocations
+        FROM
+        logpm_warehouse_updown_goods lwug
+        WHERE
+        lwug.association_id = ldslNew.material_id
+        )
+        WHEN ldslNew.source_type = '1' THEN
+        (
+        SELECT
+        group_concat(DISTINCT lwug.allocation_id) AS allocations
+        FROM
+        logpm_distribution_stock_list AS ldslnew
+        LEFT JOIN logpm_distribution_parcel_list ldpl ON ldpl.order_code = ldslnew.incoming_batch
+        AND ldpl.material_id = ldslnew.material_id
+        AND ldpl.conditions = '2'
+        LEFT JOIN logpm_warehouse_updown_goods lwug ON lwug.association_value = ldpl.order_package_code
+        WHERE
+        ldslnew.id = t.id
+        )
+        END AS allocations
+        FROM
+        (
+        SELECT
+        ldsl.cargo_number,
+        ldsl.description_goods,
+        ldsl.id,
+        ldrs.id as deliveryDetailsId,
+        ldrs.reservation_num
+        FROM
+        logpm_distribution_reservation_stocklist ldrs
+        LEFT JOIN logpm_distribution_stock_list ldsl ON ldrs.stocklist_id = ldsl.id
+        WHERE
+        ldrs.reservation_id = #{reservationId}
+        ) t
+        LEFT JOIN logpm_distribution_stock_list ldslNew ON t.cargo_number = ldslNew.cargo_number
+        LEFT JOIN logpm_distribution_stock ldss ON ldss.stock_list_id = t.id where ldslNew.is_deleted = 0
+
+    </select>
+
     <select id="selectOrderNumByReservationId" resultType="Integer">
         select count(ldrs.id)
         from logpm_distribution_reservation ldr

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.java

@@ -25,6 +25,7 @@ import com.logpm.distribution.vo.DistributionStockListInfoVO;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 库存品明细 Mapper 接口
@@ -52,4 +53,5 @@ public interface DistributionStockListInfoMapper extends BaseMapper<Distribution
 	 */
 	List<DistributionStockListInfoVO> exportDistributionStockListInfo(@Param("ew") Wrapper<DistributionStockListInfoEntity> queryWrapper);
 
+	Map<String, Object> selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber(@Param("associationValue") String associationValue, @Param("warehouseId") Long warehouseId, @Param("cargoNumber") String cargoNumber);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListInfoMapper.xml

@@ -72,4 +72,24 @@
         SELECT * FROM logpm_distribution_stock_list_info ${ew.customSqlSegment}
     </select>
 
+    <select id="selectDistributionStockByOrderPackageCodeAndWarehourseIdAndCargoNumber" resultType="map">
+        SELECT
+        id,
+        incoming_batch
+        FROM
+        logpm_distribution_stock_list
+        WHERE
+        cargo_number=#{cargoNumber}
+        AND
+        incoming_batch = (
+        SELECT
+        order_code
+        FROM
+        logpm_distribution_parcel_list
+        WHERE
+        warehouse_id = #{warehouseId} and order_package_code=#{associationValue} and conditions=2 and material_code=#{cargoNumber}
+        );
+
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.java

@@ -109,4 +109,6 @@ public interface DistributionStockListMapper extends BaseMapper<DistributionStoc
 	 * @return
 	 */
 	List<DistributionStockListVO> getStockListInfo(@Param("par")DistributionStockListEntity distributionStockListEntity);
+
+	DistributionStockListEntity selectStockInforByOrderPackageCode(@Param("orderPackageCode") String orderPackageCode);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/mapper/DistributionStockListMapper.xml

@@ -485,4 +485,21 @@
         </where>
     </select>
 
+    <select id="selectStockInforByOrderPackageCode" resultType="com.logpm.distribution.entity.DistributionStockListEntity">
+        SELECT
+        ldsl.*
+        FROM
+        (
+        SELECT
+        order_code,
+        material_code
+        FROM
+        logpm_distribution_parcel_list
+        WHERE
+        order_package_code = #{orderPackageCode}
+        AND conditions = 2
+        ) t
+        LEFT JOIN logpm_distribution_stock_list ldsl ON ldsl.incoming_batch = t.order_code and  ldsl.cargo_number=t.material_code
+    </select>
+
 </mapper>

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDisStockOrdercodeRecoService.java

@@ -19,6 +19,7 @@ package com.logpm.distribution.service;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DisStockOrdercodeRecoEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.excel.DisStockOrdercodeRecoExcel;
 import com.logpm.distribution.vo.DisStockOrdercodeRecoVO;
 import org.springblade.core.mp.base.BaseService;
@@ -50,4 +51,6 @@ public interface IDisStockOrdercodeRecoService extends BaseService<DisStockOrder
 	 */
 	List<DisStockOrdercodeRecoExcel> exportDisStockOrdercodeReco(Wrapper<DisStockOrdercodeRecoEntity> queryWrapper);
 
+	DistributionStockListEntity selectStockOrdercodeRecoListByCode(String packetBarCode);
+
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockListService.java

@@ -153,6 +153,13 @@ public interface IDistributionStockListService extends BaseService<DistributionS
 	 */
 	List<DistributionStockListVO> getStockListInfo(DistributionStockListEntity distributionStockListEntity);
 
+	/**
+	 * 根据包件编码查询库存品信息
+	 * @param orderPackageCode
+	 * @return
+	 */
+	DistributionStockListEntity selectStockInforByOrderPackageCode(String orderPackageCode);
+
 
 //	/**
 //	 * 查询库存品详情

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionStockupService.java

@@ -17,8 +17,10 @@
 package com.logpm.distribution.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.logpm.distribution.dto.app.StockConfigInfoVO;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.dto.app.StockupZeroDTO;
+import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionCityExcel;
 import com.logpm.distribution.excel.DistributionMarketExcel;
@@ -250,4 +252,19 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @return
 	 */
 	boolean getTrayBoot(DistributionStockupOrderListVO vo,String type);
+
+
+	DistributionStockListEntity selectStockListInfoByCargoNumberList(Long reservationId, String cargoNumber, Long allocationId, String orderPackageCode);
+
+	/**
+	 * 查询库位上最新入库的库存品
+	 * @param reservationId
+	 * @param cargoNumber
+	 * @param allocationId
+	 * @return
+	 */
+	Long selectStockListInfoByCargoNumber(Long reservationId, String cargoNumber, Long allocationId);
+
+
+	StockConfigInfoVO stockConfigList(StockupDTO stockupDTO);
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DisStockOrdercodeRecoServiceImpl.java

@@ -17,13 +17,17 @@
 package com.logpm.distribution.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.distribution.entity.DisStockOrdercodeRecoEntity;
+import com.logpm.distribution.entity.DistributionStockListEntity;
 import com.logpm.distribution.excel.DisStockOrdercodeRecoExcel;
 import com.logpm.distribution.mapper.DisStockOrdercodeRecoMapper;
+import com.logpm.distribution.mapper.DistributionStockListMapper;
 import com.logpm.distribution.service.IDisStockOrdercodeRecoService;
 import com.logpm.distribution.vo.DisStockOrdercodeRecoVO;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
@@ -37,6 +41,9 @@ import java.util.List;
 @Service
 public class DisStockOrdercodeRecoServiceImpl extends BaseServiceImpl<DisStockOrdercodeRecoMapper, DisStockOrdercodeRecoEntity> implements IDisStockOrdercodeRecoService {
 
+	@Autowired
+	private DistributionStockListMapper distributionStockListMapper;
+
 	@Override
 	public IPage<DisStockOrdercodeRecoVO> selectDisStockOrdercodeRecoPage(IPage<DisStockOrdercodeRecoVO> page, DisStockOrdercodeRecoVO disStockOrdercodeReco) {
 		return page.setRecords(baseMapper.selectDisStockOrdercodeRecoPage(page, disStockOrdercodeReco));
@@ -52,4 +59,16 @@ public class DisStockOrdercodeRecoServiceImpl extends BaseServiceImpl<DisStockOr
 		return disStockOrdercodeRecoList;
 	}
 
+	@Override
+	public DistributionStockListEntity selectStockOrdercodeRecoListByCode(String packetBarCode) {
+
+		LambdaQueryWrapper<DisStockOrdercodeRecoEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		List<DisStockOrdercodeRecoEntity> disStockOrdercodeRecoEntities = baseMapper.selectList(lambdaQueryWrapper);
+		if(!disStockOrdercodeRecoEntities.isEmpty()){
+			DisStockOrdercodeRecoEntity disStockOrdercodeRecoEntity = disStockOrdercodeRecoEntities.get(0);
+			return distributionStockListMapper.selectById(disStockOrdercodeRecoEntity.getStockListId());
+		}
+
+		return null;
+	}
 }

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionReservationServiceImpl.java

@@ -2620,7 +2620,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 
 	@Override
 	public List<DistributionStockupStockListVO> selectStockupStockList(Long reservationId) {
-		return baseMapper.selectStockupStockList(reservationId);
+		return baseMapper.selectStockupStockListNew(reservationId);
 	}
 
 	@Override

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockArticleServiceImpl.java

@@ -1218,7 +1218,7 @@ public class DistributionStockArticleServiceImpl extends BaseServiceImpl<Distrib
 	public IPage<DistributionParcelListVO> getPackageListByStockArticleId(IPage<DistributionParcelListVO> page, Long orderId) {
 		List<DistributionParcelListEntity> parcelListEntityList = distributionParcelListService.list(Wrappers.<DistributionParcelListEntity>query().lambda().eq(DistributionParcelListEntity::getStockArticleId, orderId)
 			.eq(DistributionParcelListEntity::getOrderPackageReservationStatus, OrderPackageReservationStatusConstant.daiyuyue.getValue())
-			.ne(DistributionParcelListEntity::getConditions, 2)
+				.ne(DistributionParcelListEntity::getConditions,2)
 			.notIn(DistributionParcelListEntity::getOrderPackageStatus, OrderPackageStatusConstant.yiqianshou.getValue(), OrderPackageStatusConstant.yichuku.getValue()));
 		List<DistributionParcelListVO> parcelListVOS = DistributionParcelListWrapper.build().listVO(parcelListEntityList);
 		return page.setRecords(parcelListVOS);

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/impl/DistributionStockListServiceImpl.java

@@ -476,6 +476,18 @@ public class DistributionStockListServiceImpl extends BaseServiceImpl<Distributi
 	public List<DistributionStockListVO> getStockListInfo(DistributionStockListEntity distributionStockListEntity) {
 		return baseMapper.getStockListInfo(distributionStockListEntity);
 	}
+
+
+	@Override
+	public DistributionStockListEntity selectStockInforByOrderPackageCode(String orderPackageCode) {
+
+
+		return baseMapper.selectStockInforByOrderPackageCode(orderPackageCode);
+
+
+
+
+	}
 }
 
 //	@Override

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseGoodsAllocationClient.java

@@ -27,6 +27,10 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
 /**
  * 货位 Feign实现类
  *
@@ -55,5 +59,15 @@ public class WarehouseGoodsAllocationClient implements IWarehouseGoodsAllocation
 	public Boolean updateAllocationCache(String ids) {
 		return warehouseGoodsAllocationService.updateAllocationCache(ids);
 	}
+	@GetMapping(TOP+ "/getAllocationInforByIds")
+	@Override
+	public List<WarehouseGoodsAllocationEntity> getAllocationInforByIds(String [] ids) {
 
+		List<Long> lss = new ArrayList<>();
+		for (String id : ids) {
+			lss.add(Long.parseLong(id));
+		}
+
+		return warehouseGoodsAllocationService.listByIds(lss);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/feign/WarehouseUpdownTypeClient.java

@@ -21,6 +21,8 @@ import com.logpm.warehouse.dto.UpShelfPackageDTO;
 import com.logpm.warehouse.dto.UpShelfStockDTO;
 import com.logpm.warehouse.dto.UpShelfZeroOrderDTO;
 import com.logpm.warehouse.service.IWarehouseUpdownTypeService;
+import com.logpm.warehouse.vo.TragetAllocationVO;
+import com.logpm.warehouse.vo.UpShelfAllocationVO;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springblade.core.tool.api.R;
@@ -164,4 +166,16 @@ public class WarehouseUpdownTypeClient implements IWarehouseUpdownTypeClient {
 	public boolean packageChangeStock(List<String> orderPackageCodes) {
 		return warehouseUpdownTypeService.packageChangeStock(orderPackageCodes);
 	}
+
+	@Override
+	public R findUpdownTypeInforByAllocationId(Long allocationId, Long warehouseId) {
+		UpShelfAllocationVO upShelfAllocationVO = warehouseUpdownTypeService.upShelfScanAllocation(allocationId, warehouseId);
+
+		return R.data(JSONObject.toJSONString(upShelfAllocationVO));
+	}
+
+	@Override
+	public R findAllGoodsByAllocationId(Long allocationId, Long warehouseId) {
+		return warehouseUpdownTypeService.findAllGoodsByAllocationId(allocationId,warehouseId);
+	}
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/IWarehouseUpdownTypeService.java

@@ -71,4 +71,5 @@ public interface IWarehouseUpdownTypeService extends BaseService<WarehouseUpdown
 
 	boolean packageChangeStock(List<String> orderPackageCodes);
 
+	R findAllGoodsByAllocationId(Long allocationId, Long warehouseId);
 }

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -1,5 +1,6 @@
 package com.logpm.warehouse.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.logpm.basicdata.entity.*;
 import com.logpm.basicdata.feign.*;
@@ -69,6 +70,15 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 		return true;
 	}
 
+	@Override
+	public R findAllGoodsByAllocationId(Long allocationId, Long warehouseId) {
+		QueryWrapper<WarehouseUpdownGoodsEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("allocation_id",allocationId);
+		List<WarehouseUpdownGoodsEntity> list = warehouseUpdownGoodsService.list(queryWrapper);
+		String jsonString = JSONObject.toJSONString(list);
+		return R.data(jsonString);
+	}
+
 
 	private void packageChangeStockByAllocaton(WarehouseUpdownGoodsEntity one) {