修改备货区域修改

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataGoodsAreaClient.java

@@ -17,6 +17,7 @@
 package com.logpm.basicdata.feign;
 
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springblade.core.mp.support.BladePage;
 import org.springframework.cloud.openfeign.FeignClient;
@@ -25,6 +26,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 /**
  * 货区 Feign接口类
  *
@@ -38,6 +41,7 @@ public interface IBasicdataGoodsAreaClient {
 
     String API_PREFIX = "goodsArea/client";
     String TOP = API_PREFIX + "/top";
+    String GETDEPARTMENTID = API_PREFIX + "/departmentId";
 
     /**
      * 获取货区列表
@@ -55,4 +59,12 @@ public interface IBasicdataGoodsAreaClient {
 	@GetMapping(API_PREFIX+"/getEntityByGoodsAreaId")
     BasicdataGoodsAreaEntity getEntityByGoodsAreaId(@RequestParam Long goodsAreaId);
 
+	/**
+	 * 根据部门id查询备货区
+	 * @param goodsAreaId
+	 * @return
+	 */
+	@GetMapping(GETDEPARTMENTID)
+	List<BasicdataGoodsAreaVO> getDepartmentId(@RequestParam Long goodsAreaId);
+
 }

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

@@ -77,9 +77,9 @@ public class DistributionStockupEntity extends TenantEntity {
 	@ApiModelProperty(value = "备货库位")
 	private String stockipAllocation;
 	/**
-	 * 预约信息编号
+	 * 备货区ID
 	 */
-	@ApiModelProperty(value = "预约信息编号")
+	@ApiModelProperty(value = "备货区ID")
 	private Long goodsAreaId;
 	/**
 	 * 预留1

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

@@ -24,6 +24,8 @@ public class DistributionStockupStockListVO implements Serializable {
 
 	private String  trayName;//托盘信息
 
+	private Boolean  trayLean;//整托状态
+
 	private Integer unpack;//是否拆包 0 没有 1 拆了
 
 }

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

@@ -5,6 +5,7 @@ import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
 import org.springblade.common.constant.ModuleNameConstant;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.List;
@@ -18,8 +19,12 @@ public interface IWarehouseTaryAllocationClient {
 	String TOP = API_PREFIX + "/top";
 	String GETALLOCATIONID = API_PREFIX + "/allocationId";
 
-
-	@GetMapping(GETALLOCATIONID)
+	/**
+	 * 查询货位上的托盘
+	 * @param allocationId
+	 * @return
+	 */
+	@PostMapping(GETALLOCATIONID)
 	List<WarehouseTaryAllocationEntity> getAllocationId(@RequestParam Long allocationId);
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataGoodsAreaClient.java

@@ -19,6 +19,9 @@ package com.logpm.basicdata.feign;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.logpm.basicdata.entity.BasicdataGoodsAreaEntity;
 import com.logpm.basicdata.service.IBasicdataGoodsAreaService;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
+import com.logpm.basicdata.wrapper.WarehouseGoodsAreaWrapper;
+import com.logpm.warehouse.entity.WarehouseGoodsAreaEntity;
 import lombok.AllArgsConstructor;
 import org.springblade.core.mp.support.BladePage;
 import org.springblade.core.mp.support.Condition;
@@ -27,6 +30,8 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import springfox.documentation.annotations.ApiIgnore;
 
+import java.util.List;
+
 /**
  * 货区 Feign实现类
  *
@@ -65,4 +70,18 @@ public class BasicdataGoodsAreaClient implements IBasicdataGoodsAreaClient {
 		return basicdataGoodsAreaService.getById(goodsAreaId);
 	}
 
+	/**
+	 * 查询部门备货区
+	 * @param goodsAreaId
+	 * @return
+	 */
+	@Override
+	@GetMapping(GETDEPARTMENTID)
+	public List<BasicdataGoodsAreaVO> getDepartmentId(Long goodsAreaId) {
+		BasicdataGoodsAreaEntity warehouseWarehouse = new BasicdataGoodsAreaEntity();
+		warehouseWarehouse.setDepartment(String.valueOf(goodsAreaId));
+		List<BasicdataGoodsAreaVO> pages = basicdataGoodsAreaService.stockUp(warehouseWarehouse);
+		return pages;
+	}
+
 }

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataGoodsAreaMapper.xml

@@ -33,9 +33,8 @@
     <select id="stockUp" resultType="com.logpm.basicdata.vo.BasicdataGoodsAreaVO">
         select wga.id,wga.headline ,wga.enable_status ,wga.area_type ,ww.name
         from logpm_warehouse_goods_area wga
-                 left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
-        where warehouse_id in (select id
-                               from logpm_warehouse_warehouse where department = #{par.department})
+        left JOIN logpm_warehouse_warehouse ww on wga.warehouse_id = ww.id
+        where wga.warehouse_id in (select id from logpm_warehouse_warehouse where department = #{par.department})
           and wga.area_type = 1 and wga.enable_status = 1
     </select>
 

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/appcontroller/DistributionStockupAppController.java

@@ -19,11 +19,14 @@ package com.logpm.distribution.appcontroller;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.logpm.basicdata.feign.IBasicdataGoodsAreaClient;
+import com.logpm.basicdata.vo.BasicdataGoodsAreaVO;
 import com.logpm.distribution.bean.Resp;
 import com.logpm.distribution.dto.app.StockupDTO;
 import com.logpm.distribution.entity.DistributionReservationEntity;
 import com.logpm.distribution.entity.DistributionStockEntity;
 import com.logpm.distribution.entity.DistributionStockListEntity;
+import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.service.*;
 import com.logpm.distribution.vo.*;
 import io.swagger.annotations.Api;
@@ -34,6 +37,7 @@ import org.springblade.common.constant.DictBizConstant;
 import org.springblade.common.constant.RabbitConstant;
 import org.springblade.common.utils.CommonUtil;
 import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.cache.DictBizCache;
@@ -58,6 +62,7 @@ public class DistributionStockupAppController extends BladeController {
 	private final IDistributionStockupService distributionStockupService;
 
 	private final IDistributionReservationService distributionReservationService;
+	private final IBasicdataGoodsAreaClient basicdataGoodsAreaClient;
 
 	private final IDistributionStockService distributionStockService;
 	private final IDistributionReservationPackageService distributionReservationPackageService;
@@ -103,7 +108,7 @@ public class DistributionStockupAppController extends BladeController {
 	public R<Map<String,Object>> homePageList(@RequestBody StockupDTO stockupDTO) {
 //		Integer current = stockupDTO.getCurrent();
 //		Integer size = stockupDTO.getSize();
-		String stockupId = stockupDTO.getStockupId();
+		Long stockupId = stockupDTO.getStockupId();
 //		if(Objects.isNull(current)){
 //			log.info("#################pageList: 当前页码不能为空");
 //			return R.fail(401,"当前页码不能为空");
@@ -159,6 +164,8 @@ public class DistributionStockupAppController extends BladeController {
 			for (DistributionStockupStockListVO vo:list){
 				planNum = planNum + vo.getPlanNum();
 				scanNum = scanNum + vo.getRealNum();
+//				Boolean aBoolean = distributionStockupService.getClientStockupTray(reservationId, vo.getAllocationId());
+//				vo.setTrayLean(aBoolean);
 			}
 			map.put("planNum",planNum);
 			map.put("scanNum",scanNum);
@@ -242,7 +249,7 @@ public class DistributionStockupAppController extends BladeController {
 	}
 
 	@PostMapping("/scanningCode")
-	@ApiOperation(value = "整托扫码")
+	@ApiOperation(value = "整托备货")
 	public R scanningCodelist(@RequestBody StockupDTO stockupDTO){
 		if(ObjectUtils.isNull(stockupDTO.getStockupId())){
 			return R.fail(3002,"备货id不能为空");
@@ -253,9 +260,45 @@ public class DistributionStockupAppController extends BladeController {
 		if(ObjectUtils.isNull(stockupDTO.getTrayId())){
 			return R.fail(3002,"托盘码不能为空");
 		}
-		boolean b = distributionStockupService.addPackTrayList(stockupDTO);
+		R b = distributionStockupService.addPackTrayList(stockupDTO);
+		return b;
+	};
+
+
+	@PutMapping("/updateStockArea")
+	@ApiOperation(value = "修改备货区")
+	public R updateStockArea(@RequestBody StockupDTO stockupDTO){
+		if(ObjectUtils.isNull(stockupDTO.getStockupId())){
+			return R.fail(3002,"备货任务id不能为空");
+		}
+		if(ObjectUtils.isNull(stockupDTO.getStockupAreaId())){
+			return R.fail(3002,"备货区Id不能为空");
+		}
+		if(ObjectUtils.isNull(stockupDTO.getStockupArea())){
+			return R.fail(3002,"备货区名称不能为空");
+		}
+		DistributionStockupEntity distributionStockupEntity = new DistributionStockupEntity();
+		distributionStockupEntity.setGoodsAreaId(stockupDTO.getStockupAreaId());
+		distributionStockupEntity.setId(stockupDTO.getStockupId());
+		distributionStockupEntity.setStockupArea(stockupDTO.getStockupArea());
+		return R.data(distributionStockupService.updateById(distributionStockupEntity));
+	};
+
+	@PostMapping("/getStockupArea")
+	@ApiOperation(value = "查询可修改备货区")
+	public R getGoodsArea(@RequestBody StockupDTO stockupDTO){
 
-		return R.data(b);
+		if(ObjectUtils.isNull(stockupDTO.getUserId())){
+			return R.fail(3002,"当前操作人ID不能为空");
+		}
+		Long userId = AuthUtil.getUserId();
+		if(stockupDTO.getUserId().equals(userId)){
+			String deptId = AuthUtil.getDeptId();
+			return R.data(basicdataGoodsAreaClient.getDepartmentId(Long.parseLong(deptId)));
+		}else{
+			R.fail(3005,"操作人不对！");
+		}
+		return R.fail(500,"未知错误！");
 	};
 
 
@@ -270,7 +313,8 @@ public class DistributionStockupAppController extends BladeController {
 			//包件扫描
 			String orderCode = stockupDTO.getOrderCode();//订单自编号
 			String packetBarCode = stockupDTO.getPacketBarCode();//包件码
-			String stockupArea = stockupDTO.getStockupArea();//备货区
+//			String stockupArea = stockupDTO.getStockupArea();//备货区
+			Long stockupId = stockupDTO.getStockupId();//备货任务ID
 			Long reservationId = stockupDTO.getReservationId();//预约单id
 			if(StringUtil.isBlank(orderCode)){
 				log.warn("##################stockupScan: 包件扫码，订单自编号为空");
@@ -280,9 +324,9 @@ public class DistributionStockupAppController extends BladeController {
 				log.warn("##################stockupScan: 包件扫码，包件码为空");
 				return R.fail("包件扫码:包件码不能为空");
 			}
-			if(StringUtil.isBlank(stockupArea)){
-				log.warn("##################stockupScan: 包件扫码，备货区为空");
-				return R.fail("包件扫码:备货区不能为空");
+			if(ObjectUtils.isNull(stockupId)){
+				log.warn("##################stockupId: 包件扫码，备货区为空");
+				return R.fail("包件扫码:备货任务ID不能为空");
 			}
 			if(Objects.isNull(reservationId)){
 				log.warn("##################stockupScan: 包件扫码，预约单id为空");
@@ -293,7 +337,8 @@ public class DistributionStockupAppController extends BladeController {
 			DistributionStockEntity entity = new DistributionStockEntity();
 			entity.setOrderSelfNumbering(orderCode);
 			entity.setCoding(packetBarCode);
-			entity.setStockupArea(stockupArea);
+//			entity.setStockupArea(stockupArea);
+			entity.setStockupId(stockupId);
 			entity.setReservationId(reservationId);
 			entity.setConditions("0");
 			entity.setType(2);
@@ -316,14 +361,15 @@ public class DistributionStockupAppController extends BladeController {
 			Long reservationId = stockupDTO.getReservationId();
 			Long stockListId = stockupDTO.getStockListId();
 			String packetBarCode = stockupDTO.getPacketBarCode();
-			String stockupArea = stockupDTO.getStockupArea();//备货区
+//			String stockupArea = stockupDTO.getStockupArea();//备货区
+			Long stockupId = stockupDTO.getStockupId();//备货区
 			if(StringUtil.isBlank(packetBarCode)){
 				log.warn("##################stockupScan: 库存品扫码，包件码为空");
 				return R.fail("库存品扫码:包件码不能为空");
 			}
-			if(StringUtil.isBlank(stockupArea)){
+			if(ObjectUtils.isNull(stockupId)){
 				log.warn("##################stockupScan: 库存品扫码，备货区为空");
-				return R.fail("库存品扫码:备货区不能为空");
+				return R.fail("库存品扫码:备货任务ID不能为空");
 			}
 			if(Objects.isNull(stockListId)){
 				log.warn("##################stockupScan: 库存品扫码，库存品id为空");
@@ -337,7 +383,8 @@ public class DistributionStockupAppController extends BladeController {
 			//先保存扫码包件信息,后续由队列来出来余下补充信息
 			DistributionStockEntity entity = new DistributionStockEntity();
 			entity.setCoding(packetBarCode);
-			entity.setStockupArea(stockupArea);
+//			entity.setStockupArea(stockupArea);
+			entity.setStockupId(stockupId);
 			entity.setReservationId(reservationId);
 			entity.setStockListId(stockListId);
 			//添加物料信息

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

@@ -43,9 +43,10 @@ public class StockupDTO implements Serializable {
 	private Integer scanType;//备货扫码类型 1 包件 2库存品
 	private String packetBarCode;//包件码
 	private String trayBarCode;//托盘码
-	private String trayId;//货位ID
+	private Long trayId;//货位ID
 	private String stockupArea;//备货区
-	private String stockupId;//备货区Id
+	private Long stockupAreaId;//备货区ID
+	private Long stockupId;//备货任务区Id
 	private Long stockListId;//库存品id
 	private Integer packageNum;//包条数量
 

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

@@ -197,7 +197,7 @@
                  ldrs.stock_article_id,
                  ldpl.pallet -->
         select DISTINCT  GROUP_CONCAT(lwug.area_title,'-',lwug.shelf_title,'-',lwug.allocation_title ) allocation ,  lwtg.tray_code pallet,
-                        lwug.area_id areaId,lwug.shelf_id shelfId,lwug.allocation_id allocationId
+                        lwug.area_id areaId,lwug.shelf_id shelfId,lwug.allocation_id allocationId,lwtg.tray_id  trayId
         ,(
         select COUNT(drp.id)
         from logpm_distribution_reservation_package drp

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

@@ -23,6 +23,7 @@ import com.logpm.distribution.entity.DistributionStockupEntity;
 import com.logpm.distribution.excel.DistributionStockupExcel;
 import com.logpm.distribution.vo.*;
 import org.springblade.core.mp.base.BaseService;
+import org.springblade.core.tool.api.R;
 
 import java.util.List;
 import java.util.Map;
@@ -119,7 +120,7 @@ public interface IDistributionStockupService extends BaseService<DistributionSto
 	 * @param stockupDTO
 	 * @return
 	 */
-	boolean addPackTrayList(StockupDTO stockupDTO);
+	R addPackTrayList(StockupDTO stockupDTO);
 
 	/**
 	 * 查询状态

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

@@ -347,7 +347,7 @@ public class DistributionReservationServiceImpl extends BaseServiceImpl<Distribu
 				distributionReservationStocklistEntity.setReservationId(reservationId);
 				distributionReservationStocklistEntity.setStocklistId(stocklistId);
 				distributionReservationStocklistEntity.setUnit(i.getCargoUnit());
-				if (Func.isBlank(i.getPid().toString())) {
+				if (ObjectUtil.isEmpty(i.getPid())) {
 					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_NOT_HAVE_DATA);
 				} else {
 					distributionReservationStocklistEntity.setIsUnpackProduct(ServiceConstant.ORDER_HAVE_DATA);

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

@@ -64,6 +64,8 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 	@Autowired
 	private IDistributionDeliveryListService  distributionDeliveryListService;
 
+	private IDistributionStockupInfoService distributionStockupInfoService;
+
 	@Autowired
 	private IDistributionStockListService distributionStockListService;
 	@Autowired
@@ -93,16 +95,23 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 		return baseMapper.selectRealNum(reservationId);
 	}
 
+	/**
+	 * MQ备货扫描数据处理
+	 * @param distributionStockEntity
+	 */
 	@Override
 	public void repairPackageScanInfo(DistributionStockEntity distributionStockEntity) {
-		String coding = distributionStockEntity.getCoding();
-		Long reservationId = distributionStockEntity.getReservationId();
+		String coding = distributionStockEntity.getCoding(); //包条码
+		Long reservationId = distributionStockEntity.getReservationId(); //预约ID
 		log.info("#############repairPackageScanInfo: 补全包件扫码信息开始 coding={}",coding);
 		//查询包件信息
 		QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("packet_bar_code",coding);
 		DistributionParcelListEntity parcelListEntity = distributionParcelListService.getOne(queryWrapper);//包件信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectOne(Wrappers.<DistributionStockupEntity>query().lambda()
+			.eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId())
+		);
 		if(!Objects.isNull(parcelListEntity)){
 			String cargoTitle = parcelListEntity.getCargoTitle();//货区
 			String shelfTitle = parcelListEntity.getShelfTitle();//货位
@@ -111,13 +120,20 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 			distributionStockEntity.setStockArticle(parcelListEntity.getStockArticleId());
 			distributionStockEntity.setGoodsName(parcelListEntity.getFirsts());
 			distributionStockEntity.setParcelListId(parcelListEntity.getId());
+			distributionStockEntity.setStockupArea(distributionStockupEntity.getStockupArea());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
+			distributionStockEntity.setMaterialId(parcelListEntity.getMaterialId());
+			distributionStockEntity.setMarketId(Long.parseLong(parcelListEntity.getMarketId()));
 		}
 		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);
 		log.info("#############repairPackageScanInfo: 补全包件扫码信息完成 coding={}",coding);
 	}
 
+	/**
+	 * MQ备货库存品扫描
+	 * @param distributionStockEntity
+	 */
 	@Override
 	public void repairStockListScanInfo(DistributionStockEntity distributionStockEntity) {
 		Long stockListId = distributionStockEntity.getStockListId();
@@ -128,13 +144,19 @@ public class DistributionStockServiceImpl extends BaseServiceImpl<DistributionSt
 		queryWrapper.eq("id",stockListId);
 		DistributionStockListEntity stockListEntity = distributionStockListService.getOne(queryWrapper);//包件信息
 		DistributionReservationEntity reservationEntity = distributionReservationService.getById(reservationId);
+		DistributionStockupEntity distributionStockupEntity = distributionStockupMapper.selectOne(Wrappers.<DistributionStockupEntity>query().lambda()
+			.eq(DistributionStockupEntity::getId, distributionStockEntity.getStockupId())
+		);
 		if(!Objects.isNull(stockListEntity)){
 			distributionStockEntity.setGoodsAllocation(stockListEntity.getStorageLocation());
 			distributionStockEntity.setGoodsName(stockListEntity.getDescriptionGoods());
 			distributionStockEntity.setUnpackingQuantity(stockListEntity.getUnpackingQuantity());
 			distributionStockEntity.setUnit(stockListEntity.getCargoUnit());
 			distributionStockEntity.setParcelListId(stockListEntity.getParcelListId());
+			distributionStockEntity.setStockupArea(distributionStockupEntity.getStockupArea());
 			distributionStockEntity.setReservationCode(reservationEntity.getReservationCode());
+			distributionStockEntity.setMaterialId(stockListEntity.getMaterialId());
+			distributionStockEntity.setMarketId(stockListEntity.getMarketId());
 		}
 		distributionStockEntity.setConditions("1");
 		baseMapper.updateById(distributionStockEntity);

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

@@ -45,6 +45,7 @@ import org.springblade.common.exception.CustomerException;
 import org.springblade.core.mp.base.BaseServiceImpl;
 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.StringUtil;
 import org.springblade.system.cache.DictBizCache;
 import org.springframework.beans.BeanUtils;
@@ -68,8 +69,9 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	@Lazy
 	@Autowired
 	private IDistributionReservationService distributionReservationService;
-
+	@Autowired
 	private IWarehouseTrayGoodsClient warehouseTrayGoodsClient;
+	@Autowired
 	private IWarehouseTaryAllocationClient warehouseTaryAllocationClient;
 
 	@Autowired
@@ -561,28 +563,50 @@ public class DistributionStockupServiceImpl extends BaseServiceImpl<Distribution
 	 */
 	@Override
 	@Transactional(rollbackFor = Exception.class)
-	public boolean addPackTrayList(StockupDTO stockupDTO) {
+	public R addPackTrayList(StockupDTO stockupDTO) {
+		AtomicReference<Boolean> stock = new AtomicReference<>(false);
+		//查询包件信息
 		List<DistributionStockPackageVO> list = distributionReservationPackageService.listPackage(stockupDTO.getReservationId());
-		List<DistributionStockEntity> list1 = new ArrayList<>();
-		list.forEach(i ->{
-			DistributionStockEntity distributionStock = new DistributionStockEntity();
-			distributionStock.setStockupId(Long.parseLong(stockupDTO.getStockupId()));
-			distributionStock.setStockArticle(i.getStockArticleId());
-			distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息
-			distributionStock.setConditions("1");
-			distributionStock.setParcelListId(i.getParcelListId());
-			distributionStock.setOrderSelfNumbering(i.getOrderCode());
-			distributionStock.setType(1);
-			distributionStock.setDeliveryListCode(i.getNoteNumber());
-			distributionStock.setDeliveryListId(i.getDeliveryId());
-			distributionStock.setReservationId(i.getReservationId());
-			distributionStock.setReservationCode(i.getReservationCode());
-			distributionStock.setCoding(i.getPacketBarCode());
-			list1.add(distributionStock);
+		//查询托盘上面的包件
+		List<WarehouseTrayGoodsEntity> trayIdList = warehouseTrayGoodsClient.getTrayIdList(stockupDTO.getTrayId());
+		List<DistributionStockPackageVO> voList = new ArrayList<>();
+		trayIdList.forEach( t ->{
+			Optional<DistributionStockPackageVO> first = list.stream().filter(l -> l.getParcelListId().equals(t.getAssociationId())).findFirst();
+			if (first.isPresent()) {
+				DistributionStockPackageVO distributionStockPackageVO = first.get();
+				log.warn("找到了匹配的对象：" + distributionStockPackageVO);
+				voList.add(distributionStockPackageVO);
+			} else{
+				log.warn("没有找到了匹配的对象;");
+				stock.set(true);
+			}
 		});
-		//TODO 其他操作
-		//添加扫描记录
-		return distributionStockService.saveBatch(list1);
+		if(stock.get()){
+			return R.fail(3001,"备货失败！");
+		}else{
+			List<DistributionStockEntity> list1 = new ArrayList<>();
+			voList.forEach(i ->{
+				DistributionStockEntity distributionStock = new DistributionStockEntity();
+				distributionStock.setStockupId(stockupDTO.getStockupId());
+				distributionStock.setStockArticle(i.getStockArticleId());
+				distributionStock.setGoodsAllocation(i.getGoodsAllocation());//货位信息
+				distributionStock.setConditions("1");
+				distributionStock.setParcelListId(i.getParcelListId());
+				distributionStock.setOrderSelfNumbering(i.getOrderCode());
+				distributionStock.setType(1);
+				distributionStock.setDeliveryListCode(i.getNoteNumber());
+				distributionStock.setDeliveryListId(i.getDeliveryId());
+				distributionStock.setReservationId(i.getReservationId());
+				distributionStock.setReservationCode(i.getReservationCode());
+				distributionStock.setCoding(i.getPacketBarCode());
+				list1.add(distributionStock);
+			});
+			//TODO 其他操作
+			//添加扫描记录
+			distributionStockService.saveBatch(list1);
+			return R.fail(200,"备货成功");
+		}
+
 	}
 
 	/**

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

@@ -5,6 +5,7 @@ import com.logpm.warehouse.entity.WarehouseTaryAllocationEntity;
 import com.logpm.warehouse.service.IWarehouseTaryAllocationService;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
@@ -22,7 +23,7 @@ public class WarehouseTaryAllocationClient implements IWarehouseTaryAllocationCl
 	private IWarehouseTaryAllocationService warehouseTaryAllocationService;
 
 	@Override
-	@GetMapping(GETALLOCATIONID)
+	@PostMapping(GETALLOCATIONID)
 	public List<WarehouseTaryAllocationEntity> getAllocationId(Long allocationId) {
 		return warehouseTaryAllocationService.list(Wrappers.<WarehouseTaryAllocationEntity>query().lambda()
 			.eq(WarehouseTaryAllocationEntity::getAllocationId,allocationId)